Cap data in transferdomain (#2058)

* Cap data in transferdomain * Add check for empty data field * Protect against fork on Changi * Add Changi intermediate fork to test * test: update argument name after merge
DeFiCh · Jun 19, 2023 · 1248c50 · 1248c50
1 parent f5ac32c
commit 1248c50
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 104 deletions.
diff --git a/src/masternodes/errors.h b/src/masternodes/errors.h
@@ -11,15 +11,15 @@
 
 class DeFiErrors {
 public:
-    static Res MNInvalid(const std::string &nodeRefString) { 
+    static Res MNInvalid(const std::string &nodeRefString) {
         return Res::Err("node %s does not exists", nodeRefString);
     }
 
-    static Res MNInvalidAltMsg(const std::string &nodeRefString) { 
+    static Res MNInvalidAltMsg(const std::string &nodeRefString) {
         return Res::Err("masternode %s does not exist", nodeRefString);
     }
 
-    static Res MNStateNotEnabled(const std::string &nodeRefString) { 
+    static Res MNStateNotEnabled(const std::string &nodeRefString) {
         return Res::Err("Masternode %s is not in 'ENABLED' state", nodeRefString);
     }
 
@@ -178,8 +178,8 @@ class DeFiErrors {
         return Res::Err("Negative price (%s/%s)", tokenSymbol, currency);
     }
 
-    static Res AmountOverflowAsValuePrice(const CAmount amount, const CAmount price) { 
-        return Res::Err("Value/price too high (%s/%s)", GetDecimalString(amount), GetDecimalString(price)); 
+    static Res AmountOverflowAsValuePrice(const CAmount amount, const CAmount price) {
+        return Res::Err("Value/price too high (%s/%s)", GetDecimalString(amount), GetDecimalString(price));
     }
 
     static Res GovVarVerifyInt() {
@@ -398,6 +398,10 @@ class DeFiErrors {
         return Res::Err("Not enough balance in %s to cover \"EVM\" domain transfer", address);
     }
 
+    static Res TransferDomainInvalidDataSize(const uint32_t max_data) {
+        return Res::Err("Excess data set, maximum allow is %d", max_data);
+    }
+
     static Res InvalidAuth() {
         return Res::Err("tx must have at least one input from account owner");
     }

diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
@@ -3853,6 +3853,15 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
                 balanceIn *= CAMOUNT_TO_GWEI * WEI_IN_GWEI;
                 evm_add_balance(evmContext, HexStr(toAddress.begin(), toAddress.end()), ArithToUint256(balanceIn).ToArrayReversed(), tx.GetHash().ToArrayReversed());
             }
+
+            // If you are here to change ChangiIntermediateHeight to NextNetworkUpgradeHeight
+            // then just remove this fork guard and comment as CTransferDomainMessage is already
+            // protected by NextNetworkUpgradeHeight.
+            if (height >= static_cast<uint32_t>(consensus.ChangiIntermediateHeight)) {
+                if (src.data.size() > MAX_TRANSFERDOMAIN_EVM_DATA_LEN || dst.data.size() > MAX_TRANSFERDOMAIN_EVM_DATA_LEN) {
+                    return DeFiErrors::TransferDomainInvalidDataSize(MAX_TRANSFERDOMAIN_EVM_DATA_LEN);
+                }
+            }
         }
 
         return res;

diff --git a/src/masternodes/mn_checks.h b/src/masternodes/mn_checks.h
@@ -68,6 +68,8 @@ enum AuthStrategy: uint32_t {
 
 constexpr uint8_t MAX_POOL_SWAPS = 3;
 
+constexpr uint32_t MAX_TRANSFERDOMAIN_EVM_DATA_LEN = 0;
+
 enum CustomTxErrCodes : uint32_t {
     NotSpecified = 0,
     //    NotCustomTx  = 1,