diff --git a/generator/src/main/java/com/reajason/javaweb/GeneratorMain.java b/generator/src/main/java/com/reajason/javaweb/GeneratorMain.java index 736df014..2ff79602 100644 --- a/generator/src/main/java/com/reajason/javaweb/GeneratorMain.java +++ b/generator/src/main/java/com/reajason/javaweb/GeneratorMain.java @@ -20,10 +20,10 @@ public class GeneratorMain { public static void main(String[] args) throws IOException { ShellConfig shellConfig = ShellConfig.builder() - .server(Server.Resin) + .server(Server.Tomcat) .shellTool(ShellTool.Command) .shellType(Constants.FILTER) - .targetJreVersion(Opcodes.V11) + .targetJreVersion(Opcodes.V1_6) .build(); GodzillaConfig godzillaConfig = GodzillaConfig.builder() .pass("pass") @@ -34,10 +34,10 @@ public class GeneratorMain { InjectorConfig injectorConfig = new InjectorConfig(); GenerateResult generateResult = generate(shellConfig, injectorConfig, commandConfig); if (generateResult != null) { - Files.write(Paths.get(generateResult.getInjectorClassName() + ".class"), generateResult.getInjectorBytes(), StandardOpenOption.CREATE_NEW); - Files.write(Paths.get(generateResult.getShellClassName() + ".class"), generateResult.getShellBytes(), StandardOpenOption.CREATE_NEW); +// Files.write(Paths.get(generateResult.getInjectorClassName() + ".class"), generateResult.getInjectorBytes(), StandardOpenOption.CREATE_NEW); +// Files.write(Paths.get(generateResult.getShellClassName() + ".class"), generateResult.getShellBytes(), StandardOpenOption.CREATE_NEW); System.out.println(Base64.encodeBase64String(generateResult.getInjectorBytes())); - System.out.println(Base64.encodeBase64String(Packer.INSTANCE.JSP.getPacker().pack(generateResult))); + System.out.println(new String(Packer.INSTANCE.JSP.getPacker().pack(generateResult))); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java b/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java index 945b2537..25d2a5f4 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java @@ -50,7 +50,6 @@ public class ShellAssertionTool { } public static void assertInjectIsOk(String url, String shellType, ShellTool shellTool, byte[] content, Packer.INSTANCE packer) { - log.info(new String(content)); switch (packer) { case JSP -> { String uploadEntry = url + "/upload"; diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/VulTool.java b/integration-test/src/test/java/com/reajason/javaweb/integration/VulTool.java index ef6af0a2..fa1171fc 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/VulTool.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/VulTool.java @@ -50,7 +50,7 @@ public class VulTool { .url(uploadUrl).post(requestBody) .build(); try (Response response = new OkHttpClient().newCall(request).execute()) { - log.info(response.body().string()); +// log.info(response.body().string()); Assertions.assertNotEquals(404, response.code()); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java index cc50e419..bc473329 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java @@ -58,6 +58,7 @@ public class Tomcat6ContainerTest { @AfterAll static void tearDown() { String logs = container.getLogs(); + log.info(logs); assertThat("Logs should not contain any exceptions", logs, doesNotContainException()); } diff --git a/vul-webapp/build.gradle b/vul-webapp/build.gradle index fb8d0162..ebc2c25d 100644 --- a/vul-webapp/build.gradle +++ b/vul-webapp/build.gradle @@ -21,6 +21,6 @@ dependencies { implementation 'org.apache.velocity:velocity:1.7' implementation 'ognl:ognl:2.7.3' implementation 'org.springframework:spring-expression:4.3.30.RELEASE' - implementation 'de.odysseus.juel:juel-api:2.2.7' + providedCompile 'de.odysseus.juel:juel-api:2.2.7' providedCompile "javax.servlet:servlet-api:2.5" } diff --git a/vul-webapp/src/main/webapp/shell.jsp b/vul-webapp/src/main/webapp/shell.jsp new file mode 100644 index 00000000..9836bffb --- /dev/null +++ b/vul-webapp/src/main/webapp/shell.jsp @@ -0,0 +1,16 @@ +<%-- + Created by IntelliJ IDEA. + User: ReaJason + Date: 2024/12/14 + Time: 20:29 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + $Title$ + + + $END$ + +