Skip to content

Policy scope fix #37298

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
bmeck wants to merge 5 commits into from
Closed

Policy scope fix #37298

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d74f91e
policy: fix cascading getting the resource instead of scope
bmeck Feb 9, 2021
aeffffe
missing files
bmeck Feb 9, 2021
925b2c8
Update lib/internal/policy/manifest.js
bmeck Feb 15, 2021
bfb4aa5
Update lib/internal/policy/manifest.js
bmeck Feb 15, 2021
ac2a32b
fixup on nits
bmeck Feb 15, 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
Next Next commit
policy: fix cascading getting the resource instead of scope
  • Loading branch information
@bmeck
bmeck committed Feb 9, 2021
commit d74f91e315bb7efabe39ef789f70726057f8a73c
24 changes: 15 additions & 9 deletions lib/internal/policy/manifest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ const shouldAbortOnUncaughtException =
getOptionValue('--abort-on-uncaught-exception');
const { abort, exit, _rawDebug } = process;

const TERMINATE = () => null;
Comment thread
bmeck marked this conversation as resolved.
Outdated

// From https://url.spec.whatwg.org/#special-scheme
const SPECIAL_SCHEMES = new SafeSet([
Comment thread
bmeck marked this conversation as resolved.
Outdated
'file:',
Expand Down Expand Up @@ -76,7 +78,7 @@ function REACTION_LOG(error) {

class Manifest {
/**
* @type {Map<string, DependencyMapper>}
* @type {Map<string | null | undefined, DependencyMapper>}
*
* Used to compare a resource to the content body at the resource.
* `true` is used to signify that all integrities are allowed, otherwise,
Expand Down Expand Up @@ -139,6 +141,8 @@ class Manifest {
*/
constructor(obj, manifestURL) {
const scopes = this.#scopeDependencies;
scopes.set(null, TERMINATE);
scopes.set(undefined, TERMINATE);
const integrities = this.#resourceIntegrities;
const dependencies = this.#resourceDependencies;
let reaction = REACTION_THROW;
Expand Down Expand Up @@ -205,18 +209,20 @@ class Manifest {
return (toSpecifier, conditions) => {
if (toSpecifier in dependencyMap !== true) {
if (cascade === true) {
let scopeHREF;
/** @type {string | null} */
let scopeHREF = resourceHREF;
if (typeof parentDeps === 'undefined') {
do {
scopeHREF = this.#findScopeHREF(resourceHREF);
scopeHREF = this.#findScopeHREF(scopeHREF);
if (scopeHREF === resourceHREF) {
scopeHREF = null;
}
if (scopes.has(scopeHREF)) {
break;
}
} while (
scopeHREF !== null &&
scopes.has(scopeHREF) !== true
scopeHREF !== null
);
}
if (scopeHREF === null) {
parentDeps = () => null;
} else {
parentDeps = scopes.get(scopeHREF);
}
return parentDeps(toSpecifier);
Expand Down
16 changes: 15 additions & 1 deletion test/parallel/test-policy-scopes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ const fixtures = require('../common/fixtures');
const assert = require('assert');
const { spawnSync } = require('child_process');

const dep = fixtures.path('policy', 'main.mjs');
{
const dep = fixtures.path('policy', 'main.mjs');
const depPolicy = fixtures.path(
'policy',
'dependencies',
Expand All @@ -24,3 +24,17 @@ const dep = fixtures.path('policy', 'main.mjs');
);
assert.strictEqual(status, 0);
}
{
const dep = fixtures.path('policy', 'multi-deps.js');
const depPolicy = fixtures.path(
'policy',
'dependencies',
'dependencies-scopes-and-resources-policy.json');
const { status } = spawnSync(
process.execPath,
[
'--experimental-policy', depPolicy, dep,
]
);
assert.strictEqual(status, 0);
}