Skip to content

src: add option to disable loading native addons #39977

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

Closed
d3lm wants to merge 9 commits into from
Closed

src: add option to disable loading native addons #39977

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3a8a4c3
src: add option to disable loading native addons
d3lm Sep 2, 2021
403e522
fixup: fix linting issues and address feedback
d3lm Sep 2, 2021
099540b
fixup: remove unused definition
d3lm Sep 2, 2021
59eeea9
fixup: address feedback
d3lm Sep 3, 2021
71e0945
fixup: fix linter errors
d3lm Sep 3, 2021
c676d72
fixup: add test for process.dlopen
d3lm Sep 7, 2021
9866c16
fixup: change polarity of the exports condition
d3lm Sep 8, 2021
3fe4bcd
fixup: add trailing comma
d3lm Sep 8, 2021
7cb94e4
fixup: fix tests
d3lm Sep 8, 2021
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
Prev Previous commit
Next Next commit
fixup: add test for process.dlopen
  • Loading branch information
@d3lm
d3lm committed Sep 7, 2021
commit c676d7299436e200b0291085e09a80433a39e90f
20 changes: 16 additions & 4 deletions test/addons/no-addons/test-worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const { Worker } = require('worker_threads');

const binding = path.resolve(__dirname, `./build/${common.buildType}/binding`);

const expectError = (error) => {
const assertError = (error) => {
assert.strictEqual(error.code, 'ERR_DLOPEN_DISABLED');
assert.strictEqual(
error.message,
Expand All @@ -23,7 +23,19 @@ const expectError = (error) => {
eval: true,
});

worker.on('error', common.mustCall(expectError));
worker.on('error', common.mustCall(assertError));
}

{
// Should throw when using `process.dlopen` directly
const worker = new Worker(
`process.dlopen({ exports: {} }, ${JSON.stringify(binding)});`,
{
eval: true,
}
);

worker.on('error', common.mustCall(assertError));
}

{
Expand All @@ -33,7 +45,7 @@ const expectError = (error) => {
execArgv: ['--no-addons'],
});

worker.on('error', common.mustCall(expectError));
worker.on('error', common.mustCall(assertError));
}

{
Expand All @@ -43,5 +55,5 @@ const expectError = (error) => {
execArgv: [],
});

worker.on('error', common.mustCall(expectError));
worker.on('error', common.mustCall(assertError));
}
33 changes: 26 additions & 7 deletions test/addons/no-addons/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,37 @@ const assert = require('assert');

const bindingPath = require.resolve(`./build/${common.buildType}/binding`);

let threw = false;

try {
require(bindingPath);
} catch (error) {
threw = true;
const assertError = (error) => {
assert(error instanceof Error);
assert.strictEqual(error.code, 'ERR_DLOPEN_DISABLED');
assert.strictEqual(
error.message,
'Cannot load native addon because loading addons is disabled.'
);
};

{
let threw = false;

try {
require(bindingPath);
} catch (error) {
assertError(error);
threw = true;
}

assert(threw);
}

assert(threw);
{
let threw = false;

try {
process.dlopen({ exports: {} }, bindingPath);
} catch (error) {
assertError(error);
threw = true;
}

assert(threw);
}