fix: check contract source whitelist before loading interactions

warp-contracts · Nov 17, 2023 · 62e1cff · 62e1cff
1 parent 9e8575b
commit 62e1cff
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 12 deletions.
diff --git a/src/contract/HandlerBasedContract.ts b/src/contract/HandlerBasedContract.ts
@@ -565,6 +565,8 @@ export class HandlerBasedContract<State> implements Contract<State> {
         }
       }
 
+      this.warp.executorFactory.checkWhiteListContractSources(contractDefinition, contractEvaluationOptions);
+
       if (!remoteState && sortedInteractions.length == 0) {
         sortedInteractions = await interactionsLoader.load(
           contractTxId,

diff --git a/src/core/modules/ExecutorFactory.ts b/src/core/modules/ExecutorFactory.ts
@@ -1,4 +1,4 @@
-import { ContractDefinition } from '../../core/ContractDefinition';
+import { ContractCache, ContractDefinition, SrcCache } from '../../core/ContractDefinition';
 import { EvaluationOptions } from './StateEvaluator';
 import { Warp } from '../Warp';
 import { InteractionState } from '../../contract/states/InteractionState';
@@ -17,4 +17,9 @@ export interface ExecutorFactory<Api> {
     warp: Warp,
     interactionState: InteractionState
   ): Promise<Api>;
+
+  checkWhiteListContractSources<State>(
+    contractDefinition: SrcCache & ContractCache<State>,
+    evaluationOptions: EvaluationOptions
+  ): void;
 }
diff --git a/src/core/modules/impl/HandlerExecutorFactory.ts b/src/core/modules/impl/HandlerExecutorFactory.ts
@@ -1,6 +1,6 @@
 import Arweave from 'arweave';
 import { rustWasmImports, WarpContractsCrateVersion } from './wasm/rust-wasm-imports';
-import { ContractDefinition } from '../../../core/ContractDefinition';
+import { ContractCache, ContractDefinition, SrcCache } from '../../../core/ContractDefinition';
 import { ExecutionContext } from '../../../core/ExecutionContext';
 import { GQLNodeInterface } from '../../../legacy/gqlResult';
 import { SmartWeaveGlobal } from '../../../legacy/smartweave-global';
@@ -54,15 +54,7 @@ export class HandlerExecutorFactory implements ExecutorFactory<HandlerApi<unknow
     if (warp.hasPlugin('contract-blacklist')) {
       await this.blacklistContracts<State>(warp, contractDefinition);
     }
-
-    if (
-      evaluationOptions.whitelistSources.length > 0 &&
-      !evaluationOptions.whitelistSources.includes(contractDefinition.srcTxId)
-    ) {
-      throw new NonWhitelistedSourceError(
-        `[NonWhitelistedSourceError] Contract source not part of whitelisted sources list: ${contractDefinition.srcTxId}.`
-      );
-    }
+    this.checkWhiteListContractSources(contractDefinition, evaluationOptions);
 
     let kvStorage = null;
 
@@ -219,6 +211,21 @@ export class HandlerExecutorFactory implements ExecutorFactory<HandlerApi<unknow
     }
   }
 
+  checkWhiteListContractSources<State>(
+    contractDefinition: SrcCache & ContractCache<State>,
+    evaluationOptions: EvaluationOptions
+  ) {
+    if (
+      evaluationOptions &&
+      evaluationOptions.whitelistSources.length > 0 &&
+      !evaluationOptions.whitelistSources.includes(contractDefinition.srcTxId)
+    ) {
+      throw new NonWhitelistedSourceError(
+        `[NonWhitelistedSourceError] Contract source not part of whitelisted sources list: ${contractDefinition.srcTxId}.`
+      );
+    }
+  }
+
   private async blacklistContracts<State>(warp: Warp, contractDefinition: ContractDefinition<State>) {
     const blacklistPlugin = warp.loadPlugin<string, Promise<boolean>>('contract-blacklist');
     let blacklisted = false;

diff --git a/src/plugins/DebuggableExecutorFactor.ts b/src/plugins/DebuggableExecutorFactor.ts
@@ -1,4 +1,4 @@
-import { ContractDefinition } from '../core/ContractDefinition';
+import { ContractCache, ContractDefinition, SrcCache } from '../core/ContractDefinition';
 import { ExecutorFactory } from '../core/modules/ExecutorFactory';
 import { EvaluationOptions } from '../core/modules/StateEvaluator';
 import { Warp } from '../core/Warp';
@@ -33,4 +33,11 @@ export class DebuggableExecutorFactory<Api> implements ExecutorFactory<Api> {
 
     return await this.baseImplementation.create(contractDefinition, evaluationOptions, warp, interactionState);
   }
+
+  checkWhiteListContractSources<State>(
+    contractDefinition: SrcCache & ContractCache<State>,
+    evaluationOptions: EvaluationOptions
+  ): void {
+    return this.baseImplementation.checkWhiteListContractSources(contractDefinition, evaluationOptions);
+  }
 }