Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/permission/permission.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,11 @@ namespace permission {
const auto resource__ = (resource); \
if (!env__->permission()->is_granted(env__, perm__, resource__)) \
[[unlikely]] { \
node::permission::Permission::ThrowAccessDenied( \
env__, perm__, resource__); \
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
if (!env__->permission()->warning_only()) { \
node::permission::Permission::ThrowAccessDenied( \
env__, perm__, resource__); \
return __VA_ARGS__; \
} \
} \
} while (0)

Expand All @@ -51,9 +53,11 @@ namespace permission {
const auto resource__ = (resource); \
if (!env__->permission()->is_granted(env__, perm__, resource__)) \
[[unlikely]] { \
node::permission::Permission::AsyncThrowAccessDenied( \
env__, (wrap), perm__, resource__); \
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
if (!env__->permission()->warning_only()) { \
node::permission::Permission::AsyncThrowAccessDenied( \
env__, (wrap), perm__, resource__); \
return __VA_ARGS__; \
} \
} \
} while (0)

Expand Down
70 changes: 70 additions & 0 deletions test/parallel/test-permission-audit-fs-does-not-deny.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
'use strict';

const common = require('../common');
const tmpdir = require('../common/tmpdir');
const assert = require('node:assert');
const { spawnSync } = require('node:child_process');
const { isMainThread } = require('node:worker_threads');
const { test } = require('node:test');
const fs = require('node:fs');

if (!isMainThread) {
common.skip('This test only works on a main thread');
}

const restrictedFile = tmpdir.resolve('restricted.txt');

const childScript = `
const dc = require('node:diagnostics_channel');
const msgs = [];
dc.subscribe('node:permission-model:fs', (m) => msgs.push({
permission: m.permission,
resource: m.resource,
}));
try {
require('node:fs').readFileSync(${JSON.stringify(restrictedFile)});
console.log('NO_THROW');
} catch (e) {
console.log('THREW ' + e.code);
}
console.log('AUDIT ' + JSON.stringify(msgs));
`;

test('permission-audit logs fs denial without throwing', () => {
tmpdir.refresh();
fs.writeFileSync(restrictedFile, 'x');

// Audit mode: should NOT throw, SHOULD publish the channel message.
{
const { stdout, stderr, status } = spawnSync(
process.execPath,
['--permission-audit', '-e', childScript],
{ encoding: 'utf8' },
);
assert.strictEqual(status, 0, stderr);
const lines = stdout.split('\n');
assert.ok(lines.includes('NO_THROW'), stdout);
const auditLine = lines.find((l) => l.startsWith('AUDIT'));
assert.ok(auditLine, stdout);
const msgs = JSON.parse(auditLine.replace('AUDIT ', ''));
assert.ok(
msgs.some((m) =>
m.permission === 'FileSystemRead' &&
String(m.resource).endsWith('restricted.txt')),
JSON.stringify(msgs));
}

// Enforce mode (--permission): SHOULD throw ERR_ACCESS_DENIED (the child
// script catches it, so the process exits 0 while logging THREW ...).
{
const { stdout, stderr, status } = spawnSync(
process.execPath,
['--permission', '-e', childScript],
{ encoding: 'utf8' },
);
assert.strictEqual(status, 0, stderr);
const lines = stdout.split('\n');
assert.ok(lines.some((l) => l.startsWith('THREW ERR_ACCESS_DENIED')), stdout);
assert.ok(!lines.includes('NO_THROW'), stdout);
}
});
Loading