From 4862dd8d2a653a55ff5190652dff75231c11fde4 Mon Sep 17 00:00:00 2001 From: ReaJason Date: Sun, 16 Nov 2025 12:43:05 +0800 Subject: [PATCH] test: fix failed cases --- .../memshell/injector/jetty/JettyHandlerAgentInjector.java | 2 +- integration-test/build.gradle.kts | 4 +++- .../integration/memshell/xxljob/XxlJob220ContainerTest.java | 6 +++--- .../integration/memshell/xxljob/XxlJob230ContainerTest.java | 6 +++--- .../integration/probe/jetty/Jetty12ee10ContainerTest.java | 2 +- .../integration/probe/jetty/Jetty12ee8ContainerTest.java | 2 +- .../integration/probe/jetty/Jetty12ee9ContainerTest.java | 2 +- .../springwebflux/SpringBoot2WebFluxContainerTest.java | 2 +- .../springwebflux/SpringBoot3WebFluxContainerTest.java | 2 +- 9 files changed, 15 insertions(+), 13 deletions(-) diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/injector/jetty/JettyHandlerAgentInjector.java b/generator/src/main/java/com/reajason/javaweb/memshell/injector/jetty/JettyHandlerAgentInjector.java index aab64cc4..a479647c 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/injector/jetty/JettyHandlerAgentInjector.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/injector/jetty/JettyHandlerAgentInjector.java @@ -59,7 +59,7 @@ public class JettyHandlerAgentInjector implements ClassFileTransformer { public byte[] transform(final ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] bytes) { if (TARGET_CLASSES.contains(className)) { - String targetMethodName = ""; + String targetMethodName = "doHandle"; if (className.contains("mortbay")) { targetMethodName = "handle"; } diff --git a/integration-test/build.gradle.kts b/integration-test/build.gradle.kts index a329427e..cfe3d587 100644 --- a/integration-test/build.gradle.kts +++ b/integration-test/build.gradle.kts @@ -31,7 +31,9 @@ dependencies { testImplementation(libs.logback.classic) testRuntimeOnly(libs.junit.platform.launcher) testImplementation(libs.hamcrest) - testImplementation(libs.bundles.testcontainers) + testImplementation(libs.bundles.testcontainers) { + exclude(group = "net.java.dev.jna", module = "jna") + } } tasks.test { diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob220ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob220ContainerTest.java index 235135ef..d94d8783 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob220ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob220ContainerTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.testcontainers.containers.DockerComposeContainer; +import org.testcontainers.containers.ComposeContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -33,8 +33,8 @@ public class XxlJob220ContainerTest { public static final String imageName = "xxljob/xxljob220"; @Container - public static final DockerComposeContainer compose = - new DockerComposeContainer<>(new File("docker-compose/xxl-job/docker-compose-220.yaml")) + public static final ComposeContainer compose = + new ComposeContainer(new File("docker-compose/xxl-job/docker-compose-220.yaml")) .withExposedService("executor", 9999); static Stream casesProvider() { diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob230ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob230ContainerTest.java index b95bb065..ea3c3aac 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob230ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob230ContainerTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.testcontainers.containers.DockerComposeContainer; +import org.testcontainers.containers.ComposeContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -33,8 +33,8 @@ public class XxlJob230ContainerTest { public static final String imageName = "xxljob/xxljob230"; @Container - public static final DockerComposeContainer compose = - new DockerComposeContainer<>(new File("docker-compose/xxl-job/docker-compose-230.yaml")) + public static final ComposeContainer compose = + new ComposeContainer(new File("docker-compose/xxl-job/docker-compose-230.yaml")) .withExposedService("executor", 9999); static Stream casesProvider() { diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/probe/jetty/Jetty12ee10ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/probe/jetty/Jetty12ee10ContainerTest.java index 7315b236..019b540a 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/probe/jetty/Jetty12ee10ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/probe/jetty/Jetty12ee10ContainerTest.java @@ -36,7 +36,7 @@ public class Jetty12ee10ContainerTest { void testJDK() { String url = getUrl(container); String data = VulTool.post(url + "/b64", DetectionTool.getJdkDetection()); - assertEquals("JRE|21.0.7|65", data); + assertEquals("JRE|21.0.9|65", data); } @Test diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/probe/jetty/Jetty12ee8ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/probe/jetty/Jetty12ee8ContainerTest.java index 0978f2c5..a1c05290 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/probe/jetty/Jetty12ee8ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/probe/jetty/Jetty12ee8ContainerTest.java @@ -36,7 +36,7 @@ public class Jetty12ee8ContainerTest { void testJDK() { String url = getUrl(container); String data = VulTool.post(url + "/b64", DetectionTool.getJdkDetection()); - assertEquals("JRE|21.0.7|65", data); + assertEquals("JRE|21.0.9|65", data); } @Test diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/probe/jetty/Jetty12ee9ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/probe/jetty/Jetty12ee9ContainerTest.java index 20a41774..410c9edd 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/probe/jetty/Jetty12ee9ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/probe/jetty/Jetty12ee9ContainerTest.java @@ -36,7 +36,7 @@ public class Jetty12ee9ContainerTest { void testJDK() { String url = getUrl(container); String data = VulTool.post(url + "/b64", DetectionTool.getJdkDetection()); - assertEquals("JRE|21.0.7|65", data); + assertEquals("JRE|21.0.9|65", data); } @Test diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/probe/springwebflux/SpringBoot2WebFluxContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/probe/springwebflux/SpringBoot2WebFluxContainerTest.java index d51462ff..1d937b11 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/probe/springwebflux/SpringBoot2WebFluxContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/probe/springwebflux/SpringBoot2WebFluxContainerTest.java @@ -37,7 +37,7 @@ public class SpringBoot2WebFluxContainerTest { void testJDK() { String url = getUrlFromSpringBoot(container); String data = VulTool.post(url + "/b64", DetectionTool.getJdkDetection()); - assertEquals("JDK|1.8.0_342|52", data); + assertEquals("JDK|1.8.0_472|52", data); } @Test diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/probe/springwebflux/SpringBoot3WebFluxContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/probe/springwebflux/SpringBoot3WebFluxContainerTest.java index abaed19e..6d76aed1 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/probe/springwebflux/SpringBoot3WebFluxContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/probe/springwebflux/SpringBoot3WebFluxContainerTest.java @@ -37,7 +37,7 @@ public class SpringBoot3WebFluxContainerTest { void testJDK() { String url = getUrlFromSpringBoot(container); String data = VulTool.post(url + "/b64", DetectionTool.getJdkDetection()); - assertEquals("JDK|17.0.2|61", data); + assertEquals("JDK|17.0.17|61", data); } @Test