fix: Always wrap window/global/this in a try/catch

n8n-io · Aug 31, 2023 · b21e4da · b21e4da
1 parent 917a576
commit b21e4da
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/ExpressionBuilder.ts b/src/ExpressionBuilder.ts
@@ -20,6 +20,8 @@ export interface ExpressionAnalysis {
 
 const v = b.identifier('v');
 
+const shouldAlwaysWrapList = ['window', 'global', 'this'];
+
 const shouldWrapInTry = (node: namedTypes.ASTNode) => {
 	let shouldWrap = false;
 
@@ -32,6 +34,14 @@ const shouldWrapInTry = (node: namedTypes.ASTNode) => {
 			shouldWrap = true;
 			return false;
 		},
+		visitIdentifier(path) {
+			if (shouldAlwaysWrapList.includes(path.node.name)) {
+				shouldWrap = true;
+				return false;
+			}
+			this.traverse(path);
+			return;
+		},
 	});
 
 	return shouldWrap;

diff --git a/test/ExpressionFixtures/base.ts b/test/ExpressionFixtures/base.ts
@@ -826,4 +826,7 @@ line`,
 `,
 		tests: [],
 	},
+	{ expression: '={{window}}', tests: [] },
+	{ expression: '={{global}}', tests: [] },
+	{ expression: '={{test = 3}}', tests: [] },
 ];
diff --git a/test/utils.ts b/test/utils.ts
@@ -4,13 +4,7 @@ import type { ExpressionTestEvaluation } from './ExpressionFixtures/base';
 import { baseFixtures } from './ExpressionFixtures/base';
 
 export const testExpressionsWithEvaluator = (Evaluator: ExpressionEvaluatorClass) => {
-	const tourn = new Tournament(
-		(e) => {
-			console.error(e);
-		},
-		undefined,
-		Evaluator,
-	);
+	const tourn = new Tournament(() => {}, undefined, Evaluator);
 	const builtins = {
 		String,
 		parseFloat,