Merge pull request #6275 from waynercheung/feat/harden_filters

fix(jsonrpc): use min(to, currentMaxBlock) to compare with maxBlockRange

Author: CodeNinjaEvan

framework/src/main/java/org/tron/core/services/jsonrpc/filters/LogFilterWrapper.java

@@ -1,6 +1,6 @@
 package org.tron.core.services.jsonrpc.filters;
 
-import static org.tron.common.math.Maths.min;
+import static org.tron.common.math.StrictMathWrapper.min;
 
 import com.google.protobuf.ByteString;
 import lombok.Getter;
@@ -58,7 +58,7 @@ public LogFilterWrapper(FilterRequest fr, long currentMaxBlockNum, Wallet wallet
         if (toBlockSrc == -1) {
           toBlockSrc = Long.MAX_VALUE;
         }
-        fromBlockSrc = min(toBlockSrc, currentMaxBlockNum, true);
+        fromBlockSrc = min(toBlockSrc, currentMaxBlockNum);
 
       } else if (StringUtils.isNotEmpty(fr.getFromBlock())
           && StringUtils.isEmpty(fr.getToBlock())) {
@@ -90,7 +90,8 @@ public LogFilterWrapper(FilterRequest fr, long currentMaxBlockNum, Wallet wallet
 
       // till now, it needs to check block range for eth_getLogs
       int maxBlockRange = Args.getInstance().getJsonRpcMaxBlockRange();
-      if (checkBlockRange && maxBlockRange > 0 && (toBlockSrc - fromBlockSrc) > maxBlockRange) {
+      if (checkBlockRange && maxBlockRange > 0
+          && min(toBlockSrc, currentMaxBlockNum) - fromBlockSrc > maxBlockRange) {
         throw new JsonRpcInvalidParamsException("exceed max block range: " + maxBlockRange);
       }
     }

framework/src/test/java/org/tron/core/config/args/ArgsTest.java

@@ -256,6 +256,25 @@ public void testInitService() {
     Assert.assertTrue(Args.getInstance().isJsonRpcHttpPBFTNodeEnable());
     Assert.assertEquals(30, Args.getInstance().getJsonRpcMaxBlockRange());
     Assert.assertEquals(40, Args.getInstance().getJsonRpcMaxSubTopics());
+
+    // test set invalid value
+    storage.put("node.jsonrpc.maxBlockRange", "0");
+    storage.put("node.jsonrpc.maxSubTopics", "0");
+    config = ConfigFactory.defaultOverrides().withFallback(ConfigFactory.parseMap(storage));
+    // check value
+    Args.setParam(config);
+    Assert.assertEquals(0, Args.getInstance().getJsonRpcMaxBlockRange());
+    Assert.assertEquals(0, Args.getInstance().getJsonRpcMaxSubTopics());
+
+    // test set invalid value
+    storage.put("node.jsonrpc.maxBlockRange", "-2");
+    storage.put("node.jsonrpc.maxSubTopics", "-4");
+    config = ConfigFactory.defaultOverrides().withFallback(ConfigFactory.parseMap(storage));
+    // check value
+    Args.setParam(config);
+    Assert.assertEquals(-2, Args.getInstance().getJsonRpcMaxBlockRange());
+    Assert.assertEquals(-4, Args.getInstance().getJsonRpcMaxSubTopics());
+
     Args.clearParam();
   }
 }