mirror of
https://github.com/ReaJason/MemShellParty.git
synced 2026-09-24 07:51:52 +08:00
feat: use ASM Agent by default
This commit is contained in:
+1
-3
@@ -57,9 +57,7 @@ public class Tomcat10ContainerTest {
|
||||
ShellType.JAKARTA_VALVE,
|
||||
ShellType.JAKARTA_WEBSOCKET,
|
||||
ShellType.AGENT_FILTER_CHAIN,
|
||||
ShellType.AGENT_FILTER_CHAIN_ASM,
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE,
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE
|
||||
);
|
||||
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
|
||||
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));
|
||||
|
||||
+1
-3
@@ -58,9 +58,7 @@ public class Tomcat11ContainerTest {
|
||||
ShellType.JAKARTA_VALVE,
|
||||
ShellType.JAKARTA_WEBSOCKET,
|
||||
ShellType.AGENT_FILTER_CHAIN,
|
||||
ShellType.AGENT_FILTER_CHAIN_ASM,
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE,
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE
|
||||
);
|
||||
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX);
|
||||
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));
|
||||
|
||||
+1
-3
@@ -59,9 +59,7 @@ public class Tomcat11JRE21ContainerTest {
|
||||
ShellType.JAKARTA_VALVE,
|
||||
ShellType.JAKARTA_WEBSOCKET,
|
||||
ShellType.AGENT_FILTER_CHAIN,
|
||||
ShellType.AGENT_FILTER_CHAIN_ASM,
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE,
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE
|
||||
);
|
||||
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX);
|
||||
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));
|
||||
|
||||
+4
-1
@@ -56,7 +56,10 @@ public class Tomcat5ContainerTest {
|
||||
List<String> supportedShellTypes = List.of(
|
||||
ShellType.FILTER,
|
||||
ShellType.LISTENER,
|
||||
ShellType.VALVE);
|
||||
ShellType.VALVE,
|
||||
ShellType.AGENT_FILTER_CHAIN,
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE
|
||||
);
|
||||
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
|
||||
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
|
||||
}
|
||||
|
||||
+2
-3
@@ -56,9 +56,8 @@ public class Tomcat6ContainerTest {
|
||||
ShellType.LISTENER,
|
||||
ShellType.VALVE,
|
||||
ShellType.AGENT_FILTER_CHAIN,
|
||||
ShellType.AGENT_FILTER_CHAIN_ASM,
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE,
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM);
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE
|
||||
);
|
||||
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
|
||||
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
|
||||
}
|
||||
|
||||
+3
-3
@@ -57,9 +57,8 @@ public class Tomcat7ContainerTest {
|
||||
ShellType.VALVE,
|
||||
ShellType.WEBSOCKET,
|
||||
ShellType.AGENT_FILTER_CHAIN,
|
||||
ShellType.AGENT_FILTER_CHAIN_ASM,
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE,
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM);
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE
|
||||
);
|
||||
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
|
||||
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
|
||||
}
|
||||
@@ -67,6 +66,7 @@ public class Tomcat7ContainerTest {
|
||||
@AfterAll
|
||||
static void tearDown() {
|
||||
String logs = container.getLogs();
|
||||
log.info(logs);
|
||||
assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
|
||||
}
|
||||
|
||||
|
||||
+2
-3
@@ -59,9 +59,7 @@ public class Tomcat8ContainerTest {
|
||||
ShellType.VALVE,
|
||||
ShellType.WEBSOCKET,
|
||||
ShellType.AGENT_FILTER_CHAIN,
|
||||
ShellType.AGENT_FILTER_CHAIN_ASM,
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE,
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM);
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE);
|
||||
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
|
||||
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
|
||||
}
|
||||
@@ -69,6 +67,7 @@ public class Tomcat8ContainerTest {
|
||||
@AfterAll
|
||||
static void tearDown() {
|
||||
String logs = container.getLogs();
|
||||
log.info(logs);
|
||||
assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
|
||||
}
|
||||
|
||||
|
||||
+2
-3
@@ -57,9 +57,8 @@ public class Tomcat9ContainerTest {
|
||||
ShellType.VALVE,
|
||||
ShellType.WEBSOCKET,
|
||||
ShellType.AGENT_FILTER_CHAIN,
|
||||
ShellType.AGENT_FILTER_CHAIN_ASM,
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE,
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE_ASM);
|
||||
ShellType.CATALINA_AGENT_CONTEXT_VALVE
|
||||
);
|
||||
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
|
||||
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user