优化 solon-web-servlet-jakarta SolonServletContext 增加 _useLimitStream 选项控制

Author: noear

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/server/jetty/http/JtHttpContextServletHandler.java

@@ -27,4 +27,9 @@ protected void preHandle(Context ctx) {
             ctx.headerSet("Solon-Boot", JettyPlugin.solon_boot_ver());
         }
     }
+
+    @Override
+    protected boolean useLimitStream() {
+        return true;
+    }
 }

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/server/jetty/http/JtHttpRequestWrapper.java

@@ -34,6 +34,11 @@ protected void preHandle(Context ctx) {
         }
     }
 
+    @Override
+    protected boolean useLimitStream() {
+        return true;
+    }
+
     @Override
     protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         if (request.getCharacterEncoding() == null) {

solon-jakarta-projects/solon-server/solon-server-tomcat-jakarta/src/main/java/org/noear/solon/server/tomcat/http/TCHttpContextHandler.java

@@ -31,6 +31,7 @@
 import org.noear.solon.core.handle.UploadedFile;
 import org.noear.solon.core.util.IoUtil;
 import org.noear.solon.core.util.MultiMap;
+import org.noear.solon.server.io.LimitedInputStream;
 import org.noear.solon.server.util.DecodeUtils;
 import org.noear.solon.server.util.RedirectUtils;
 import org.slf4j.Logger;
@@ -56,12 +57,18 @@
 public class SolonServletContext extends ContextBase {
     static final Logger log = LoggerFactory.getLogger(SolonServletContext.class);
 
-    private HttpServletRequest _request;
-    private HttpServletResponse _response;
+    private final HttpServletRequest _request;
+    private final HttpServletResponse _response;
+    private final boolean _useLimitStream;
 
     public SolonServletContext(HttpServletRequest request, HttpServletResponse response) {
+        this(request, response, false);
+    }
+
+    public SolonServletContext(HttpServletRequest request, HttpServletResponse response, boolean useLimitStream) {
         _request = request;
         _response = response;
+        _useLimitStream = useLimitStream;
 
         if (sessionState().replaceable()) {
             sessionState = new SolonServletSessionState(request);
@@ -178,11 +185,20 @@ public String body(String charset) throws IOException {
         }
     }
 
+    private InputStream limitStream;
     @Override
     public InputStream bodyAsStream() throws IOException {
         assertMaxBodySize();
 
-        return _request.getInputStream();
+        if (_useLimitStream) {
+            if (limitStream == null) {
+                limitStream = new LimitedInputStream(_request.getInputStream(), ServerProps.request_maxBodySize);
+            }
+
+            return limitStream;
+        } else {
+            return _request.getInputStream();
+        }
     }
 
 

solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonServletContext.java

@@ -37,16 +37,20 @@ protected void preHandle(Context ctx) throws IOException {
 
     }
 
+    protected boolean useLimitStream() {
+        return false;
+    }
+
     @Override
     protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        SolonServletContext ctx = new SolonServletContext(request, response);
+        SolonServletContext ctx = new SolonServletContext(request, response, useLimitStream());
         ctx.contentType(MimeType.TEXT_PLAIN_UTF8_VALUE);
 
         preHandle(ctx);
 
         Solon.app().tryHandle(ctx);
 
-        if(ctx.asyncStarted() == false){
+        if (ctx.asyncStarted() == false) {
             ctx.innerCommit();
         }
     }