test: add JRE and JDK Attacher test cases

ReaJason · ReaJason · commit ebd1bebf2fa8 · 2025-05-28T01:22:54.000+08:00
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
@@ -6,6 +6,7 @@
 import com.reajason.javaweb.memshell.*;
 import com.reajason.javaweb.memshell.config.*;
 import com.reajason.javaweb.memshell.packer.jar.AgentJarPacker;
+import com.reajason.javaweb.memshell.packer.jar.AgentJarWithJDKAttacherPacker;
 import com.reajason.javaweb.memshell.packer.jar.AgentJarWithJREAttacherPacker;
 import com.reajason.javaweb.memshell.packer.jar.JarPacker;
 import com.reajason.javaweb.suo5.Suo5Manager;
@@ -110,7 +111,7 @@ public static void packerResultAndInject(GenerateResult generateResult, String u
                     containsString("ATTACH_ACK"),
                     containsString("JVM response code = 0")
             ));
-        } else if (packer.getInstance() instanceof AgentJarWithJREAttacherPacker) {
+        } else if (packer.getInstance() instanceof AgentJarWithJREAttacherPacker || packer.getInstance() instanceof AgentJarWithJDKAttacherPacker) {
             byte[] bytes = ((JarPacker) packer.getInstance()).packBytes(generateResult);
             Path tempJar = Files.createTempFile("temp", "jar");
             Files.write(tempJar, bytes);
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/TestCasesProvider.java b/integration-test/src/test/java/com/reajason/javaweb/integration/TestCasesProvider.java
@@ -55,15 +55,21 @@ public static Stream<Arguments> getTestCases(String imageName,
                     return toolSupportedShellTypes.stream().flatMap(supportedShellType -> {
                         if (supportedShellType.startsWith(ShellType.AGENT)) {
                             if (!unSupported.contains(supportedShellType + supportedShellTool + Packers.AgentJar)) {
-                                return Stream.of(
-                                        arguments(imageName, supportedShellType, supportedShellTool, Packers.AgentJar)
-                                );
+                                Set<Packers> agentJarPackers = testPackers.stream()
+                                        .filter(packer -> packer.name().startsWith("AgentJar")).collect(Collectors.toSet());
+                                if (!agentJarPackers.isEmpty()) {
+                                    return agentJarPackers.stream()
+                                            .map(packer -> Arguments.arguments(imageName, supportedShellType, supportedShellTool, packer));
+                                } else {
+                                    return Stream.of(arguments(imageName, supportedShellType, supportedShellTool, Packers.AgentJar));
+                                }
                             }
                             return Stream.empty();
                         } else {
                             return testPackers.stream()
                                     .map(testPacker -> {
-                                        if (!unSupported.contains(supportedShellType + supportedShellTool + testPacker)) {
+                                        if (!unSupported.contains(supportedShellType + supportedShellTool + testPacker)
+                                                && !testPacker.name().startsWith("AgentJar")) {
                                             return arguments(imageName, supportedShellType, supportedShellTool, testPacker);
                                         } else {
                                             return null;
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat10ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat10ContainerTest.java
@@ -59,7 +59,7 @@ static Stream<Arguments> casesProvider() {
                 ShellType.AGENT_FILTER_CHAIN,
                 ShellType.CATALINA_AGENT_CONTEXT_VALVE
         );
-        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
+        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize, Packers.AgentJarWithJREAttacher);
         return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));
     }
 
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11ContainerTest.java
@@ -60,7 +60,7 @@ static Stream<Arguments> casesProvider() {
                 ShellType.AGENT_FILTER_CHAIN,
                 ShellType.CATALINA_AGENT_CONTEXT_VALVE
         );
-        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX);
+        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.AgentJarWithJREAttacher);
         return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));
     }
 
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11JRE21ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11JRE21ContainerTest.java
@@ -61,7 +61,7 @@ static Stream<Arguments> casesProvider() {
                 ShellType.AGENT_FILTER_CHAIN,
                 ShellType.CATALINA_AGENT_CONTEXT_VALVE
         );
-        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX);
+        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.AgentJarWithJREAttacher);
         return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));
     }
 
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat5ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat5ContainerTest.java
@@ -60,7 +60,7 @@ static Stream<Arguments> casesProvider() {
                 ShellType.AGENT_FILTER_CHAIN,
                 ShellType.CATALINA_AGENT_CONTEXT_VALVE
         );
-        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
+        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize, Packers.AgentJarWithJDKAttacher);
         return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
     }
 
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java
@@ -58,7 +58,7 @@ static Stream<Arguments> casesProvider() {
                 ShellType.AGENT_FILTER_CHAIN,
                 ShellType.CATALINA_AGENT_CONTEXT_VALVE
         );
-        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
+        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize, Packers.AgentJarWithJDKAttacher);
         return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
     }
 
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java
@@ -59,7 +59,7 @@ static Stream<Arguments> casesProvider() {
                 ShellType.AGENT_FILTER_CHAIN,
                 ShellType.CATALINA_AGENT_CONTEXT_VALVE
         );
-        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
+        List<Packers> testPackers = List.of(Packers.AgentJarWithJREAttacher);
         return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
     }
 
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat8ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat8ContainerTest.java
@@ -60,7 +60,7 @@ static Stream<Arguments> casesProvider() {
                 ShellType.WEBSOCKET,
                 ShellType.AGENT_FILTER_CHAIN,
                 ShellType.CATALINA_AGENT_CONTEXT_VALVE);
-        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
+        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize, Packers.AgentJarWithJREAttacher);
         return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
     }
 
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat9ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat9ContainerTest.java
@@ -59,7 +59,7 @@ static Stream<Arguments> casesProvider() {
                 ShellType.AGENT_FILTER_CHAIN,
                 ShellType.CATALINA_AGENT_CONTEXT_VALVE
         );
-        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
+        List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize, Packers.AgentJarWithJREAttacher);
         return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
     }
 
diff --git a/memshell-party-bom/build.gradle b/memshell-party-bom/build.gradle
@@ -11,8 +11,8 @@ dependencies {
         api 'net.bytebuddy:byte-buddy:1.17.5'
         api 'org.ow2.asm:asm-commons:9.7.1'
 
-        api 'net.java.dev.jna:jna:5.17.0'
-        api 'net.java.dev.jna:jna-platform:5.17.0'
+        api 'net.java.dev.jna:jna:5.13.0'
+        api 'net.java.dev.jna:jna-platform:5.13.0'
 
         api 'javax.servlet:javax.servlet-api:3.0.1'
         api 'jakarta.servlet:jakarta.servlet-api:6.0.0'

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ static Stream<Arguments> casesProvider() {`
`59`	`59`	`ShellType.AGENT_FILTER_CHAIN,`
`60`	`60`	`ShellType.CATALINA_AGENT_CONTEXT_VALVE`
`61`	`61`	`);`
`62`		`- List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);`
	`62`	`+ List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize, Packers.AgentJarWithJREAttacher);`
`63`	`63`	`return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ static Stream<Arguments> casesProvider() {`
`60`	`60`	`ShellType.AGENT_FILTER_CHAIN,`
`61`	`61`	`ShellType.CATALINA_AGENT_CONTEXT_VALVE`
`62`	`62`	`);`
`63`		`- List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX);`
	`63`	`+ List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.AgentJarWithJREAttacher);`
`64`	`64`	`return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ static Stream<Arguments> casesProvider() {`
`61`	`61`	`ShellType.AGENT_FILTER_CHAIN,`
`62`	`62`	`ShellType.CATALINA_AGENT_CONTEXT_VALVE`
`63`	`63`	`);`
`64`		`- List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX);`
	`64`	`+ List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.AgentJarWithJREAttacher);`
`65`	`65`	`return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));`
`66`	`66`	`}`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ static Stream<Arguments> casesProvider() {`
`58`	`58`	`ShellType.AGENT_FILTER_CHAIN,`
`59`	`59`	`ShellType.CATALINA_AGENT_CONTEXT_VALVE`
`60`	`60`	`);`
`61`		`- List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);`
	`61`	`+ List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize, Packers.AgentJarWithJDKAttacher);`
`62`	`62`	`return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);`
`63`	`63`	`}`
`64`	`64`