check for executable files in some archives

13xforever · 13xforever · commit 729a8944aa7a · 2026-06-16T19:29:13.000+05:00
diff --git a/CompatBot/EventHandlers/LogParsing/ArchiveHandlers/PlainText.cs b/CompatBot/EventHandlers/LogParsing/ArchiveHandlers/PlainText.cs
@@ -14,6 +14,9 @@ internal sealed class PlainTextHandler: IArchiveHandler
     public Result CanHandle(string fileName, int fileSize, ReadOnlySpan<byte> header)
     {
         LogSize = fileSize;
+        if (fileName.HasExecutableExtension())
+            return Result.Failure().WithCode("executable");
+
         if (fileName.Contains("tty.log", StringComparison.InvariantCultureIgnoreCase))
             return Result.Failure();
 
diff --git a/CompatBot/EventHandlers/LogParsing/ArchiveHandlers/RarHandler.cs b/CompatBot/EventHandlers/LogParsing/ArchiveHandlers/RarHandler.cs
@@ -17,11 +17,19 @@ internal sealed class RarHandler: IArchiveHandler
     public Result CanHandle(string fileName, int fileSize, ReadOnlySpan<byte> header)
     {
         if (header.Length >= Header.Length && header[..Header.Length].SequenceEqual(Header)
-            || header.Length == 0 && fileName.EndsWith(".rar", StringComparison.InvariantCultureIgnoreCase))
+            || header is [] && fileName.EndsWith(".rar", StringComparison.InvariantCultureIgnoreCase))
         {
             var firstEntry = Encoding.ASCII.GetString(header);
             if (!firstEntry.Contains(".log", StringComparison.InvariantCultureIgnoreCase))
+            {
+                var idx = -1;
+                while ((idx = firstEntry.IndexOf('.', idx + 1)) > -1 && idx < firstEntry.Length - 4)
+                {
+                    if (firstEntry[idx..(idx + 4)].ToLower().HasExecutableExtension())
+                        return Result.Failure().WithCode("executable");
+                }
                 return Result.Failure().WithMessage("Archive doesn't contain any logs.");
+            }
             return Result.Success();
         }
         return Result.Failure();
diff --git a/CompatBot/EventHandlers/LogParsing/ArchiveHandlers/ZipHandler.cs b/CompatBot/EventHandlers/LogParsing/ArchiveHandlers/ZipHandler.cs
@@ -22,7 +22,15 @@ public Result CanHandle(string fileName, int fileSize, ReadOnlySpan<byte> header
         {
             var firstEntry = Encoding.ASCII.GetString(header);
             if (!firstEntry.Contains(".log", StringComparison.InvariantCultureIgnoreCase))
+            {
+                var idx = -1;
+                while ((idx = firstEntry.IndexOf('.', idx + 1)) > -1 && idx < firstEntry.Length - 4)
+                {
+                    if (firstEntry[idx..(idx + 4)].ToLower().HasExecutableExtension())
+                        return Result.Failure().WithCode("executable");
+                }
                 return Result.Failure().WithMessage("Archive doesn't contain any logs.");
+            }
             return Result.Success();
         }
         return Result.Failure();
diff --git a/CompatBot/EventHandlers/LogParsing/SourceHandlers/DiscordAttachmentHandler.cs b/CompatBot/EventHandlers/LogParsing/SourceHandlers/DiscordAttachmentHandler.cs
@@ -28,7 +28,7 @@ public override async Task<Result<ISource>> FindHandlerAsync(DiscordMessage mess
                         var result = handler.CanHandle(attachment.FileName, attachment.FileSize, buf.AsSpan(0, read));
                         if (result.IsSuccess())
                             return Result.Success<ISource>(new DiscordAttachmentSource(attachment, handler, attachment.FileName, attachment.FileSize));
-                        else if (result.Message is {Length: >0})
+                        else if (result is {Code.Length: >0} or {Message.Length: >0} )
                             return result.Cast<ISource>();
                     }
                 }
diff --git a/CompatBot/EventHandlers/LogParsing/SourceHandlers/DropboxHandler.cs b/CompatBot/EventHandlers/LogParsing/SourceHandlers/DropboxHandler.cs
@@ -56,7 +56,7 @@ public override async Task<Result<ISource>> FindHandlerAsync(DiscordMessage mess
                         var result = handler.CanHandle(filename, filesize, buf.AsSpan(0, read));
                         if (result.IsSuccess())
                             return Result.Success<ISource>(new DropboxSource(uri, handler, filename, filesize));
-                        else if (result.Message is {Length: >0})
+                        else if (result is {Code.Length: >0} or {Message.Length: >0} )
                             return result.Cast<ISource>();
                     }
                 }
diff --git a/CompatBot/EventHandlers/LogParsing/SourceHandlers/GenericLinkHandler.cs b/CompatBot/EventHandlers/LogParsing/SourceHandlers/GenericLinkHandler.cs
@@ -55,7 +55,7 @@ public override async Task<Result<ISource>> FindHandlerAsync(DiscordMessage mess
                         var result = handler.CanHandle(filename, filesize, buf.AsSpan(0, read));
                         if (result.IsSuccess())
                             return Result.Success<ISource>(new GenericSource(uri, handler, host, filename, filesize));
-                        else if (result.Message is {Length: > 0})
+                        else if (result is {Code.Length: >0} or {Message.Length: >0} )
                             return result.Cast<ISource>();
                     }
                 }
diff --git a/CompatBot/EventHandlers/LogParsing/SourceHandlers/GoogleDriveHandler.cs b/CompatBot/EventHandlers/LogParsing/SourceHandlers/GoogleDriveHandler.cs
@@ -57,7 +57,7 @@ public override async Task<Result<ISource>> FindHandlerAsync(DiscordMessage mess
                         var result = handler.CanHandle(fileMeta.Name, (int)fileMeta.Size, buf.AsSpan(0, read));
                         if (result.IsSuccess())
                             return Result.Success<ISource>(new GoogleDriveSource(client, fileInfoRequest, fileMeta, handler));
-                        else if (result.Message is {Length: >0})
+                        else if (result is {Code.Length: >0} or {Message.Length: >0} )
                             return result.Cast<ISource>();
                     }
                 }
diff --git a/CompatBot/EventHandlers/LogParsing/SourceHandlers/MediafireHandler.cs b/CompatBot/EventHandlers/LogParsing/SourceHandlers/MediafireHandler.cs
@@ -61,7 +61,7 @@ public override async Task<Result<ISource>> FindHandlerAsync(DiscordMessage mess
                         var result = handler.CanHandle(filename, filesize, buf.AsSpan(0, read));
                         if (result.IsSuccess())
                             return Result.Success<ISource>(new MediafireSource(directLink, handler, filename, filesize));
-                        else if (result.Message is {Length: >0})
+                        else if (result is {Code.Length: >0} or {Message.Length: >0} )
                             return result.Cast<ISource>();
                     }
                     Config.Log.Debug("MediaFire Response:\n" + Encoding.UTF8.GetString(buf, 0, read));
diff --git a/CompatBot/EventHandlers/LogParsing/SourceHandlers/MegaHandler.cs b/CompatBot/EventHandlers/LogParsing/SourceHandlers/MegaHandler.cs
@@ -47,7 +47,7 @@ public override async Task<Result<ISource>> FindHandlerAsync(DiscordMessage mess
                         var result = handler.CanHandle(node.Name, (int)node.Size, buf.AsSpan(0, read));
                         if (result.IsSuccess())
                             return Result.Success<ISource>(new MegaSource(client, uri, node, handler));
-                        else if (result.Message is {Length: >0})
+                        else if (result is {Code.Length: >0} or {Message.Length: >0} )
                             return result.Cast<ISource>();
                     }
                 }
diff --git a/CompatBot/EventHandlers/LogParsing/SourceHandlers/OneDriveSourceHandler.cs b/CompatBot/EventHandlers/LogParsing/SourceHandlers/OneDriveSourceHandler.cs
@@ -47,7 +47,7 @@ public override async Task<Result<ISource>> FindHandlerAsync(DiscordMessage mess
                             var result = handler.CanHandle(filename, filesize, buf.AsSpan(0, read));
                             if (result.IsSuccess())
                                 return Result.Success<ISource>(new OneDriveSource(uri, handler, filename, filesize));
-                            else if (result.Message is {Length: >0})
+                            else if (result is {Code.Length: >0} or {Message.Length: >0} )
                                 return result.Cast<ISource>();
                         }
                     }
diff --git a/CompatBot/EventHandlers/LogParsing/SourceHandlers/PastebinHandler.cs b/CompatBot/EventHandlers/LogParsing/SourceHandlers/PastebinHandler.cs
@@ -41,7 +41,7 @@ public override async Task<Result<ISource>> FindHandlerAsync(DiscordMessage mess
                         var result = handler.CanHandle(filename, filesize, buf.AsSpan(0, read));
                         if (result.IsSuccess())
                             return Result.Success<ISource>(new PastebinSource(uri, filename, filesize, handler));
-                        else if (result.Message is {Length: >0})
+                        else if (result is {Code.Length: >0} or {Message.Length: >0} )
                             return result.Cast<ISource>();
                     }
                 }
diff --git a/CompatBot/EventHandlers/LogParsing/SourceHandlers/YandexDiskHandler.cs b/CompatBot/EventHandlers/LogParsing/SourceHandlers/YandexDiskHandler.cs
@@ -53,7 +53,7 @@ public override async Task<Result<ISource>> FindHandlerAsync(DiscordMessage mess
                         var result = handler.CanHandle(filename, filesize, buf.AsSpan(0, read));
                         if (result.IsSuccess())
                             return Result.Success<ISource>(new YaDiskSource(resourceInfo.File, handler, filename, filesize));
-                        else if (result.Message is {Length: >0})
+                        else if (result is {Code.Length: >0} or {Message.Length: >0} )
                             return result.Cast<ISource>();
                     }
                 }
diff --git a/CompatBot/EventHandlers/LogParsingHandler.cs b/CompatBot/EventHandlers/LogParsingHandler.cs
@@ -56,6 +56,7 @@ public static Task OnMessageCreated(DiscordClient c, MessageCreatedEventArgs arg
         if (message.Author.IsBotSafeCheck())
             return Task.CompletedTask;
         
+        /*
         if (!args.Channel.IsPrivate
             && !Config.Moderation.LogParsingChannels.Contains(args.Channel.Id))
             return Task.CompletedTask;
@@ -64,6 +65,7 @@ public static Task OnMessageCreated(DiscordClient c, MessageCreatedEventArgs arg
             && (message.Content.StartsWith(Config.CommandPrefix)
                 || message.Content.StartsWith(Config.AutoRemoveCommandPrefix)))
             return Task.CompletedTask;
+        */
 
         var isSpamChannel = args.Channel.IsSpamChannel();
         var isHelpChannel = args.Channel.IsHelpChannel();
@@ -88,7 +90,8 @@ public static async void EnqueueLogProcessing(DiscordClient client, DiscordChann
                 .Select(async (ISourceHandler h, CancellationToken _) => await h.FindHandlerAsync(message, ArchiveHandlers).ConfigureAwait(false))
                 .ToList();
             using var source = possibleHandlers.FirstOrDefault(h => h.IsSuccess())?.Data;
-            var fail = possibleHandlers.FirstOrDefault(h => h is {Message.Length: >0})?.Message;
+            var fail = possibleHandlers.FirstOrDefault(h => h is { Code.Length: > 0 })
+                       ?? possibleHandlers.FirstOrDefault(h => h is { Message.Length: > 0 });
             foreach (var h in possibleHandlers)
             {
                 if (ReferenceEquals(h.Data, source))
@@ -314,11 +317,29 @@ await botMsg.UpdateOrCreateMessageAsync(
                         Config.Log.Debug($"<<<<<<< {message.Id % 100} Finished parsing in {startTime.Elapsed}");
                 }
             }
-            if (!string.IsNullOrEmpty(fail)
+            if (fail is { Code: "executable"} && !await message.Author.IsWhitelistedAsync(client, message.Channel?.Guild).ConfigureAwait(false))
+            {
+                await ContentFilter.PerformFilterActions(
+                    client,
+                    message,
+                    new()
+                    {
+                        Id = -1,
+                        String = fail.Code,
+                        Context = FilterContext.Chat,
+                        Actions = FilterAction.RemoveContent | FilterAction.SendMessage,
+                        CustomMessage = "Uploading executable files is not allowed",
+                    },
+                    infraction: "🦠 Attachment with executable file",
+                    warningReason: "Potential malware"
+                ).ConfigureAwait(false);
+                return;
+            }
+            if (fail is {Message: {Length: >0 } failMsg} 
                 && (isHelpChannel || isSpamChannel))
             {
                 Config.TelemetryClient?.TrackRequest(nameof(LogParsingHandler), start, DateTimeOffset.UtcNow - start, HttpStatusCode.InternalServerError.ToString(), false);
-                await channel.SendMessageAsync($"{message.Author.Mention} {fail}").ConfigureAwait(false);
+                await channel.SendMessageAsync($"{message.Author?.Mention} {failMsg}").ConfigureAwait(false);
                 return;
             }
 
@@ -328,7 +349,7 @@ await botMsg.UpdateOrCreateMessageAsync(
                 case "TXT":
                 {
                     await channel.SendMessageAsync(
-                        $"{message.Author.Mention}, please upload the full RPCS3.log.gz (or RPCS3.log with a zip/rar icon) file " +
+                        $"{message.Author?.Mention}, please upload the full RPCS3.log.gz (or RPCS3.log with a zip/rar icon) file " +
                         "after closing the emulator instead of copying the logs from RPCS3's interface, " +
                         "as it doesn't contain all the required information."
                     ).ConfigureAwait(false);
@@ -450,4 +471,4 @@ private static DiscordEmbedBuilder GetAnalyzingMsgEmbed(DiscordClient client)
             Color = Config.Colors.LogUnknown,
         };
     }
-}
+}
diff --git a/CompatBot/Utils/PathUtils.cs b/CompatBot/Utils/PathUtils.cs
@@ -20,4 +20,24 @@ public static string[] GetSegments(string? path)
         result.Reverse();
         return result.ToArray();
     }
+
+    public static bool HasExecutableExtension(this string? filename)
+    {
+        if (filename is not { Length: > 0 })
+            return false;
+        
+        return Path.GetExtension(filename).ToLower() switch
+        {
+            ".exe" or
+            ".bat" or
+            ".cmd" or
+            ".ps1" or
+            ".com" or
+            ".vbs" or
+            ".lnk" or
+            ".url" or
+            ".sh" => true,
+            _ => false
+        };
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ internal sealed class PlainTextHandler: IArchiveHandler`
`14`	`14`	`public Result CanHandle(string fileName, int fileSize, ReadOnlySpan<byte> header)`
`15`	`15`	`{`
`16`	`16`	`LogSize = fileSize;`
	`17`	`+ if (fileName.HasExecutableExtension())`
	`18`	`+ return Result.Failure().WithCode("executable");`
	`19`	`+`
`17`	`20`	`if (fileName.Contains("tty.log", StringComparison.InvariantCultureIgnoreCase))`
`18`	`21`	`return Result.Failure();`
`19`	`22`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public override async Task<Result<ISource>> FindHandlerAsync(DiscordMessage mess`
`28`	`28`	`var result = handler.CanHandle(attachment.FileName, attachment.FileSize, buf.AsSpan(0, read));`
`29`	`29`	`if (result.IsSuccess())`
`30`	`30`	`return Result.Success<ISource>(new DiscordAttachmentSource(attachment, handler, attachment.FileName, attachment.FileSize));`
`31`		`- else if (result.Message is {Length: >0})`
	`31`	`+ else if (result is {Code.Length: >0} or {Message.Length: >0} )`
`32`	`32`	`return result.Cast<ISource>();`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public override async Task<Result<ISource>> FindHandlerAsync(DiscordMessage mess`
`56`	`56`	`var result = handler.CanHandle(filename, filesize, buf.AsSpan(0, read));`
`57`	`57`	`if (result.IsSuccess())`
`58`	`58`	`return Result.Success<ISource>(new DropboxSource(uri, handler, filename, filesize));`
`59`		`- else if (result.Message is {Length: >0})`
	`59`	`+ else if (result is {Code.Length: >0} or {Message.Length: >0} )`
`60`	`60`	`return result.Cast<ISource>();`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public override async Task<Result<ISource>> FindHandlerAsync(DiscordMessage mess`
`55`	`55`	`var result = handler.CanHandle(filename, filesize, buf.AsSpan(0, read));`
`56`	`56`	`if (result.IsSuccess())`
`57`	`57`	`return Result.Success<ISource>(new GenericSource(uri, handler, host, filename, filesize));`
`58`		`- else if (result.Message is {Length: > 0})`
	`58`	`+ else if (result is {Code.Length: >0} or {Message.Length: >0} )`
`59`	`59`	`return result.Cast<ISource>();`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public override async Task<Result<ISource>> FindHandlerAsync(DiscordMessage mess`
`57`	`57`	`var result = handler.CanHandle(fileMeta.Name, (int)fileMeta.Size, buf.AsSpan(0, read));`
`58`	`58`	`if (result.IsSuccess())`
`59`	`59`	`return Result.Success<ISource>(new GoogleDriveSource(client, fileInfoRequest, fileMeta, handler));`
`60`		`- else if (result.Message is {Length: >0})`
	`60`	`+ else if (result is {Code.Length: >0} or {Message.Length: >0} )`
`61`	`61`	`return result.Cast<ISource>();`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public override async Task<Result<ISource>> FindHandlerAsync(DiscordMessage mess`
`61`	`61`	`var result = handler.CanHandle(filename, filesize, buf.AsSpan(0, read));`
`62`	`62`	`if (result.IsSuccess())`
`63`	`63`	`return Result.Success<ISource>(new MediafireSource(directLink, handler, filename, filesize));`
`64`		`- else if (result.Message is {Length: >0})`
	`64`	`+ else if (result is {Code.Length: >0} or {Message.Length: >0} )`
`65`	`65`	`return result.Cast<ISource>();`
`66`	`66`	`}`
`67`	`67`	`Config.Log.Debug("MediaFire Response:\n" + Encoding.UTF8.GetString(buf, 0, read));`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public override async Task<Result<ISource>> FindHandlerAsync(DiscordMessage mess`
`47`	`47`	`var result = handler.CanHandle(node.Name, (int)node.Size, buf.AsSpan(0, read));`
`48`	`48`	`if (result.IsSuccess())`
`49`	`49`	`return Result.Success<ISource>(new MegaSource(client, uri, node, handler));`
`50`		`- else if (result.Message is {Length: >0})`
	`50`	`+ else if (result is {Code.Length: >0} or {Message.Length: >0} )`
`51`	`51`	`return result.Cast<ISource>();`
`52`	`52`	`}`
`53`	`53`	`}`