don't invoke getInputStream and getReader in HttpServletRequestWrapper twice; add several methods of HttpServletRequestWrapper

Author: 317787106

framework/src/main/java/org/tron/core/services/filter/BufferedResponseWrapper.java

@@ -101,11 +101,42 @@ public void setContentLengthLong(long len) {
     }
   }
 
+  @Override
+  public int getStatus() {
+    return this.status;
+  }
+
   @Override
   public void setStatus(int sc) {
     this.status = sc;
   }
 
+  @Override
+  public void setHeader(String name, String value) {
+    if ("content-length".equalsIgnoreCase(name)) {
+      try {
+        setContentLengthLong(Long.parseLong(value));
+      } catch (NumberFormatException ignored) {
+        // malformed value, skip overflow check
+      }
+    } else {
+      super.setHeader(name, value);
+    }
+  }
+
+  @Override
+  public void addHeader(String name, String value) {
+    if ("content-length".equalsIgnoreCase(name)) {
+      try {
+        setContentLengthLong(Long.parseLong(value));
+      } catch (NumberFormatException ignored) {
+        // malformed value, skip overflow check
+      }
+    } else {
+      super.addHeader(name, value);
+    }
+  }
+
   @Override
   public void setContentType(String type) {
     this.contentType = type;

framework/src/main/java/org/tron/core/services/filter/CachedBodyRequestWrapper.java

@@ -15,7 +15,10 @@
  */
 public class CachedBodyRequestWrapper extends HttpServletRequestWrapper {
 
+  private enum BodyAccessor { NONE, STREAM, READER }
+
   private final byte[] body;
+  private BodyAccessor accessor = BodyAccessor.NONE;
 
   public CachedBodyRequestWrapper(HttpServletRequest request, byte[] body) {
     super(request);
@@ -24,6 +27,10 @@ public CachedBodyRequestWrapper(HttpServletRequest request, byte[] body) {
 
   @Override
   public ServletInputStream getInputStream() {
+    if (accessor == BodyAccessor.READER) {
+      throw new IllegalStateException("getReader() has already been called on this request");
+    }
+    accessor = BodyAccessor.STREAM;
     final ByteArrayInputStream bais = new ByteArrayInputStream(body);
     return new ServletInputStream() {
       @Override
@@ -54,6 +61,10 @@ public void setReadListener(ReadListener readListener) {
 
   @Override
   public BufferedReader getReader() {
+    if (accessor == BodyAccessor.STREAM) {
+      throw new IllegalStateException("getInputStream() has already been called on this request");
+    }
+    accessor = BodyAccessor.READER;
     String encoding = getCharacterEncoding();
     Charset charset = encoding != null ? Charset.forName(encoding) : StandardCharsets.UTF_8;
     return new BufferedReader(new InputStreamReader(new ByteArrayInputStream(body), charset));

framework/src/main/resources/config.conf

@@ -366,17 +366,17 @@ node {
     # httpPBFTEnable = false
     # httpPBFTPort = 8565
 
-    # The maximum blocks range to retrieve logs for eth_getLogs, default: 5000, >0 otherwise no limit
+    # The maximum blocks range to retrieve logs for eth_getLogs, default: 5000, <=0 means no limit
     maxBlockRange = 5000
-    # Allowed max address count in filter request, default: 1000, >0 otherwise no limit
+    # Allowed max address count in filter request, default: 1000, <=0 means no limit
     maxAddressSize = 1000
-    # The maximum number of allowed topics within a topic criteria, default: 1000, >0 otherwise no limit
+    # The maximum number of allowed topics within a topic criteria, default: 1000, <=0 means no limit
     maxSubTopics = 1000
-    # Allowed maximum number for blockFilter, default: 50000, >0 otherwise no limit
+    # Allowed maximum number for blockFilter, default: 50000, <=0 means no limit
     maxBlockFilterNum = 50000
-    # Allowed batch size, default: 100, >0 otherwise no limit
+    # Allowed batch size, default: 100, <=0 means no limit
     maxBatchSize = 100
-    # Allowed max response byte size, default: 26214400 (25 MB), >0 otherwise no limit
+    # Allowed max response byte size, default: 26214400 (25 MB), <=0 means no limit
     maxResponseSize = 26214400
   }