Skip to content

permission: fix wildcard when children > 1 #51209

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

Merged
merged 1 commit into from
Dec 21, 2023
Merged

permission: fix wildcard when children > 1 #51209

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
8 changes: 8 additions & 0 deletions src/permission/fs_permission.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ class FSPermission final : public PermissionBase {
return nullptr;
}

// wildcard node takes precedence
if (children.size() > 1) {
auto it = children.find('*');
if (it != children.end()) {
return it->second;
}
}

auto it = children.find(path[idx]);
if (it == children.end()) {
return nullptr;
Expand Down
20 changes: 20 additions & 0 deletions test/parallel/test-permission-fs-wildcard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,23 @@ if (common.isWindows) {
);
assert.strictEqual(status, 0, stderr.toString());
}

{
if (!common.isWindows) {
const { status, stderr } = spawnSync(
process.execPath,
[
'--experimental-permission',
'--allow-fs-read=/a/b/*',
'--allow-fs-read=/a/b/d',
'-e',
`
const assert = require('assert')
assert.ok(process.permission.has('fs.read', '/a/b/c'));
assert.ok(!process.permission.has('fs.read', '/a/c/c'));
`,
]
);
assert.strictEqual(status, 0, stderr.toString());
}
}