Merge branch 'release_v4.7.2' into optimize_intranet

jwrct · jwrct · commit a88c8d84ed8b · 2023-03-23T18:41:59.000+08:00
# Conflicts:
#	framework/src/main/java/org/tron/core/config/args/Args.java
diff --git a/DownloadLinks.sh b/DownloadLinks.sh
diff --git a/build.gradle b/build.gradle
@@ -82,3 +82,11 @@ task copyToParent(type: Copy) {
 
 build.finalizedBy(copyToParent)
 
+gradle.buildFinished {
+    if (project.hasProperty('cleanSubBuild')) {
+        subprojects {
+            buildDir.deleteDir()
+        }
+    }
+}
+
diff --git a/common/src/main/java/org/tron/common/parameter/CommonParameter.java b/common/src/main/java/org/tron/common/parameter/CommonParameter.java
@@ -406,6 +406,11 @@ public class CommonParameter {
   public GenesisBlock genesisBlock;
   @Getter
   @Setter
+  @Parameter(names = {"--p2p-disable"}, description = "Switch for p2p module initialization. "
+      + "(defalut: false)", arity = 1)
+  public boolean p2pDisable = false;
+  @Getter
+  @Setter
   public List<InetSocketAddress> activeNodes;
   @Getter
   @Setter
diff --git a/framework/src/main/java/org/tron/common/application/ApplicationImpl.java b/framework/src/main/java/org/tron/common/application/ApplicationImpl.java
@@ -61,7 +61,7 @@ public void initServices(CommonParameter parameter) {
    * start up the app.
    */
   public void startup() {
-    if (!Args.getInstance().isSolidityNode()) {
+    if ((!Args.getInstance().isSolidityNode()) && (!Args.getInstance().isP2pDisable())) {
       tronNetService.start();
     }
     consensusService.start();
@@ -72,7 +72,7 @@ public void startup() {
   @Override
   public void shutdown() {
     logger.info("******** start to shutdown ********");
-    if (!Args.getInstance().isSolidityNode()) {
+    if (!Args.getInstance().isSolidityNode() && (!Args.getInstance().p2pDisable)) {
       tronNetService.close();
     }
     consensusService.stop();
diff --git a/framework/src/main/java/org/tron/core/Wallet.java b/framework/src/main/java/org/tron/core/Wallet.java
@@ -2639,13 +2639,15 @@ public TransactionInfoList getTransactionInfoByBlockNum(long blockNum) {
 
   public NodeList listNodes() {
     NodeList.Builder nodeListBuilder = NodeList.newBuilder();
-    TronNetService.getP2pService().getConnectableNodes().forEach(node -> {
-      nodeListBuilder.addNodes(Node.newBuilder().setAddress(
-              Address.newBuilder()
-                      .setHost(ByteString
-                              .copyFrom(ByteArray.fromString(node.getHost())))
-                      .setPort(node.getPort())));
-    });
+    if (!Args.getInstance().p2pDisable) {
+      TronNetService.getP2pService().getConnectableNodes().forEach(node -> {
+        nodeListBuilder.addNodes(Node.newBuilder().setAddress(
+            Address.newBuilder()
+                .setHost(ByteString
+                    .copyFrom(ByteArray.fromString(node.getHost())))
+                .setPort(node.getPort())));
+      });
+    }
     return nodeListBuilder.build();
   }
 
diff --git a/framework/src/main/java/org/tron/core/config/args/Args.java b/framework/src/main/java/org/tron/core/config/args/Args.java
@@ -221,6 +221,7 @@ public static void clearParam() {
     PARAMETER.allowNewRewardAlgorithm = 0;
     PARAMETER.allowNewReward = 0;
     PARAMETER.memoFee = 0;
+    PARAMETER.p2pDisable = false;
     PARAMETER.dynamicConfigEnable = false;
   }
 
diff --git a/framework/src/main/java/org/tron/core/db/Manager.java b/framework/src/main/java/org/tron/core/db/Manager.java
@@ -717,7 +717,7 @@ private void initAutoStop() {
               exitCount, blockTime));
     }
 
-    if (exitHeight == headNum) {
+    if (exitHeight == headNum && (!Args.getInstance().isP2pDisable())) {
       logger.info("Auto-stop hit: shutDownBlockHeight: {}, currentHeaderNum: {}, exit now",
           exitHeight, headNum);
       System.exit(0);
diff --git a/framework/src/main/java/org/tron/core/services/RpcApiService.java b/framework/src/main/java/org/tron/core/services/RpcApiService.java
@@ -1736,14 +1736,7 @@ public void getTransactionCountByBlockNum(NumberMessage request,
 
     @Override
     public void listNodes(EmptyMessage request, StreamObserver<NodeList> responseObserver) {
-      NodeList.Builder nodeListBuilder = NodeList.newBuilder();
-      TronNetService.getP2pService().getConnectableNodes().forEach(node -> {
-        nodeListBuilder.addNodes(Node.newBuilder().setAddress(
-                Address.newBuilder()
-                        .setHost(ByteString.copyFrom(ByteArray.fromString(node.getHost())))
-                        .setPort(node.getPort())));
-      });
-      responseObserver.onNext(nodeListBuilder.build());
+      responseObserver.onNext(wallet.listNodes());
       responseObserver.onCompleted();
     }
 
diff --git a/framework/src/main/java/org/tron/core/services/filter/HttpApiAccessFilter.java b/framework/src/main/java/org/tron/core/services/filter/HttpApiAccessFilter.java
@@ -1,6 +1,7 @@
 package org.tron.core.services.filter;
 
 import com.alibaba.fastjson.JSONObject;
+import java.net.URI;
 import java.util.List;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
@@ -58,6 +59,7 @@ private boolean isDisabled(String endpoint) {
     boolean disabled = false;
 
     try {
+      endpoint = URI.create(endpoint).normalize().toString();
       List<String> disabledApiList = CommonParameter.getInstance().getDisabledApiList();
       if (!disabledApiList.isEmpty()) {
         disabled = disabledApiList.contains(endpoint.split("/")[2].toLowerCase());
diff --git a/framework/src/main/resources/logback.xml b/framework/src/main/resources/logback.xml
@@ -60,7 +60,6 @@
     <queueSize>100</queueSize>
     <includeCallerData>true</includeCallerData>
     <appender-ref ref="FILE"/>
-    <appender-ref ref="DB"/>
   </appender>
 
   <root level="INFO">
diff --git a/framework/src/test/java/org/tron/common/config/args/ArgsTest.java b/framework/src/test/java/org/tron/common/config/args/ArgsTest.java
@@ -13,8 +13,8 @@ public class ArgsTest {
 
   @Before
   public void init() {
-    Args.setParam(new String[]{"--output-directory", "output-directory", "--debug"},
-        Constant.TEST_CONF);
+    Args.setParam(new String[]{"--output-directory", "output-directory", "--p2p-disable", "true",
+        "--debug"}, Constant.TEST_CONF);
   }
 
   @After
@@ -30,5 +30,6 @@ public void testConfig() {
     Assert.assertEquals(Args.getInstance().getNodeDiscoveryPingTimeout(), 15_000);
     Assert.assertEquals(Args.getInstance().getMaxFastForwardNum(), 3);
     Assert.assertEquals(Args.getInstance().getBlockCacheTimeout(), 60);
+    Assert.assertEquals(Args.getInstance().p2pDisable, true);
   }
 }
diff --git a/framework/src/test/java/org/tron/common/utils/PublicMethod.java b/framework/src/test/java/org/tron/common/utils/PublicMethod.java
@@ -2,6 +2,8 @@
 
 import com.google.protobuf.ByteString;
 import java.math.BigInteger;
+import java.util.Random;
+
 import org.tron.api.GrpcAPI;
 import org.tron.api.WalletGrpc;
 import org.tron.common.crypto.ECKey;
@@ -102,4 +104,12 @@ public static GrpcAPI.Return broadcastTransaction(
     }
     return response;
   }
+
+  public static int chooseRandomPort(int min, int max) {
+    return new Random().nextInt(max - min + 1) + min;
+  }
+
+  public static int chooseRandomPort() {
+    return new Random().nextInt(65530 - 1024) + 1024;
+  }
 }
diff --git a/framework/src/test/java/org/tron/core/WalletTest.java b/framework/src/test/java/org/tron/core/WalletTest.java
@@ -1066,5 +1066,17 @@ public void testEstimateEnergyOutOfTime() {
       Assert.assertTrue(true);
     }
   }
+
+  @Test
+  public void testListNodes() {
+    try {
+      GrpcAPI.NodeList nodeList = wallet.listNodes();
+    } catch (Exception e) {
+      Assert.assertTrue(e instanceof NullPointerException);
+    }
+    Args.getInstance().setP2pDisable(true);
+    GrpcAPI.NodeList nodeList = wallet.listNodes();
+    Assert.assertTrue(nodeList.getNodesList().size() == 0);
+  }
 }
 
diff --git a/framework/src/test/java/org/tron/core/services/WalletApiTest.java b/framework/src/test/java/org/tron/core/services/WalletApiTest.java
@@ -0,0 +1,60 @@
+package org.tron.core.services;
+
+import io.grpc.ManagedChannelBuilder;
+import java.io.File;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.tron.api.GrpcAPI.EmptyMessage;
+import org.tron.api.WalletGrpc;
+import org.tron.common.application.Application;
+import org.tron.common.application.ApplicationFactory;
+import org.tron.common.application.TronApplicationContext;
+import org.tron.common.utils.FileUtil;
+import org.tron.core.Constant;
+import org.tron.core.config.DefaultConfig;
+import org.tron.core.config.args.Args;
+import stest.tron.wallet.common.client.Configuration;
+
+@Slf4j
+public class WalletApiTest {
+
+  private static TronApplicationContext context;
+  private static String dbPath = "output_wallet_api_test";
+  private String fullnode = Configuration.getByPath("testng.conf")
+      .getStringList("fullnode.ip.list").get(0);
+  private RpcApiService rpcApiService;
+  private Application appT;
+
+  @Before
+  public void init() {
+    Args.setParam(new String[]{ "-d", dbPath, "--p2p-disable", "true"}, Constant.TEST_CONF);
+    context = new TronApplicationContext(DefaultConfig.class);
+    appT = ApplicationFactory.create(context);
+    rpcApiService = context.getBean(RpcApiService.class);
+    appT.addService(rpcApiService);
+    appT.initServices(Args.getInstance());
+    appT.startServices();
+    appT.startup();
+  }
+
+  @Test
+  public void listNodesTest() {
+    WalletGrpc.WalletBlockingStub walletStub = WalletGrpc
+        .newBlockingStub(ManagedChannelBuilder.forTarget(fullnode)
+            .usePlaintext(true)
+            .build());
+    Assert.assertTrue(walletStub.listNodes(EmptyMessage.getDefaultInstance())
+        .getNodesList().size() == 0);
+  }
+
+  @After
+  public void destroy() {
+    Args.clearParam();
+    context.destroy();
+    FileUtil.deleteDir(new File(dbPath));
+  }
+
+}
diff --git a/framework/src/test/java/org/tron/core/services/filter/HttpApiAccessFilterTest.java b/framework/src/test/java/org/tron/core/services/filter/HttpApiAccessFilterTest.java
@@ -4,7 +4,9 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import org.apache.http.HttpResponse;
@@ -21,10 +23,13 @@
 import org.tron.common.application.Application;
 import org.tron.common.application.ApplicationFactory;
 import org.tron.common.application.TronApplicationContext;
+import org.tron.common.parameter.CommonParameter;
 import org.tron.common.utils.FileUtil;
+import org.tron.common.utils.ReflectUtils;
 import org.tron.core.Constant;
 import org.tron.core.config.DefaultConfig;
 import org.tron.core.config.args.Args;
+import org.tron.core.net.peer.PeerConnection;
 import org.tron.core.services.http.FullNodeHttpApiService;
 import org.tron.core.services.interfaceOnPBFT.http.PBFT.HttpApiOnPBFTService;
 import org.tron.core.services.interfaceOnSolidity.http.solidity.HttpApiOnSolidityService;
@@ -37,6 +42,7 @@ public class HttpApiAccessFilterTest {
   private static Application appTest;
   private static CloseableHttpClient httpClient = HttpClients.createDefault();
   private static String dbPath = "output_http_api_access_filter_test";
+  private static HttpApiAccessFilter httpApiAccessFilter;
 
   /**
    * init dependencies.
@@ -47,7 +53,7 @@ public static void init() {
     Args.getInstance().setFullNodeAllowShieldedTransactionArgs(false);
     context = new TronApplicationContext(DefaultConfig.class);
     appTest = ApplicationFactory.create(context);
-
+    httpApiAccessFilter = context.getBean(HttpApiAccessFilter.class);
     FullNodeHttpApiService httpApiService = context
             .getBean(FullNodeHttpApiService.class);
     HttpApiOnSolidityService httpApiOnSolidityService = context
@@ -153,4 +159,31 @@ private int getReuqestCode(String url) {
 
     return 0;
   }
+
+  @Test
+  public void testIsDisabled() throws Exception {
+    List<String> list = new ArrayList<>();
+    list.add("getnowblock");
+    CommonParameter.getInstance().setDisabledApiList(list);
+    Method privateMethod = httpApiAccessFilter.getClass()
+            .getDeclaredMethod("isDisabled", String.class);
+    privateMethod.setAccessible(true);
+
+    String url = "/wallet/getnowblock";
+    boolean f = (boolean) privateMethod.invoke(httpApiAccessFilter,url);
+    Assert.assertTrue(f);
+
+    url = "/wallet/a/../b/../getnowblock";
+    f = (boolean) privateMethod.invoke(httpApiAccessFilter,url);
+    Assert.assertTrue(f);
+
+    url = "/wallet/a/b/../getnowblock";
+    f = (boolean) privateMethod.invoke(httpApiAccessFilter,url);
+    Assert.assertTrue(!f);
+
+    url = "/wallet/getblock";
+    f = (boolean) privateMethod.invoke(httpApiAccessFilter,url);
+    Assert.assertTrue(!f);
+  }
+
 }
diff --git a/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptorTest.java b/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptorTest.java
@@ -4,6 +4,8 @@
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.StatusRuntimeException;
 import java.io.File;
+import java.util.concurrent.TimeUnit;
+
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -20,6 +22,7 @@
 import org.tron.common.application.ApplicationFactory;
 import org.tron.common.application.TronApplicationContext;
 import org.tron.common.utils.FileUtil;
+import org.tron.common.utils.PublicMethod;
 import org.tron.core.ChainBaseManager;
 import org.tron.core.Constant;
 import org.tron.core.config.DefaultConfig;
@@ -38,7 +41,6 @@ public class LiteFnQueryGrpcInterceptorTest {
   private WalletGrpc.WalletBlockingStub blockingStubFull = null;
   private WalletSolidityGrpc.WalletSolidityBlockingStub blockingStubSolidity = null;
   private WalletSolidityGrpc.WalletSolidityBlockingStub blockingStubpBFT = null;
-  private DatabaseGrpc.DatabaseBlockingStub databaseBlockingStub = null;
   private RpcApiService rpcApiService;
   private RpcApiServiceOnSolidity rpcApiServiceOnSolidity;
   private RpcApiServiceOnPBFT rpcApiServiceOnPBFT;
@@ -56,6 +58,9 @@ public class LiteFnQueryGrpcInterceptorTest {
   @Before
   public void init() {
     Args.setParam(new String[]{"-d", dbPath}, Constant.TEST_CONF);
+    Args.getInstance().setRpcPort(PublicMethod.chooseRandomPort());
+    Args.getInstance().setRpcOnSolidityPort(PublicMethod.chooseRandomPort());
+    Args.getInstance().setRpcOnPBFTPort(PublicMethod.chooseRandomPort());
     String fullnode = String.format("%s:%d", Args.getInstance().getNodeDiscoveryBindIp(),
             Args.getInstance().getRpcPort());
     String pBFTNode = String.format("%s:%d", Args.getInstance().getNodeDiscoveryBindIp(),
@@ -71,7 +76,6 @@ public void init() {
     blockingStubSolidity = WalletSolidityGrpc.newBlockingStub(channelFull);
     blockingStubpBFT = WalletSolidityGrpc.newBlockingStub(channelpBFT);
     blockingStubSolidity = WalletSolidityGrpc.newBlockingStub(channelFull);
-    databaseBlockingStub = DatabaseGrpc.newBlockingStub(channelFull);
     rpcApiService = context.getBean(RpcApiService.class);
     rpcApiServiceOnSolidity = context.getBean(RpcApiServiceOnSolidity.class);
     rpcApiServiceOnPBFT = context.getBean(RpcApiServiceOnPBFT.class);
@@ -89,7 +93,13 @@ public void init() {
    * destroy the context.
    */
   @After
-  public void destroy() {
+  public void destroy() throws InterruptedException {
+    if (channelFull != null) {
+      channelFull.shutdown().awaitTermination(5, TimeUnit.SECONDS);
+    }
+    if (channelpBFT != null) {
+      channelpBFT.shutdown().awaitTermination(5, TimeUnit.SECONDS);
+    }
     Args.clearParam();
     appTest.shutdownServices();
     appTest.shutdown();
diff --git a/framework/src/test/java/org/tron/core/services/filter/RpcApiAccessInterceptorTest.java b/framework/src/test/java/org/tron/core/services/filter/RpcApiAccessInterceptorTest.java
diff --git a/framework/src/test/java/org/tron/program/LiteFullNodeToolTest.java b/framework/src/test/java/org/tron/program/LiteFullNodeToolTest.java
diff --git a/script/checkStyle.sh b/script/checkStyle.sh
diff --git a/script/codecov.sh b/script/codecov.sh
diff --git a/script/querySonar.sh b/script/querySonar.sh
diff --git a/script/sonar.sh b/script/sonar.sh

Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,7 @@ public static void clearParam() {`
`221`	`221`	`PARAMETER.allowNewRewardAlgorithm = 0;`
`222`	`222`	`PARAMETER.allowNewReward = 0;`
`223`	`223`	`PARAMETER.memoFee = 0;`
	`224`	`+ PARAMETER.p2pDisable = false;`
`224`	`225`	`PARAMETER.dynamicConfigEnable = false;`
`225`	`226`	`}`
`226`	`227`
Original file line number	Diff line number	Diff line change
`@@ -717,7 +717,7 @@ private void initAutoStop() {`
`717`	`717`	`exitCount, blockTime));`
`718`	`718`	`}`
`719`	`719`
`720`		`- if (exitHeight == headNum) {`
	`720`	`+ if (exitHeight == headNum && (!Args.getInstance().isP2pDisable())) {`
`721`	`721`	`logger.info("Auto-stop hit: shutDownBlockHeight: {}, currentHeaderNum: {}, exit now",`
`722`	`722`	`exitHeight, headNum);`
`723`	`723`	`System.exit(0);`