Skip to content

Commit 1a35067

Browse files
ReaJasonReaJason
committed
test: add jboss eap-8.1 cases
1 parent b6caa04 commit 1a35067

File tree

5 files changed

+1493
-2
lines changed

5 files changed

+1493
-2
lines changed

‎.github/workflows/memshell-integration-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- middleware: "jbossas"
2828
depend_tasks: ":vul:vul-webapp:war"
2929
- middleware: "jbosseap"
30-
depend_tasks: ":vul:vul-webapp:war"
30+
depend_tasks: ":vul:vul-webapp:war :vul:vul-webapp-jakarta:war"
3131
- middleware: "wildfly"
3232
depend_tasks: ":vul:vul-webapp:war :vul:vul-webapp-jakarta:war"
3333
- middleware: "glassfish"

‎.github/workflows/probe-integration-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- middleware: "jbossas"
2626
depend_tasks: ":vul:vul-webapp:war"
2727
- middleware: "jbosseap"
28-
depend_tasks: ":vul:vul-webapp:war"
28+
depend_tasks: ":vul:vul-webapp:war :vul:vul-webapp-jakarta:war"
2929
- middleware: "wildfly"
3030
depend_tasks: ":vul:vul-webapp:war :vul:vul-webapp-jakarta:war"
3131
- middleware: "glassfish"

‎integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbosseap/JbossEap81ContainerTest.java‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
package com.reajason.javaweb.integration.memshell.jbosseap;
2+
3+
import com.reajason.javaweb.Server;
4+
import com.reajason.javaweb.integration.ShellAssertion;
5+
import com.reajason.javaweb.integration.TestCasesProvider;
6+
import com.reajason.javaweb.memshell.ShellTool;
7+
import com.reajason.javaweb.memshell.ShellType;
8+
import com.reajason.javaweb.packer.Packers;
9+
import lombok.extern.slf4j.Slf4j;
10+
import net.bytebuddy.jar.asm.Opcodes;
11+
import org.junit.jupiter.api.AfterAll;
12+
import org.junit.jupiter.params.ParameterizedTest;
13+
import org.junit.jupiter.params.provider.Arguments;
14+
import org.junit.jupiter.params.provider.MethodSource;
15+
import org.junit.jupiter.params.provider.ValueSource;
16+
import org.testcontainers.containers.GenericContainer;
17+
import org.testcontainers.containers.Network;
18+
import org.testcontainers.containers.wait.strategy.Wait;
19+
import org.testcontainers.images.builder.ImageFromDockerfile;
20+
import org.testcontainers.junit.jupiter.Container;
21+
import org.testcontainers.junit.jupiter.Testcontainers;
22+
23+
import java.util.List;
24+
import java.util.stream.Stream;
25+
26+
import static com.reajason.javaweb.integration.ContainerTool.*;
27+
import static com.reajason.javaweb.integration.DoesNotContainExceptionMatcher.doesNotContainException;
28+
import static com.reajason.javaweb.integration.ShellAssertion.shellInjectIsOk;
29+
import static org.hamcrest.MatcherAssert.assertThat;
30+
31+
/**
32+
* @author ReaJason
33+
* @since 2024/12/10
34+
*/
35+
@Slf4j
36+
@Testcontainers
37+
public class JbossEap81ContainerTest {
38+
public static final String imageName = "reajason/jboss:eap-8.1-jdk17";
39+
static Network network = Network.newNetwork();
40+
@Container
41+
public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
42+
.withDockerfile(neoGeorgDockerfile))
43+
.withNetwork(network);
44+
@Container
45+
public static final GenericContainer<?> container = new GenericContainer<>(imageName)
46+
.withCopyToContainer(warJakartaFile, "/usr/local/jboss/standalone/deployments/app.war")
47+
.withCopyToContainer(jattachFile, "/jattach")
48+
.withCopyToContainer(jbossPid, "/fetch_pid.sh")
49+
.withNetwork(network)
50+
.withNetworkAliases("app")
51+
.waitingFor(Wait.forHttp("/app"))
52+
.withExposedPorts(8080);
53+
54+
static Stream<Arguments> casesProvider() {
55+
String server = Server.Undertow;
56+
List<String> supportedShellTypes = List.of(
57+
ShellType.JAKARTA_SERVLET,
58+
ShellType.JAKARTA_FILTER,
59+
ShellType.JAKARTA_LISTENER,
60+
ShellType.UNDERTOW_AGENT_SERVLET_HANDLER
61+
);
62+
List<Packers> testPackers = List.of(Packers.JSP);
63+
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers,
64+
null, List.of(ShellTool.AntSword) // AntSword not support jakarta
65+
);
66+
}
67+
68+
@AfterAll
69+
static void tearDown() {
70+
String logs = container.getLogs();
71+
log.info(logs);
72+
assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
73+
}
74+
75+
@ParameterizedTest(name = "{0}|{1}{2}|{3}")
76+
@MethodSource("casesProvider")
77+
void test(String imageName, String shellType, String shellTool, Packers packer) {
78+
shellInjectIsOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V17, packer, container, python);
79+
}
80+
81+
@ParameterizedTest
82+
@ValueSource(strings = {ShellType.JAKARTA_SERVLET,
83+
ShellType.JAKARTA_FILTER,
84+
ShellType.JAKARTA_LISTENER,})
85+
void testProbeInject(String shellType) {
86+
String url = getUrl(container);
87+
ShellAssertion.testProbeInject(url, Server.Undertow, shellType, Opcodes.V17);
88+
}
89+
}

‎integration-test/src/test/java/com/reajason/javaweb/integration/probe/jbosseap/JbossEap81ContainerTest.java‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
package com.reajason.javaweb.integration.probe.jbosseap;
2+
3+
import com.reajason.javaweb.Server;
4+
import com.reajason.javaweb.integration.ProbeAssertion;
5+
import com.reajason.javaweb.integration.VulTool;
6+
import com.reajason.javaweb.integration.probe.DetectionTool;
7+
import lombok.SneakyThrows;
8+
import lombok.extern.slf4j.Slf4j;
9+
import org.junit.jupiter.api.Test;
10+
import org.objectweb.asm.Opcodes;
11+
import org.testcontainers.containers.GenericContainer;
12+
import org.testcontainers.containers.wait.strategy.Wait;
13+
import org.testcontainers.junit.jupiter.Container;
14+
import org.testcontainers.junit.jupiter.Testcontainers;
15+
16+
import java.nio.file.Files;
17+
import java.nio.file.Paths;
18+
19+
import static com.reajason.javaweb.integration.ContainerTool.*;
20+
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
22+
/**
23+
* @author ReaJason
24+
* @since 2024/12/10
25+
*/
26+
@Slf4j
27+
@Testcontainers
28+
public class JbossEap81ContainerTest {
29+
public static final String imageName = "reajason/jboss:eap-8.1-jdk17";
30+
31+
@Container
32+
public static final GenericContainer<?> container = new GenericContainer<>(imageName)
33+
.withCopyToContainer(warJakartaFile, "/usr/local/jboss/standalone/deployments/app.war")
34+
.waitingFor(Wait.forHttp("/app"))
35+
.withExposedPorts(8080);
36+
37+
@Test
38+
void testJDK() {
39+
String url = getUrl(container);
40+
String data = VulTool.post(url + "/b64", DetectionTool.getJdkDetection());
41+
assertEquals("JDK|17.0.15|61", data);
42+
}
43+
44+
@Test
45+
@SneakyThrows
46+
void testBasicInfo() {
47+
String url = getUrl(container);
48+
String data = VulTool.post(url + "/b64", DetectionTool.getBasicInfoPrinter());
49+
Files.writeString(Paths.get("src", "test", "resources", "infos", this.getClass().getSimpleName() + "BasicInfo.txt"), data);
50+
}
51+
52+
@Test
53+
void testServerDetection() {
54+
String url = getUrl(container);
55+
String data = VulTool.post(url + "/b64", DetectionTool.getServerDetection());
56+
assertEquals(Server.Undertow, data);
57+
}
58+
59+
@Test
60+
@SneakyThrows
61+
void testCommandReqHeaderResponseBody() {
62+
String url = getUrl(container);
63+
ProbeAssertion.responseCommandIsOk(url, Server.Undertow, Opcodes.V17);
64+
}
65+
66+
@Test
67+
@SneakyThrows
68+
void testBytecodeReqParamResponseBody() {
69+
String url = getUrl(container);
70+
ProbeAssertion.responseBytecodeIsOk(url, Server.Undertow, Opcodes.V17);
71+
}
72+
}

0 commit comments

Comments
 (0)