feat: support servletNameFilter

integration-test/src/test/java/com/reajason/javaweb/integration/probe/DetectionTool.java

@@ -34,24 +34,4 @@ public class DetectionTool {
     public static String getServerDetection() {
         return getBase64Class(ServerProbe.class);
     }
-
-    public static String getResinFilterProbe() {
-        return getBase64Class(ResinFilterProbe.class);
-    }
-
-    public static String getUndertowFilterProbe() {
-        return getBase64Class(UndertowFilterProbe.class);
-    }
-
-    public static String getApusicFilterProbe() {
-        return getBase64Class(ApusicFilterProbe.class);
-    }
-
-    public static String getWebLogicFilterProbe() {
-        return getBase64Class(WebLogicFilterProbe.class);
-    }
-
-    public static String getWebSphereFilterProbe() {
-        return getBase64Class(WebSphereFilterProbe.class);
-    }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/resin/Resin3116ContainerTest.java

@@ -2,11 +2,14 @@ package com.reajason.javaweb.integration.probe.resin;
 
 import com.reajason.javaweb.Server;
 import com.reajason.javaweb.integration.ProbeAssertion;
+import com.reajason.javaweb.integration.ShellAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+import com.reajason.javaweb.memshell.MemShellResult;
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.probe.payload.FilterProbeFactory;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
@@ -81,20 +84,17 @@ public class Resin3116ContainerTest {
     @Test
     void testFilterProbe() {
         String url = getUrl(container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getResinFilterProbe());
-        System.out.println(data);
-        assertThat(data, anyOf(
-                containsString("Context: ")
-        ));
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.Resin));
+        ShellAssertion.assertFilterProbeIsRight(data);
     }
 
     @Test
     void testFilterFirstInject() {
         String url = getUrl(container);
-        shellInjectIsOk(url, Server.Resin, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getResinFilterProbe());
+        MemShellResult memShellResult = shellInjectIsOk(url, Server.Resin, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.Resin));
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith("com.caucho.server.dispatch.handlers")));
+        assertEquals(filterName, memShellResult.getShellClassName());
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/resin/Resin318ContainerTest.java

@@ -2,11 +2,14 @@ package com.reajason.javaweb.integration.probe.resin;
 
 import com.reajason.javaweb.Server;
 import com.reajason.javaweb.integration.ProbeAssertion;
+import com.reajason.javaweb.integration.ShellAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+import com.reajason.javaweb.memshell.MemShellResult;
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.probe.payload.FilterProbeFactory;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
@@ -86,20 +89,17 @@ public class Resin318ContainerTest {
     @Test
     void testFilterProbe() {
         String url = getUrl(container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getResinFilterProbe());
-        System.out.println(data);
-        assertThat(data, anyOf(
-                containsString("Context: ")
-        ));
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.Resin));
+        ShellAssertion.assertFilterProbeIsRight(data);
     }
 
     @Test
     void testFilterFirstInject() {
         String url = getUrl(container);
-        shellInjectIsOk(url, Server.Resin, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getResinFilterProbe());
+        MemShellResult memShellResult = shellInjectIsOk(url, Server.Resin, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.Resin));
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith("com.caucho.server.dispatch.handlers")));
+        assertEquals(filterName, memShellResult.getShellClassName());
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/resin/Resin4058ContainerTest.java

@@ -2,11 +2,14 @@ package com.reajason.javaweb.integration.probe.resin;
 
 import com.reajason.javaweb.Server;
 import com.reajason.javaweb.integration.ProbeAssertion;
+import com.reajason.javaweb.integration.ShellAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+import com.reajason.javaweb.memshell.MemShellResult;
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.probe.payload.FilterProbeFactory;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
@@ -80,20 +83,17 @@ public class Resin4058ContainerTest {
     @Test
     void testFilterProbe() {
         String url = getUrl(container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getResinFilterProbe());
-        System.out.println(data);
-        assertThat(data, anyOf(
-                containsString("Context: ")
-        ));
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.Resin));
+        ShellAssertion.assertFilterProbeIsRight(data);
     }
 
     @Test
     void testFilterFirstInject() {
         String url = getUrl(container);
-        shellInjectIsOk(url, Server.Resin, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getResinFilterProbe());
+        MemShellResult memShellResult = shellInjectIsOk(url, Server.Resin, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.Resin));
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith("com.caucho.server.dispatch.handlers")));
+        assertEquals(filterName, memShellResult.getShellClassName());
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/resin/Resin4067ContainerTest.java

@@ -2,11 +2,14 @@ package com.reajason.javaweb.integration.probe.resin;
 
 import com.reajason.javaweb.Server;
 import com.reajason.javaweb.integration.ProbeAssertion;
+import com.reajason.javaweb.integration.ShellAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+import com.reajason.javaweb.memshell.MemShellResult;
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.probe.payload.FilterProbeFactory;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
@@ -80,20 +83,17 @@ public class Resin4067ContainerTest {
     @Test
     void testFilterProbe() {
         String url = getUrl(container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getResinFilterProbe());
-        System.out.println(data);
-        assertThat(data, anyOf(
-                containsString("Context: ")
-        ));
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.Resin));
+        ShellAssertion.assertFilterProbeIsRight(data);
     }
 
     @Test
     void testFilterFirstInject() {
         String url = getUrl(container);
-        shellInjectIsOk(url, Server.Resin, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getResinFilterProbe());
+        MemShellResult memShellResult = shellInjectIsOk(url, Server.Resin, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.Resin));
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith("com.caucho.server.dispatch.handlers")));
+        assertEquals(filterName, memShellResult.getShellClassName());
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/websphere/OpenLiberty18ContainerTest.java

@@ -2,18 +2,19 @@ package com.reajason.javaweb.integration.probe.websphere;
 
 import com.reajason.javaweb.Server;
 import com.reajason.javaweb.integration.ProbeAssertion;
+import com.reajason.javaweb.integration.ShellAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+import com.reajason.javaweb.memshell.MemShellResult;
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
-import com.reajason.javaweb.utils.CommonUtil;
+import com.reajason.javaweb.probe.payload.FilterProbeFactory;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
@@ -27,8 +28,6 @@ import java.util.List;
 import static com.reajason.javaweb.integration.ContainerTool.getUrlFromWAS;
 import static com.reajason.javaweb.integration.ContainerTool.warFile;
 import static com.reajason.javaweb.integration.ShellAssertion.shellInjectIsOk;
-import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
@@ -91,21 +90,17 @@ public class OpenLiberty18ContainerTest {
     @Test
     void testFilterProbe() {
         String url = getUrlFromWAS(container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
-        System.out.println(data);
-        assertThat(data, anyOf(
-                containsString("Context: ")
-        ));
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.WebSphere));
+        ShellAssertion.assertFilterProbeIsRight(data);
     }
 
     @Test
     void testFilterFirstInject() {
         String url = getUrlFromWAS(container);
-        shellInjectIsOk(url, Server.WebSphere, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
-        log.info(data);
+        MemShellResult memShellResult = shellInjectIsOk(url, Server.WebSphere, ShellType.FILTER, ShellTool.Command, Opcodes.V1_6, Packers.BigInteger, container);
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.WebSphere));
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.WebSphere))));
+        assertEquals(filterName, memShellResult.getShellClassName());
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/websphere/OpenLiberty20ContainerTest.java

@@ -2,18 +2,19 @@ package com.reajason.javaweb.integration.probe.websphere;
 
 import com.reajason.javaweb.Server;
 import com.reajason.javaweb.integration.ProbeAssertion;
+import com.reajason.javaweb.integration.ShellAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+import com.reajason.javaweb.memshell.MemShellResult;
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
-import com.reajason.javaweb.utils.CommonUtil;
+import com.reajason.javaweb.probe.payload.FilterProbeFactory;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
@@ -27,8 +28,6 @@ import java.util.List;
 import static com.reajason.javaweb.integration.ContainerTool.getUrlFromWAS;
 import static com.reajason.javaweb.integration.ContainerTool.warFile;
 import static com.reajason.javaweb.integration.ShellAssertion.shellInjectIsOk;
-import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
@@ -91,21 +90,18 @@ public class OpenLiberty20ContainerTest {
     @Test
     void testFilterProbe() {
         String url = getUrlFromWAS(container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
-        System.out.println(data);
-        assertThat(data, anyOf(
-                containsString("Context: ")
-        ));
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.WebSphere));
+        ShellAssertion.assertFilterProbeIsRight(data);
     }
 
     @Test
     void testFilterFirstInject() {
         String url = getUrlFromWAS(container);
-        shellInjectIsOk(url, Server.WebSphere, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
+        MemShellResult memShellResult = shellInjectIsOk(url, Server.WebSphere, ShellType.FILTER, ShellTool.Command, Opcodes.V1_6, Packers.BigInteger, container);
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.WebSphere));
         log.info(data);
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.WebSphere))));
+        assertEquals(filterName, memShellResult.getShellClassName());
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/websphere/OpenLiberty22ContainerTest.java

@@ -2,18 +2,19 @@ package com.reajason.javaweb.integration.probe.websphere;
 
 import com.reajason.javaweb.Server;
 import com.reajason.javaweb.integration.ProbeAssertion;
+import com.reajason.javaweb.integration.ShellAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+import com.reajason.javaweb.memshell.MemShellResult;
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
-import com.reajason.javaweb.utils.CommonUtil;
+import com.reajason.javaweb.probe.payload.FilterProbeFactory;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
@@ -27,8 +28,6 @@ import java.util.List;
 import static com.reajason.javaweb.integration.ContainerTool.getUrlFromWAS;
 import static com.reajason.javaweb.integration.ContainerTool.warFile;
 import static com.reajason.javaweb.integration.ShellAssertion.shellInjectIsOk;
-import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
@@ -91,21 +90,17 @@ public class OpenLiberty22ContainerTest {
     @Test
     void testFilterProbe() {
         String url = getUrlFromWAS(container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
-        System.out.println(data);
-        assertThat(data, anyOf(
-                containsString("Context: ")
-        ));
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.WebSphere));
+        ShellAssertion.assertFilterProbeIsRight(data);
     }
 
     @Test
     void testFilterFirstInject() {
         String url = getUrlFromWAS(container);
-        shellInjectIsOk(url, Server.WebSphere, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
-        log.info(data);
+        MemShellResult memShellResult = shellInjectIsOk(url, Server.WebSphere, ShellType.FILTER, ShellTool.Command, Opcodes.V1_6, Packers.BigInteger, container);
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.WebSphere));
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.WebSphere))));
+        assertEquals(filterName, memShellResult.getShellClassName());
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/websphere/OpenLiberty25ContainerTest.java

@@ -2,11 +2,14 @@ package com.reajason.javaweb.integration.probe.websphere;
 
 import com.reajason.javaweb.Server;
 import com.reajason.javaweb.integration.ProbeAssertion;
+import com.reajason.javaweb.integration.ShellAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+import com.reajason.javaweb.memshell.MemShellResult;
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.probe.payload.FilterProbeFactory;
 import com.reajason.javaweb.utils.CommonUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -91,21 +94,17 @@ public class OpenLiberty25ContainerTest {
     @Test
     void testFilterProbe() {
         String url = getUrlFromWAS(container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
-        System.out.println(data);
-        assertThat(data, anyOf(
-                containsString("Context: ")
-        ));
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.WebSphere));
+        ShellAssertion.assertFilterProbeIsRight(data);
     }
 
     @Test
     void testFilterFirstInject() {
         String url = getUrlFromWAS(container);
-        shellInjectIsOk(url, Server.WebSphere, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
-        log.info(data);
+        MemShellResult memShellResult = shellInjectIsOk(url, Server.WebSphere, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.WebSphere));
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.WebSphere))));
+        assertEquals(filterName, memShellResult.getShellClassName());
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/websphere/WebSphere855ContainerTest.java

@@ -2,11 +2,14 @@ package com.reajason.javaweb.integration.probe.websphere;
 
 import com.reajason.javaweb.Server;
 import com.reajason.javaweb.integration.ProbeAssertion;
+import com.reajason.javaweb.integration.ShellAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+import com.reajason.javaweb.memshell.MemShellResult;
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.probe.payload.FilterProbeFactory;
 import com.reajason.javaweb.utils.CommonUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -26,7 +29,8 @@ import java.util.List;
 import static com.reajason.javaweb.integration.ContainerTool.getUrlFromWAS;
 import static com.reajason.javaweb.integration.ContainerTool.warFile;
 import static com.reajason.javaweb.integration.ShellAssertion.shellInjectIsOk;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.anyOf;
+import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -89,21 +93,17 @@ public class WebSphere855ContainerTest {
     @Test
     void testFilterProbe() {
         String url = getUrlFromWAS(container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
-        System.out.println(data);
-        assertThat(data, anyOf(
-                containsString("Context: ")
-        ));
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.WebSphere));
+        ShellAssertion.assertFilterProbeIsRight(data);
     }
 
     @Test
     void testFilterFirstInject() {
         String url = getUrlFromWAS(container);
-        shellInjectIsOk(url, Server.WebSphere, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
-        log.info(data);
+        MemShellResult memShellResult = shellInjectIsOk(url, Server.WebSphere, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.WebSphere));
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.WebSphere))));
+        assertEquals(filterName, memShellResult.getShellClassName());
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/websphere/WebSphere905ContainerTest.java

@@ -2,11 +2,14 @@ package com.reajason.javaweb.integration.probe.websphere;
 
 import com.reajason.javaweb.Server;
 import com.reajason.javaweb.integration.ProbeAssertion;
+import com.reajason.javaweb.integration.ShellAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+import com.reajason.javaweb.memshell.MemShellResult;
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.probe.payload.FilterProbeFactory;
 import com.reajason.javaweb.utils.CommonUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -85,21 +88,17 @@ public class WebSphere905ContainerTest {
     @Test
     void testFilterProbe() {
         String url = getUrlFromWAS(container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
-        System.out.println(data);
-        assertThat(data, anyOf(
-                containsString("Context: ")
-        ));
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.WebSphere));
+        ShellAssertion.assertFilterProbeIsRight(data);
     }
 
     @Test
     void testFilterFirstInject() {
         String url = getUrlFromWAS(container);
-        shellInjectIsOk(url, Server.WebSphere, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
-        log.info(data);
+        MemShellResult memShellResult = shellInjectIsOk(url, Server.WebSphere, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.WebSphere));
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.WebSphere))));
+        assertEquals(filterName, memShellResult.getShellClassName());
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/probe/websphere7/WebSphere700ContainerTest.java

@@ -2,15 +2,19 @@ package com.reajason.javaweb.integration.probe.websphere7;
 
 import com.reajason.javaweb.Server;
 import com.reajason.javaweb.integration.ProbeAssertion;
+import com.reajason.javaweb.integration.ShellAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+import com.reajason.javaweb.memshell.MemShellResult;
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.packer.Packers;
+import com.reajason.javaweb.probe.payload.FilterProbeFactory;
 import com.reajason.javaweb.utils.CommonUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
+import org.objectweb.asm.Opcodes;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
@@ -70,21 +74,17 @@ public class WebSphere700ContainerTest {
     @Test
     void testFilterProbe() {
         String url = getUrlFromWAS(container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
-        System.out.println(data);
-        assertThat(data, anyOf(
-                containsString("Context: ")
-        ));
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.WebSphere));
+        ShellAssertion.assertFilterProbeIsRight(data);
     }
 
     @Test
     void testFilterFirstInject() {
         String url = getUrlFromWAS(container);
-        shellInjectIsOk(url, Server.WebSphere, ShellType.FILTER, ShellTool.Command, org.objectweb.asm.Opcodes.V1_6, Packers.BigInteger, container);
-        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
-        log.info(data);
+        MemShellResult memShellResult = shellInjectIsOk(url, Server.WebSphere, ShellType.FILTER, ShellTool.Command, Opcodes.V1_6, Packers.BigInteger, container);
+        String data = VulTool.post(url + "/b64", FilterProbeFactory.getBase64ByServer(Server.WebSphere));
         List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
         String filterName = ProbeAssertion.extractFilterName(filter.get(0));
-        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.WebSphere))));
+        assertEquals(filterName, memShellResult.getShellClassName());
     }
 }