-
Notifications
You must be signed in to change notification settings - Fork 29k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds options to a VM Context to disable code generation from strings (such as eval or new Function) and WASM code generation (WebAssembly.compile). PR-URL: #19016 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
- Loading branch information
Showing
7 changed files
with
204 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,110 @@ | ||
'use strict'; | ||
|
||
const common = require('../common'); | ||
const assert = require('assert'); | ||
|
||
const { createContext, runInContext, runInNewContext } = require('vm'); | ||
|
||
const WASM_BYTES = Buffer.from( | ||
[0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00]); | ||
|
||
|
||
function expectsError(fn, type) { | ||
try { | ||
fn(); | ||
assert.fail('expected fn to error'); | ||
} catch (err) { | ||
if (typeof type === 'string') | ||
assert.strictEqual(err.name, type); | ||
else | ||
assert(err instanceof type); | ||
} | ||
} | ||
|
||
{ | ||
const ctx = createContext({ WASM_BYTES }); | ||
const test = 'eval(""); new WebAssembly.Module(WASM_BYTES);'; | ||
runInContext(test, ctx); | ||
|
||
runInNewContext(test, { WASM_BYTES }, { | ||
contextCodeGeneration: undefined, | ||
}); | ||
} | ||
|
||
{ | ||
const ctx = createContext({}, { | ||
codeGeneration: { | ||
strings: false, | ||
}, | ||
}); | ||
|
||
const EvalError = runInContext('EvalError', ctx); | ||
expectsError(() => { | ||
runInContext('eval("x")', ctx); | ||
}, EvalError); | ||
} | ||
|
||
{ | ||
const ctx = createContext({ WASM_BYTES }, { | ||
codeGeneration: { | ||
wasm: false, | ||
}, | ||
}); | ||
|
||
const CompileError = runInContext('WebAssembly.CompileError', ctx); | ||
expectsError(() => { | ||
runInContext('new WebAssembly.Module(WASM_BYTES)', ctx); | ||
}, CompileError); | ||
} | ||
|
||
expectsError(() => { | ||
runInNewContext('eval("x")', {}, { | ||
contextCodeGeneration: { | ||
strings: false, | ||
}, | ||
}); | ||
}, 'EvalError'); | ||
|
||
expectsError(() => { | ||
runInNewContext('new WebAssembly.Module(WASM_BYTES)', { WASM_BYTES }, { | ||
contextCodeGeneration: { | ||
wasm: false, | ||
}, | ||
}); | ||
}, 'CompileError'); | ||
|
||
common.expectsError(() => { | ||
createContext({}, { | ||
codeGeneration: { | ||
strings: 0, | ||
}, | ||
}); | ||
}, { | ||
code: 'ERR_INVALID_ARG_TYPE', | ||
}); | ||
|
||
common.expectsError(() => { | ||
runInNewContext('eval("x")', {}, { | ||
contextCodeGeneration: { | ||
wasm: 1, | ||
}, | ||
}); | ||
}, { | ||
code: 'ERR_INVALID_ARG_TYPE' | ||
}); | ||
|
||
common.expectsError(() => { | ||
createContext({}, { | ||
codeGeneration: 1, | ||
}); | ||
}, { | ||
code: 'ERR_INVALID_ARG_TYPE', | ||
}); | ||
|
||
common.expectsError(() => { | ||
createContext({}, { | ||
codeGeneration: null, | ||
}); | ||
}, { | ||
code: 'ERR_INVALID_ARG_TYPE', | ||
}); |