Merge pull request #407 from XmiliaH/fix-404-406

Fix arguments access on non functions and findBestExtensionHandler.

CHANGELOG.md

@@ -1,3 +1,8 @@
+v3.9.8 (TBD)
+-------------------
+[fix] Add function typecheck for arguments, caller, and callee property check (GeoffRen)  
+[fix] Fix find best extension handler  
+
 v3.9.7 (2022-02-10)
 -------------------
 [fix] Allow relative require from base script  

lib/bridge.js

@@ -431,7 +431,9 @@ function createBridge(otherInit, registerProxy) {
 				case 'arguments':
 				case 'caller':
 				case 'callee':
-					if (thisOtherHasOwnProperty(object, key)) throw thisThrowCallerCalleeArgumentsAccess(key);
+					if (typeof object === 'function' && thisOtherHasOwnProperty(object, key)) {
+						throw thisThrowCallerCalleeArgumentsAccess(key);
+					}
 					break;
 			}
 			let ret; // @other(unsafe)

lib/nodevm.js

@@ -405,9 +405,9 @@ class NodeVM extends VM {
 				}
 			}
 			const prefix = strict ? STRICT_MODULE_PREFIX : MODULE_PREFIX;
-			let scriptCode = prefix + this._compiler(code, unresolvedFilename) + MODULE_SUFFIX;
+			let scriptCode = this._compiler(code, unresolvedFilename);
 			scriptCode = transformer(null, scriptCode, false, false).code;
-			script = new Script(scriptCode, {
+			script = new Script(prefix + scriptCode + MODULE_SUFFIX, {
 				__proto__: null,
 				filename: unresolvedFilename,
 				displayErrors: false

lib/setup-node-sandbox.js

@@ -148,7 +148,7 @@ Module._cache = {__proto__: null};
 function findBestExtensionHandler(filename) {
 	const name = resolver.pathBasename(filename);
 	for (let i = 0; (i = localStringPrototypeIndexOf(name, '.', i + 1)) !== -1;) {
-		const ext = localStringPrototypeSlice(name, i + 1);
+		const ext = localStringPrototypeSlice(name, i);
 		const handler = Module._extensions[ext];
 		if (handler) return handler;
 	}

test/nodevm.js

@@ -77,7 +77,8 @@ describe('modules', () => {
 	it('require json', () => {
 		const vm = new NodeVM({
 			require: {
-				external: true
+				external: true,
+				context: 'sandbox'
 			}
 		});
 

test/vm.js

@@ -380,6 +380,10 @@ describe('contextify', () => {
 		}
 	});
 
+	it('arguments', () => {
+		assert.doesNotThrow(() => vm.run('(o) => o.arguments')({arguments: 1}));
+	});
+
 	after(() => {
 		vm = null;
 	});