Skip to content

node:vm: accept undefined codeGeneration.strings/wasm like Node #38314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robobun wants to merge 1 commit into
base: main
Choose a base branch
from
Open

node:vm: accept undefined codeGeneration.strings/wasm like Node #38314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/jsc/bindings/NodeVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ void getNodeVMContextOptions(JSGlobalObject* globalObject, JSC::VM& vm, JSC::Thr

auto allowStringsValue = codeGenerationObject->getIfPropertyExists(globalObject, Identifier::fromString(vm, "strings"_s));
RETURN_IF_EXCEPTION(scope, );
if (allowStringsValue) {
if (allowStringsValue && !allowStringsValue.isUndefined()) {
if (!allowStringsValue.isBoolean()) {
ERR::INVALID_ARG_TYPE(scope, globalObject, WTF::makeString("options."_s, codeGenerationKey, ".strings"_s), "boolean"_s, allowStringsValue);
return;
Expand All @@ -733,7 +733,7 @@ void getNodeVMContextOptions(JSGlobalObject* globalObject, JSC::VM& vm, JSC::Thr

auto allowWasmValue = codeGenerationObject->getIfPropertyExists(globalObject, Identifier::fromString(vm, "wasm"_s));
RETURN_IF_EXCEPTION(scope, );
if (allowWasmValue) {
if (allowWasmValue && !allowWasmValue.isUndefined()) {
if (!allowWasmValue.isBoolean()) {
ERR::INVALID_ARG_TYPE(scope, globalObject, WTF::makeString("options."_s, codeGenerationKey, ".wasm"_s), "boolean"_s, allowWasmValue);
return;
Expand Down
42 changes: 42 additions & 0 deletions test/js/node/vm/vm.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,48 @@ describe("codeGeneration options", () => {
const evalResult = runInContext("eval('5 + 5');", context);
expect(evalResult).toBe(10);
});

describe("strings/wasm set to undefined", () => {
// In Node an undefined strings/wasm is the same as an omitted one:
// createContext() destructures them with `= true` defaults, and
// getContextOptions() only validates them when `!== undefined` (it then
// hands createContext() a `{ strings, wasm }` object with undefined holes).
const WASM_BYTES = new Uint8Array([0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00]);
// Evaluated inside the context: reports which kinds of code generation it allows.
const probe = `
let strings = true, wasm = true;
try { eval("1"); } catch { strings = false; }
try { new WebAssembly.Module(WASM_BYTES); } catch { wasm = false; }
"strings=" + strings + " wasm=" + wasm;
`;

// createContext reads options.codeGeneration; vm.runInNewContext and
// Script#runInNewContext read options.contextCodeGeneration.
const entryPoints: Record<string, (codeGeneration: object) => string> = {
"createContext()": codeGeneration => runInContext(probe, createContext({ WASM_BYTES }, { codeGeneration })),
"runInNewContext()": contextCodeGeneration => runInNewContext(probe, { WASM_BYTES }, { contextCodeGeneration }),
"Script#runInNewContext()": contextCodeGeneration =>
new Script(probe).runInNewContext({ WASM_BYTES }, { contextCodeGeneration }),
};

describe.each(Object.entries(entryPoints))("%s", (_, run) => {
test("undefined is accepted and means the default (allowed)", () => {
expect(run({ strings: undefined })).toBe("strings=true wasm=true");
expect(run({ wasm: undefined })).toBe("strings=true wasm=true");
expect(run({ strings: undefined, wasm: undefined })).toBe("strings=true wasm=true");
});

test("undefined next to an explicit false leaves the false in effect", () => {
expect(run({ strings: false, wasm: undefined })).toBe("strings=false wasm=true");
expect(run({ strings: undefined, wasm: false })).toBe("strings=true wasm=false");
});

test.each([null, 0, 1, "false"])("%p is still rejected", value => {
expect(() => run({ strings: value })).toThrowWithCode(TypeError, "ERR_INVALID_ARG_TYPE");
expect(() => run({ wasm: value })).toThrowWithCode(TypeError, "ERR_INVALID_ARG_TYPE");
});
});
});
});

describe("context options with throwing getters", () => {
Expand Down