Skip to content

src: handle duplicate paths granted #56591

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
aduh95 merged 1 commit into from
Jan 16, 2025
Merged

src: handle duplicate paths granted #56591

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
src: handle duplicate paths granted 
This commit fixs a crash whenever someone tries to allow access to the
same path twice
  • Loading branch information
@RafaelGSS
RafaelGSS committed Jan 13, 2025
commit a856e128e17250ea3b2184a8960f9dfd6ef608af
6 changes: 4 additions & 2 deletions src/permission/fs_permission.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,12 @@ void FSPermission::Apply(Environment* env,

void FSPermission::GrantAccess(PermissionScope perm, const std::string& res) {
const std::string path = WildcardIfDir(res);
if (perm == PermissionScope::kFileSystemRead) {
if (perm == PermissionScope::kFileSystemRead &&
!granted_in_fs_.Lookup(path)) {
Comment thread
marco-ippolito marked this conversation as resolved.
granted_in_fs_.Insert(path);
deny_all_in_ = false;
} else if (perm == PermissionScope::kFileSystemWrite) {
} else if (perm == PermissionScope::kFileSystemWrite &&
!granted_out_fs_.Lookup(path)) {
granted_out_fs_.Insert(path);
deny_all_out_ = false;
}
Expand Down
40 changes: 40 additions & 0 deletions test/parallel/test-permission-fs-repeat-path.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
// Flags: --permission --allow-fs-read=* --allow-child-process
'use strict';

const common = require('../common');
const path = require('path');
common.skipIfWorker();

const assert = require('assert');
const { spawnSync } = require('child_process');

{
// Relative path as CLI args are supported
const { status, stdout } = spawnSync(
process.execPath,
[
'--permission',
'--allow-fs-write', path.resolve('../fixtures/permission/deny/regular-file.md'),
'--allow-fs-write', path.resolve('../fixtures/permission/deny/regular-file.md'),
'--allow-fs-read', path.resolve('../fixtures/permission/deny/regular-file.md'),
'--allow-fs-read', path.resolve('../fixtures/permission/deny/regular-file.md'),
'-e',
`
const path = require("path");
const absolutePath = path.resolve("../fixtures/permission/deny/regular-file.md");
const blockedPath = path.resolve("../fixtures/permission/deny/protected-file.md");
console.log(process.permission.has("fs.write", absolutePath));
console.log(process.permission.has("fs.read", absolutePath));
console.log(process.permission.has("fs.read", blockedPath));
console.log(process.permission.has("fs.write", blockedPath));
`,
]
);

const [fsWrite, fsRead, fsBlockedRead, fsBlockedWrite] = stdout.toString().split('\n');
assert.strictEqual(status, 0);
assert.strictEqual(fsWrite, 'true');
assert.strictEqual(fsRead, 'true');
assert.strictEqual(fsBlockedRead, 'false');
assert.strictEqual(fsBlockedWrite, 'false');
}