diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java b/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java index eba7e9c9..179b7287 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java @@ -238,6 +238,9 @@ public class ShellAssertionTool { if (ShellTool.NeoreGeorg.equals(shellTool)) { shellConfig.setObfuscate(false); } + if (Server.Jetty.equals(server) && ShellType.FILTER.equals(shellType) && ShellTool.Suo5.equals(shellTool)) { + shellConfig.setObfuscate(false); + } ShellToolConfig shellToolConfig = null; String uniqueName = shellTool + RandomStringUtils.randomAlphabetic(5) + shellType + RandomStringUtils.randomAlphabetic(5) + packer.name(); diff --git a/web/src/i18n/en.json b/web/src/i18n/en.json index ffe3542e..a9f5e991 100644 --- a/web/src/i18n/en.json +++ b/web/src/i18n/en.json @@ -132,7 +132,8 @@ "try-to-use-shell": "Try to use the memory shell", "waitingForGeneration": "// Waiting for generation...", "customShellClass": "Custom shell class is required, base64 or classfile", - "neoreGeorgObfuscate": "Do not support obfuscate for NeoreGeorg" + "neoreGeorgObfuscate": "Do not support obfuscate for NeoreGeorg", + "jettyFilter": "Do not support obfuscate for Jetty Filter Suo5" }, "version": { "updateAvailable": "Update Available", diff --git a/web/src/i18n/zh-CN.json b/web/src/i18n/zh-CN.json index 6d431528..298e15c5 100644 --- a/web/src/i18n/zh-CN.json +++ b/web/src/i18n/zh-CN.json @@ -132,7 +132,8 @@ "try-to-use-shell": "尝试利用内存马", "waitingForGeneration": "// 等待填写参数生成中...", "customShellClass": "请输入自定义内存马类,base64 或类文件", - "neoreGeorgObfuscate": "NeoreGeorg 目前不支持代码混淆" + "neoreGeorgObfuscate": "NeoreGeorg 目前不支持代码混淆", + "jettyFilter": "Jetty Filter Suo5 暂时不支持代码混淆" }, "version": { "updateAvailable": "有可用升级", diff --git a/web/src/routes/index.tsx b/web/src/routes/index.tsx index 6445c0d4..7dfce265 100644 --- a/web/src/routes/index.tsx +++ b/web/src/routes/index.tsx @@ -92,6 +92,11 @@ function IndexComponent() { toast.warning(t("tips.neoreGeorgObfuscate")); return false; } + + if (values.obfuscate && values.server === "Jetty" && values.shellType === "Filter") { + toast.warning(t("tips.jettyFilter")); + return false; + } return true; }