Skip to content

Commit 4862dd8

Browse files
committed
test: fix failed cases
1 parent 1ea0351 commit 4862dd8

File tree

9 files changed

+15
-13
lines changed

9 files changed

+15
-13
lines changed

generator/src/main/java/com/reajason/javaweb/memshell/injector/jetty/JettyHandlerAgentInjector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private static void launch(Instrumentation inst) throws Exception {
5959
public byte[] transform(final ClassLoader loader, String className, Class<?> classBeingRedefined,
6060
ProtectionDomain protectionDomain, byte[] bytes) {
6161
if (TARGET_CLASSES.contains(className)) {
62-
String targetMethodName = "";
62+
String targetMethodName = "doHandle";
6363
if (className.contains("mortbay")) {
6464
targetMethodName = "handle";
6565
}

integration-test/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ dependencies {
3131
testImplementation(libs.logback.classic)
3232
testRuntimeOnly(libs.junit.platform.launcher)
3333
testImplementation(libs.hamcrest)
34-
testImplementation(libs.bundles.testcontainers)
34+
testImplementation(libs.bundles.testcontainers) {
35+
exclude(group = "net.java.dev.jna", module = "jna")
36+
}
3537
}
3638

3739
tasks.test {

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob220ContainerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.junit.jupiter.params.ParameterizedTest;
1212
import org.junit.jupiter.params.provider.Arguments;
1313
import org.junit.jupiter.params.provider.MethodSource;
14-
import org.testcontainers.containers.DockerComposeContainer;
14+
import org.testcontainers.containers.ComposeContainer;
1515
import org.testcontainers.junit.jupiter.Container;
1616
import org.testcontainers.junit.jupiter.Testcontainers;
1717

@@ -33,8 +33,8 @@ public class XxlJob220ContainerTest {
3333
public static final String imageName = "xxljob/xxljob220";
3434

3535
@Container
36-
public static final DockerComposeContainer<?> compose =
37-
new DockerComposeContainer<>(new File("docker-compose/xxl-job/docker-compose-220.yaml"))
36+
public static final ComposeContainer compose =
37+
new ComposeContainer(new File("docker-compose/xxl-job/docker-compose-220.yaml"))
3838
.withExposedService("executor", 9999);
3939

4040
static Stream<Arguments> casesProvider() {

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob230ContainerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.junit.jupiter.params.ParameterizedTest;
1212
import org.junit.jupiter.params.provider.Arguments;
1313
import org.junit.jupiter.params.provider.MethodSource;
14-
import org.testcontainers.containers.DockerComposeContainer;
14+
import org.testcontainers.containers.ComposeContainer;
1515
import org.testcontainers.junit.jupiter.Container;
1616
import org.testcontainers.junit.jupiter.Testcontainers;
1717

@@ -33,8 +33,8 @@ public class XxlJob230ContainerTest {
3333
public static final String imageName = "xxljob/xxljob230";
3434

3535
@Container
36-
public static final DockerComposeContainer<?> compose =
37-
new DockerComposeContainer<>(new File("docker-compose/xxl-job/docker-compose-230.yaml"))
36+
public static final ComposeContainer compose =
37+
new ComposeContainer(new File("docker-compose/xxl-job/docker-compose-230.yaml"))
3838
.withExposedService("executor", 9999);
3939

4040
static Stream<Arguments> casesProvider() {

integration-test/src/test/java/com/reajason/javaweb/integration/probe/jetty/Jetty12ee10ContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class Jetty12ee10ContainerTest {
3636
void testJDK() {
3737
String url = getUrl(container);
3838
String data = VulTool.post(url + "/b64", DetectionTool.getJdkDetection());
39-
assertEquals("JRE|21.0.7|65", data);
39+
assertEquals("JRE|21.0.9|65", data);
4040
}
4141

4242
@Test

integration-test/src/test/java/com/reajason/javaweb/integration/probe/jetty/Jetty12ee8ContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class Jetty12ee8ContainerTest {
3636
void testJDK() {
3737
String url = getUrl(container);
3838
String data = VulTool.post(url + "/b64", DetectionTool.getJdkDetection());
39-
assertEquals("JRE|21.0.7|65", data);
39+
assertEquals("JRE|21.0.9|65", data);
4040
}
4141

4242
@Test

integration-test/src/test/java/com/reajason/javaweb/integration/probe/jetty/Jetty12ee9ContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class Jetty12ee9ContainerTest {
3636
void testJDK() {
3737
String url = getUrl(container);
3838
String data = VulTool.post(url + "/b64", DetectionTool.getJdkDetection());
39-
assertEquals("JRE|21.0.7|65", data);
39+
assertEquals("JRE|21.0.9|65", data);
4040
}
4141

4242
@Test

integration-test/src/test/java/com/reajason/javaweb/integration/probe/springwebflux/SpringBoot2WebFluxContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class SpringBoot2WebFluxContainerTest {
3737
void testJDK() {
3838
String url = getUrlFromSpringBoot(container);
3939
String data = VulTool.post(url + "/b64", DetectionTool.getJdkDetection());
40-
assertEquals("JDK|1.8.0_342|52", data);
40+
assertEquals("JDK|1.8.0_472|52", data);
4141
}
4242

4343
@Test

integration-test/src/test/java/com/reajason/javaweb/integration/probe/springwebflux/SpringBoot3WebFluxContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class SpringBoot3WebFluxContainerTest {
3737
void testJDK() {
3838
String url = getUrlFromSpringBoot(container);
3939
String data = VulTool.post(url + "/b64", DetectionTool.getJdkDetection());
40-
assertEquals("JDK|17.0.2|61", data);
40+
assertEquals("JDK|17.0.17|61", data);
4141
}
4242

4343
@Test

0 commit comments

Comments
 (0)