Skip to content
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.

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

build,lib,test: change whitelist to allowlist #36406

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.py
Expand Up @@ -948,7 +948,7 @@ def get_gas_version(cc):

# Note: Apple clang self-reports as clang 4.2.0 and gcc 4.2.1. It passes
# the version check more by accident than anything else but a more rigorous
# check involves checking the build number against a whitelist. I'm not
# check involves checking the build number against an allowlist. I'm not
# quite prepared to go that far yet.
def check_compiler(o):
if sys.platform == 'win32':
Expand Down
8 changes: 4 additions & 4 deletions lib/internal/bootstrap/loaders.js
Expand Up @@ -69,11 +69,11 @@ ObjectDefineProperty(process, 'moduleLoadList', {
});


// internalBindingWhitelist contains the name of internalBinding modules
// that are whitelisted for access via process.binding()... This is used
// internalBindingAllowlist contains the name of internalBinding modules
// that are allowed for access via process.binding()... This is used
// to provide a transition path for modules that are being moved over to
// internalBinding.
const internalBindingWhitelist = new SafeSet([
const internalBindingAllowlist = new SafeSet([
'async_wrap',
'buffer',
'cares_wrap',
Expand Down Expand Up @@ -113,7 +113,7 @@ const internalBindingWhitelist = new SafeSet([
module = String(module);
// Deprecated specific process.binding() modules, but not all, allow
// selective fallback to internalBinding for the deprecated ones.
if (internalBindingWhitelist.has(module)) {
if (internalBindingAllowlist.has(module)) {
return internalBinding(module);
}
// eslint-disable-next-line no-restricted-syntax
Expand Down
8 changes: 4 additions & 4 deletions test/common/README.md
Expand Up @@ -40,12 +40,12 @@ The `benchmark` module is used by tests to run benchmarks.
The `common` module is used by tests for consistency across repeated
tasks.

### `allowGlobals(...whitelist)`
### `allowGlobals(...allowlist)`

* `whitelist` [<Array>][] Array of Globals
* `allowlist` [<Array>][] Array of Globals
* return [<Array>][]

Takes `whitelist` and concats that with predefined `knownGlobals`.
Takes `allowlist` and concats that with predefined `knownGlobals`.

### `canCreateSymLink()`

Expand Down Expand Up @@ -601,7 +601,7 @@ If set, crypto tests are skipped.
### `NODE_TEST_KNOWN_GLOBALS`

A comma-separated list of variables names that are appended to the global
variable whitelist. Alternatively, if `NODE_TEST_KNOWN_GLOBALS` is set to `'0'`,
variable allowlist. Alternatively, if `NODE_TEST_KNOWN_GLOBALS` is set to `'0'`,
global leak detection is disabled.

## Fixtures Module
Expand Down
4 changes: 2 additions & 2 deletions test/common/index.js
Expand Up @@ -276,8 +276,8 @@ if (global.gc) {
knownGlobals.push(global.gc);
}

function allowGlobals(...whitelist) {
knownGlobals = knownGlobals.concat(whitelist);
function allowGlobals(...allowlist) {
knownGlobals = knownGlobals.concat(allowlist);
}

if (process.env.NODE_TEST_KNOWN_GLOBALS !== '0') {
Expand Down
Expand Up @@ -4,7 +4,7 @@
const common = require('../common');
const assert = require('assert');

// Assert that whitelisted internalBinding modules are accessible via
// Assert that allowed internalBinding modules are accessible via
// process.binding().
assert(process.binding('async_wrap'));
assert(process.binding('buffer'));
Expand Down