fix(crypto): harden shielded transaction safety and input validation

Author: Federico2014

actuator/src/main/java/org/tron/core/vm/PrecompiledContracts.java

@@ -1148,8 +1148,8 @@ public abstract static class VerifyProof extends PrecompiledContract {
               new LibrustzcashParam.MerkleHashParams(
                   i, UNCOMMITTED[i], UNCOMMITTED[i], UNCOMMITTED[i + 1]));
         }
-      } catch (Throwable any) {
-        logger.info("Initialize UNCOMMITTED array failed:{}", any.getMessage());
+      } catch (ZksnarkException e) {
+        throw new RuntimeException("Failed to initialize UNCOMMITTED array", e);
       }
     }
 
@@ -1258,7 +1258,7 @@ protected Pair<Boolean, byte[]> insertLeaves(
       if (success) {
         return Pair.of(true, merge(DataWord.ONE().getData(), result));
       } else {
-        return Pair.of(true, DataWord.ZERO().getData());
+        return Pair.of(false, EMPTY_BYTE_ARRAY);
       }
     }
   }
@@ -1282,6 +1282,10 @@ public Pair<Boolean, byte[]> execute(byte[] data) {
       }
       boolean result;
       long ctx = JLibrustzcash.librustzcashSaplingVerificationCtxInit();
+      if (ctx == 0) {
+        logger.info("VerifyMintProof: failed to init verification context");
+        return Pair.of(false, EMPTY_BYTE_ARRAY);
+      }
       try {
         byte[] cm = new byte[32];
         byte[] cv = new byte[32];
@@ -1328,7 +1332,7 @@ public Pair<Boolean, byte[]> execute(byte[] data) {
       } finally {
         JLibrustzcash.librustzcashSaplingVerificationCtxFree(ctx);
       }
-      return Pair.of(true, DataWord.ZERO().getData());
+      return Pair.of(false, EMPTY_BYTE_ARRAY);
     }
   }
 
@@ -1477,6 +1481,10 @@ public Pair<Boolean, byte[]> execute(byte[] data) {
 
         boolean withNoTimeout = countDownLatch.await(getCPUTimeLeftInNanoSecond(),
             TimeUnit.NANOSECONDS);
+        if (!withNoTimeout) {
+          futures.forEach(f -> f.cancel(true));
+          return Pair.of(true, DataWord.ZERO().getData());
+        }
         boolean checkResult = true;
         for (Future<Boolean> future : futures) {
           boolean eachTaskResult = future.get();
@@ -1497,7 +1505,7 @@ public Pair<Boolean, byte[]> execute(byte[] data) {
         }
         logger.info("VerifyTransferProof exception: " + errorMsg);
       }
-      return Pair.of(true, DataWord.ZERO().getData());
+      return Pair.of(false, EMPTY_BYTE_ARRAY);
     }
 
     private static class SaplingCheckSpendTask implements Callable<Boolean> {
@@ -1527,17 +1535,13 @@ private static class SaplingCheckSpendTask implements Callable<Boolean> {
 
       @Override
       public Boolean call() throws ZksnarkException {
-        boolean result;
         try {
-          result = JLibrustzcash.librustzcashSaplingCheckSpendNew(
+          return JLibrustzcash.librustzcashSaplingCheckSpendNew(
               new LibrustzcashParam.CheckSpendNewParams(this.cv, this.anchor, this.nullifier,
                   this.rk, this.zkproof, this.spendAuthSig, this.signHash));
-        } catch (ZksnarkException e) {
-          throw e;
         } finally {
           countDownLatch.countDown();
         }
-        return result;
       }
     }
 
@@ -1561,17 +1565,13 @@ private static class SaplingCheckOutputTask implements Callable<Boolean> {
 
       @Override
       public Boolean call() throws ZksnarkException {
-        boolean result;
         try {
-          result = JLibrustzcash.librustzcashSaplingCheckOutputNew(
+          return JLibrustzcash.librustzcashSaplingCheckOutputNew(
               new LibrustzcashParam.CheckOutputNewParams(this.cv, this.cm,
                   this.ephemeralKey, this.zkproof));
-        } catch (ZksnarkException e) {
-          throw e;
         } finally {
           countDownLatch.countDown();
         }
-        return result;
       }
     }
 
@@ -1602,18 +1602,14 @@ private static class SaplingCheckBingdingSig implements Callable<Boolean> {
 
       @Override
       public Boolean call() throws ZksnarkException {
-        boolean result;
         try {
-          result = JLibrustzcash.librustzcashSaplingFinalCheckNew(
+          return JLibrustzcash.librustzcashSaplingFinalCheckNew(
               new LibrustzcashParam.FinalCheckNewParams(this.valueBalance, this.bindingSig,
                   this.signHash, this.spendCvs, this.spendCvLen,
                   this.receiveCvs, this.receiveCvLen));
-        } catch (ZksnarkException e) {
-          throw e;
         } finally {
           countDownLatch.countDown();
         }
-        return result;
       }
     }
   }
@@ -1637,6 +1633,10 @@ public Pair<Boolean, byte[]> execute(byte[] data) {
       }
       boolean result;
       long ctx = JLibrustzcash.librustzcashSaplingVerificationCtxInit();
+      if (ctx == 0) {
+        logger.info("VerifyBurnProof: failed to init verification context");
+        return Pair.of(false, EMPTY_BYTE_ARRAY);
+      }
       try {
         byte[] nullifier = new byte[32];
         byte[] anchor = new byte[32];

chainbase/src/main/java/org/tron/common/zksnark/JLibrustzcash.java

@@ -29,7 +29,7 @@
 @Slf4j
 public class JLibrustzcash {
 
-  private static Librustzcash INSTANCE = LibrustzcashWrapper.getInstance();
+  private static final Librustzcash INSTANCE = LibrustzcashWrapper.getInstance();
 
   public static void librustzcashZip32XskMaster(Zip32XskMasterParams params) {
     INSTANCE.librustzcashZip32XskMaster(params.getData(), params.getSize(), params.getM_bytes());