Commit cd1eb3e

Browse files
RafaelGSSaduh95
authored andcommitted
src,permission: add --permission-audit
Add --permission-audit flag that enables the permission model in warning-only mode. Instead of throwing ERR_ACCESS_DENIED, it emits a message via diagnostics channel and allows the operation to continue. Publish permission check results to per-scope diagnostics channels (e.g., node:permission-model:fs) so users can observe permission decisions at runtime via diagnostics_channel. Refs: #59935 PR-URL: #61869 Backport-PR-URL: #65354 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 82a0233 commit cd1eb3e

9 files changed

Lines changed: 164 additions & 12 deletions

File tree

‎doc/api/cli.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2137,6 +2137,16 @@ following permissions are restricted:
21372137
* WASI - manageable through [`--allow-wasi`][] flag
21382138
* Addons - manageable through [`--allow-addons`][] flag
21392139

2140+
### `--permission-audit`
2141+
2142+
<!-- YAML
2143+
added: REPLACEME
2144+
-->
2145+
2146+
Enable audit only for the permission model. When enabled, permission checks
2147+
are performed but access is not denied. Instead, a warning is emitted for
2148+
each permission violation via diagnostics channel.
2149+
21402150
### `--preserve-symlinks`
21412151

21422152
<!-- YAML
@@ -3661,6 +3671,7 @@ one is included in the list below.
36613671
*`--openssl-legacy-provider`
36623672
*`--openssl-shared-config`
36633673
*`--pending-deprecation`
3674+
*`--permission-audit`
36643675
*`--permission`
36653676
*`--preserve-symlinks-main`
36663677
*`--preserve-symlinks`

‎doc/node.1‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,11 @@ Among other uses, this can be used to enable FIPS-compliant crypto if Node.js is
468468
.ItFl-pending-deprecation
469469
Emit pending deprecation warnings.
470470
.
471+
.ItFl-permission-audit
472+
Enable audit only for the permission model. When enabled, permission checks
473+
are performed but access is not denied. Instead, a warning is emitted for
474+
each permission violation via diagnostics channel.
475+
.
471476
.ItFl-preserve-symlinks
472477
Instructs the module loader to preserve symbolic links when resolving and caching modules other than the main module.
473478
.

‎lib/internal/process/pre_execution.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ function setupDiagnosticsChannel() {
634634
}
635635

636636
functioninitializePermission(){
637-
constpermission=getOptionValue('--permission');
637+
constpermission=getOptionValue('--permission')||getOptionValue('--permission-audit');
638638
if(permission){
639639
process.binding=functionbinding(_module){
640640
thrownewERR_ACCESS_DENIED('process.binding');

‎src/env.cc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,8 +900,11 @@ Environment::Environment(IsolateData* isolate_data,
900900
tracing::CastTracedValue(traced_value));
901901
}
902902

903-
if (options_->permission) {
903+
if (options_->permission || options_->permission_audit) {
904904
permission()->EnablePermissions();
905+
if (options_->permission_audit) {
906+
permission()->EnableWarningOnly();
907+
}
905908
// The process shouldn't be able to neither
906909
// spawn/worker nor use addons or enable inspector
907910
// unless explicitly allowed by the user

‎src/node_options.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,11 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
639639
&EnvironmentOptions::permission,
640640
kAllowedInEnvvar,
641641
false);
642+
AddOption("--permission-audit",
643+
"enable audit only for the permission system",
644+
&EnvironmentOptions::permission_audit,
645+
kAllowedInEnvvar,
646+
false);
642647
AddOption("--allow-fs-read",
643648
"allow permissions to read the filesystem",
644649
&EnvironmentOptions::allow_fs_read,

‎src/node_options.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ class EnvironmentOptions : public Options {
143143
std::string input_type; // Value of --input-type
144144
bool entry_is_url = false;
145145
bool permission = false;
146+
bool permission_audit = false;
146147
std::vector<std::string> allow_fs_read;
147148
std::vector<std::string> allow_fs_write;
148149
bool allow_addons = false;

‎src/permission/permission.cc‎

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include"env-inl.h"
44
#include"memory_tracker-inl.h"
55
#include"node.h"
6+
#include"node_diagnostics_channel.h"
67
#include"node_errors.h"
78
#include"node_external_reference.h"
89
#include"node_file.h"
@@ -27,6 +28,27 @@ namespace permission {
2728

2829
namespace {
2930

31+
constexpr std::string_view GetDiagnosticsChannelName(PermissionScope scope) {
32+
switch (scope) {
33+
case PermissionScope::kFileSystem:
34+
case PermissionScope::kFileSystemRead:
35+
case PermissionScope::kFileSystemWrite:
36+
return"node:permission-model:fs";
37+
case PermissionScope::kChildProcess:
38+
return"node:permission-model:child";
39+
case PermissionScope::kWorkerThreads:
40+
return"node:permission-model:worker";
41+
case PermissionScope::kInspector:
42+
return"node:permission-model:inspector";
43+
case PermissionScope::kWASI:
44+
return"node:permission-model:wasi";
45+
case PermissionScope::kAddon:
46+
return"node:permission-model:addon";
47+
default:
48+
return {};
49+
}
50+
}
51+
3052
// permission.has('fs.in', '/tmp/')
3153
// permission.has('fs.in')
3254
staticvoidHas(const FunctionCallbackInfo<Value>& args) {
@@ -70,7 +92,7 @@ PermissionScope Permission::StringToPermission(const std::string& perm) {
7092
}
7193
#undef V
7294

73-
Permission::Permission() : enabled_(false) {
95+
Permission::Permission() : enabled_(false), warning_only_(false) {
7496
std::shared_ptr<PermissionBase> fs = std::make_shared<FSPermission>();
7597
std::shared_ptr<PermissionBase> child_p =
7698
std::make_shared<ChildProcessPermission>();
@@ -170,6 +192,74 @@ void Permission::EnablePermissions() {
170192
}
171193
}
172194

195+
voidPermission::EnableWarningOnly() {
196+
if (!warning_only_) {
197+
warning_only_ = true;
198+
}
199+
}
200+
201+
boolPermission::is_scope_granted(Environment* env,
202+
const PermissionScope permission,
203+
const std::string_view& res) const {
204+
auto perm_node = nodes_.find(permission);
205+
bool result = false;
206+
if (perm_node != nodes_.end()) {
207+
result = perm_node->second->is_granted(env, permission, res);
208+
}
209+
210+
if (!result && !publishing_) {
211+
auto channel_name = GetDiagnosticsChannelName(permission);
212+
if (!channel_name.empty()) {
213+
auto ch = GetOrCreateChannel(env, permission);
214+
if (ch && ch->HasSubscribers()) {
215+
publishing_ = true;
216+
v8::Isolate* isolate = env->isolate();
217+
v8::HandleScope handle_scope(isolate);
218+
v8::Local<v8::Context> context = env->context();
219+
v8::Local<v8::Object> msg =
220+
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
221+
constchar* perm_str = PermissionToString(permission);
222+
msg->Set(context,
223+
FIXED_ONE_BYTE_STRING(isolate, "permission"),
224+
v8::String::NewFromUtf8(isolate, perm_str).ToLocalChecked())
225+
.Check();
226+
msg->Set(context,
227+
FIXED_ONE_BYTE_STRING(isolate, "resource"),
228+
v8::String::NewFromUtf8(isolate,
229+
res.data(),
230+
v8::NewStringType::kNormal,
231+
static_cast<int>(res.size()))
232+
.ToLocalChecked())
233+
.Check();
234+
ch->Publish(env, msg);
235+
publishing_ = false;
236+
}
237+
}
238+
}
239+
240+
return result;
241+
}
242+
243+
BaseObjectPtr<diagnostics_channel::Channel> Permission::GetOrCreateChannel(
244+
Environment* env, PermissionScope scope) const {
245+
auto it = channels_.find(scope);
246+
if (it != channels_.end()) {
247+
// Promote weak ref to strong for the duration of this call.
248+
BaseObjectPtr<diagnostics_channel::Channel> ptr(it->second.get());
249+
if (ptr) return ptr;
250+
channels_.erase(it);
251+
}
252+
auto channel_name = GetDiagnosticsChannelName(scope);
253+
diagnostics_channel::Channel* ch =
254+
diagnostics_channel::Channel::Get(env, channel_name.data());
255+
if (ch != nullptr) {
256+
channels_.emplace(scope,
257+
BaseObjectWeakPtr<diagnostics_channel::Channel>(ch));
258+
return BaseObjectPtr<diagnostics_channel::Channel>(ch);
259+
}
260+
return {};
261+
}
262+
173263
voidPermission::Apply(Environment* env,
174264
const std::vector<std::string>& allow,
175265
PermissionScope scope) {

‎src/permission/permission.h‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

66
#include"debug_utils.h"
7+
#include"node_diagnostics_channel.h"
78
#include"node_options.h"
89
#include"permission/addon_permission.h"
910
#include"permission/child_process_permission.h"
@@ -36,7 +37,7 @@ namespace permission {
3637
[[unlikely]] { \
3738
node::permission::Permission::ThrowAccessDenied( \
3839
env__, perm__, resource__); \
39-
return __VA_ARGS__; \
40+
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
4041
} \
4142
} while (0)
4243

@@ -50,7 +51,7 @@ namespace permission {
5051
[[unlikely]] { \
5152
node::permission::Permission::AsyncThrowAccessDenied( \
5253
env__, (wrap), perm__, resource__); \
53-
return __VA_ARGS__; \
54+
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
5455
} \
5556
} while (0)
5657

@@ -99,6 +100,8 @@ class Permission {
99100

100101
FORCE_INLINEboolenabled() const { return enabled_; }
101102

103+
FORCE_INLINEboolwarning_only() const { return warning_only_; }
104+
102105
static PermissionScope StringToPermission(const std::string& perm);
103106
staticconstchar* PermissionToString(PermissionScope perm);
104107
staticvoidThrowAccessDenied(Environment* env,
@@ -114,20 +117,25 @@ class Permission {
114117
const std::vector<std::string>& allow,
115118
PermissionScope scope);
116119
voidEnablePermissions();
120+
voidEnableWarningOnly();
117121

118122
private:
119123
COLD_NOINLINEboolis_scope_granted(Environment* env,
120124
const PermissionScope permission,
121-
const std::string_view& res = "") const {
122-
auto perm_node = nodes_.find(permission);
123-
if (perm_node != nodes_.end()) {
124-
return perm_node->second->is_granted(env, permission, res);
125-
}
126-
returnfalse;
127-
}
125+
const std::string_view& res = "") const;
126+
127+
BaseObjectPtr<diagnostics_channel::Channel> GetOrCreateChannel(
128+
Environment* env, PermissionScope scope) const;
128129

129130
std::unordered_map<PermissionScope, std::shared_ptr<PermissionBase>> nodes_;
130131
bool enabled_;
132+
bool warning_only_;
133+
mutablebool publishing_ = false;
134+
// Weak refs: BindingData (via BaseObjectPtr) is the sole owner of Channels.
135+
// Using weak refs here avoids keeping Channels alive past Realm teardown.
136+
mutable std::unordered_map<PermissionScope,
137+
BaseObjectWeakPtr<diagnostics_channel::Channel>>
138+
channels_;
131139
};
132140

133141
} // namespace permission
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Flags: --permission --allow-fs-read=*
2+
'use strict';
3+
4+
constcommon=require('../common');
5+
const{ isMainThread }=require('worker_threads');
6+
7+
if(!isMainThread){
8+
common.skip('This test only works on a main thread');
9+
}
10+
11+
constassert=require('node:assert');
12+
constdc=require('node:diagnostics_channel');
13+
constfs=require('node:fs');
14+
15+
constmessages=[];
16+
dc.subscribe('node:permission-model:fs',(msg)=>{
17+
messages.push(msg);
18+
});
19+
20+
// Granted permission should not publish
21+
fs.readFileSync(__filename);
22+
assert.strictEqual(messages.length,0);
23+
24+
// Denied permission should publish
25+
consthasWrite=process.permission.has('fs.write','/tmp/test');
26+
assert.strictEqual(hasWrite,false);
27+
28+
assert.ok(messages.length>0,'Expected at least one denied message');
29+
assert.strictEqual(messages[0].permission,'FileSystemWrite');

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit cd1eb3e

Browse files
RafaelGSSaduh95
authored andcommitted
src,permission: add --permission-audit
Add --permission-audit flag that enables the permission model in warning-only mode. Instead of throwing ERR_ACCESS_DENIED, it emits a message via diagnostics channel and allows the operation to continue. Publish permission check results to per-scope diagnostics channels (e.g., node:permission-model:fs) so users can observe permission decisions at runtime via diagnostics_channel. Refs: #59935 PR-URL: #61869 Backport-PR-URL: #65354 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 82a0233 commit cd1eb3e

9 files changed

Lines changed: 164 additions & 12 deletions

File tree

‎doc/api/cli.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2137,6 +2137,16 @@ following permissions are restricted:
21372137
* WASI - manageable through [`--allow-wasi`][] flag
21382138
* Addons - manageable through [`--allow-addons`][] flag
21392139

2140+
### `--permission-audit`
2141+
2142+
<!-- YAML
2143+
added: REPLACEME
2144+
-->
2145+
2146+
Enable audit only for the permission model. When enabled, permission checks
2147+
are performed but access is not denied. Instead, a warning is emitted for
2148+
each permission violation via diagnostics channel.
2149+
21402150
### `--preserve-symlinks`
21412151

21422152
<!-- YAML
@@ -3661,6 +3671,7 @@ one is included in the list below.
36613671
*`--openssl-legacy-provider`
36623672
*`--openssl-shared-config`
36633673
*`--pending-deprecation`
3674+
*`--permission-audit`
36643675
*`--permission`
36653676
*`--preserve-symlinks-main`
36663677
*`--preserve-symlinks`

‎doc/node.1‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,11 @@ Among other uses, this can be used to enable FIPS-compliant crypto if Node.js is
468468
.ItFl-pending-deprecation
469469
Emit pending deprecation warnings.
470470
.
471+
.ItFl-permission-audit
472+
Enable audit only for the permission model. When enabled, permission checks
473+
are performed but access is not denied. Instead, a warning is emitted for
474+
each permission violation via diagnostics channel.
475+
.
471476
.ItFl-preserve-symlinks
472477
Instructs the module loader to preserve symbolic links when resolving and caching modules other than the main module.
473478
.

‎lib/internal/process/pre_execution.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ function setupDiagnosticsChannel() {
634634
}
635635

636636
functioninitializePermission(){
637-
constpermission=getOptionValue('--permission');
637+
constpermission=getOptionValue('--permission')||getOptionValue('--permission-audit');
638638
if(permission){
639639
process.binding=functionbinding(_module){
640640
thrownewERR_ACCESS_DENIED('process.binding');

‎src/env.cc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,8 +900,11 @@ Environment::Environment(IsolateData* isolate_data,
900900
tracing::CastTracedValue(traced_value));
901901
}
902902

903-
if (options_->permission) {
903+
if (options_->permission || options_->permission_audit) {
904904
permission()->EnablePermissions();
905+
if (options_->permission_audit) {
906+
permission()->EnableWarningOnly();
907+
}
905908
// The process shouldn't be able to neither
906909
// spawn/worker nor use addons or enable inspector
907910
// unless explicitly allowed by the user

‎src/node_options.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,11 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
639639
&EnvironmentOptions::permission,
640640
kAllowedInEnvvar,
641641
false);
642+
AddOption("--permission-audit",
643+
"enable audit only for the permission system",
644+
&EnvironmentOptions::permission_audit,
645+
kAllowedInEnvvar,
646+
false);
642647
AddOption("--allow-fs-read",
643648
"allow permissions to read the filesystem",
644649
&EnvironmentOptions::allow_fs_read,

‎src/node_options.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ class EnvironmentOptions : public Options {
143143
std::string input_type; // Value of --input-type
144144
bool entry_is_url = false;
145145
bool permission = false;
146+
bool permission_audit = false;
146147
std::vector<std::string> allow_fs_read;
147148
std::vector<std::string> allow_fs_write;
148149
bool allow_addons = false;

‎src/permission/permission.cc‎

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include"env-inl.h"
44
#include"memory_tracker-inl.h"
55
#include"node.h"
6+
#include"node_diagnostics_channel.h"
67
#include"node_errors.h"
78
#include"node_external_reference.h"
89
#include"node_file.h"
@@ -27,6 +28,27 @@ namespace permission {
2728

2829
namespace {
2930

31+
constexpr std::string_view GetDiagnosticsChannelName(PermissionScope scope) {
32+
switch (scope) {
33+
case PermissionScope::kFileSystem:
34+
case PermissionScope::kFileSystemRead:
35+
case PermissionScope::kFileSystemWrite:
36+
return"node:permission-model:fs";
37+
case PermissionScope::kChildProcess:
38+
return"node:permission-model:child";
39+
case PermissionScope::kWorkerThreads:
40+
return"node:permission-model:worker";
41+
case PermissionScope::kInspector:
42+
return"node:permission-model:inspector";
43+
case PermissionScope::kWASI:
44+
return"node:permission-model:wasi";
45+
case PermissionScope::kAddon:
46+
return"node:permission-model:addon";
47+
default:
48+
return {};
49+
}
50+
}
51+
3052
// permission.has('fs.in', '/tmp/')
3153
// permission.has('fs.in')
3254
staticvoidHas(const FunctionCallbackInfo<Value>& args) {
@@ -70,7 +92,7 @@ PermissionScope Permission::StringToPermission(const std::string& perm) {
7092
}
7193
#undef V
7294

73-
Permission::Permission() : enabled_(false) {
95+
Permission::Permission() : enabled_(false), warning_only_(false) {
7496
std::shared_ptr<PermissionBase> fs = std::make_shared<FSPermission>();
7597
std::shared_ptr<PermissionBase> child_p =
7698
std::make_shared<ChildProcessPermission>();
@@ -170,6 +192,74 @@ void Permission::EnablePermissions() {
170192
}
171193
}
172194

195+
voidPermission::EnableWarningOnly() {
196+
if (!warning_only_) {
197+
warning_only_ = true;
198+
}
199+
}
200+
201+
boolPermission::is_scope_granted(Environment* env,
202+
const PermissionScope permission,
203+
const std::string_view& res) const {
204+
auto perm_node = nodes_.find(permission);
205+
bool result = false;
206+
if (perm_node != nodes_.end()) {
207+
result = perm_node->second->is_granted(env, permission, res);
208+
}
209+
210+
if (!result && !publishing_) {
211+
auto channel_name = GetDiagnosticsChannelName(permission);
212+
if (!channel_name.empty()) {
213+
auto ch = GetOrCreateChannel(env, permission);
214+
if (ch && ch->HasSubscribers()) {
215+
publishing_ = true;
216+
v8::Isolate* isolate = env->isolate();
217+
v8::HandleScope handle_scope(isolate);
218+
v8::Local<v8::Context> context = env->context();
219+
v8::Local<v8::Object> msg =
220+
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
221+
constchar* perm_str = PermissionToString(permission);
222+
msg->Set(context,
223+
FIXED_ONE_BYTE_STRING(isolate, "permission"),
224+
v8::String::NewFromUtf8(isolate, perm_str).ToLocalChecked())
225+
.Check();
226+
msg->Set(context,
227+
FIXED_ONE_BYTE_STRING(isolate, "resource"),
228+
v8::String::NewFromUtf8(isolate,
229+
res.data(),
230+
v8::NewStringType::kNormal,
231+
static_cast<int>(res.size()))
232+
.ToLocalChecked())
233+
.Check();
234+
ch->Publish(env, msg);
235+
publishing_ = false;
236+
}
237+
}
238+
}
239+
240+
return result;
241+
}
242+
243+
BaseObjectPtr<diagnostics_channel::Channel> Permission::GetOrCreateChannel(
244+
Environment* env, PermissionScope scope) const {
245+
auto it = channels_.find(scope);
246+
if (it != channels_.end()) {
247+
// Promote weak ref to strong for the duration of this call.
248+
BaseObjectPtr<diagnostics_channel::Channel> ptr(it->second.get());
249+
if (ptr) return ptr;
250+
channels_.erase(it);
251+
}
252+
auto channel_name = GetDiagnosticsChannelName(scope);
253+
diagnostics_channel::Channel* ch =
254+
diagnostics_channel::Channel::Get(env, channel_name.data());
255+
if (ch != nullptr) {
256+
channels_.emplace(scope,
257+
BaseObjectWeakPtr<diagnostics_channel::Channel>(ch));
258+
return BaseObjectPtr<diagnostics_channel::Channel>(ch);
259+
}
260+
return {};
261+
}
262+
173263
voidPermission::Apply(Environment* env,
174264
const std::vector<std::string>& allow,
175265
PermissionScope scope) {

‎src/permission/permission.h‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

66
#include"debug_utils.h"
7+
#include"node_diagnostics_channel.h"
78
#include"node_options.h"
89
#include"permission/addon_permission.h"
910
#include"permission/child_process_permission.h"
@@ -36,7 +37,7 @@ namespace permission {
3637
[[unlikely]] { \
3738
node::permission::Permission::ThrowAccessDenied( \
3839
env__, perm__, resource__); \
39-
return __VA_ARGS__; \
40+
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
4041
} \
4142
} while (0)
4243

@@ -50,7 +51,7 @@ namespace permission {
5051
[[unlikely]] { \
5152
node::permission::Permission::AsyncThrowAccessDenied( \
5253
env__, (wrap), perm__, resource__); \
53-
return __VA_ARGS__; \
54+
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
5455
} \
5556
} while (0)
5657

@@ -99,6 +100,8 @@ class Permission {
99100

100101
FORCE_INLINEboolenabled() const { return enabled_; }
101102

103+
FORCE_INLINEboolwarning_only() const { return warning_only_; }
104+
102105
static PermissionScope StringToPermission(const std::string& perm);
103106
staticconstchar* PermissionToString(PermissionScope perm);
104107
staticvoidThrowAccessDenied(Environment* env,
@@ -114,20 +117,25 @@ class Permission {
114117
const std::vector<std::string>& allow,
115118
PermissionScope scope);
116119
voidEnablePermissions();
120+
voidEnableWarningOnly();
117121

118122
private:
119123
COLD_NOINLINEboolis_scope_granted(Environment* env,
120124
const PermissionScope permission,
121-
const std::string_view& res = "") const {
122-
auto perm_node = nodes_.find(permission);
123-
if (perm_node != nodes_.end()) {
124-
return perm_node->second->is_granted(env, permission, res);
125-
}
126-
returnfalse;
127-
}
125+
const std::string_view& res = "") const;
126+
127+
BaseObjectPtr<diagnostics_channel::Channel> GetOrCreateChannel(
128+
Environment* env, PermissionScope scope) const;
128129

129130
std::unordered_map<PermissionScope, std::shared_ptr<PermissionBase>> nodes_;
130131
bool enabled_;
132+
bool warning_only_;
133+
mutablebool publishing_ = false;
134+
// Weak refs: BindingData (via BaseObjectPtr) is the sole owner of Channels.
135+
// Using weak refs here avoids keeping Channels alive past Realm teardown.
136+
mutable std::unordered_map<PermissionScope,
137+
BaseObjectWeakPtr<diagnostics_channel::Channel>>
138+
channels_;
131139
};
132140

133141
} // namespace permission
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Flags: --permission --allow-fs-read=*
2+
'use strict';
3+
4+
constcommon=require('../common');
5+
const{ isMainThread }=require('worker_threads');
6+
7+
if(!isMainThread){
8+
common.skip('This test only works on a main thread');
9+
}
10+
11+
constassert=require('node:assert');
12+
constdc=require('node:diagnostics_channel');
13+
constfs=require('node:fs');
14+
15+
constmessages=[];
16+
dc.subscribe('node:permission-model:fs',(msg)=>{
17+
messages.push(msg);
18+
});
19+
20+
// Granted permission should not publish
21+
fs.readFileSync(__filename);
22+
assert.strictEqual(messages.length,0);
23+
24+
// Denied permission should publish
25+
consthasWrite=process.permission.has('fs.write','/tmp/test');
26+
assert.strictEqual(hasWrite,false);
27+
28+
assert.ok(messages.length>0,'Expected at least one denied message');
29+
assert.strictEqual(messages[0].permission,'FileSystemWrite');

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit cd1eb3e

Browse files
RafaelGSSaduh95
authored andcommitted
src,permission: add --permission-audit
Add --permission-audit flag that enables the permission model in warning-only mode. Instead of throwing ERR_ACCESS_DENIED, it emits a message via diagnostics channel and allows the operation to continue. Publish permission check results to per-scope diagnostics channels (e.g., node:permission-model:fs) so users can observe permission decisions at runtime via diagnostics_channel. Refs: #59935 PR-URL: #61869 Backport-PR-URL: #65354 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 82a0233 commit cd1eb3e

9 files changed

Lines changed: 164 additions & 12 deletions

File tree

‎doc/api/cli.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2137,6 +2137,16 @@ following permissions are restricted:
21372137
* WASI - manageable through [`--allow-wasi`][] flag
21382138
* Addons - manageable through [`--allow-addons`][] flag
21392139

2140+
### `--permission-audit`
2141+
2142+
<!-- YAML
2143+
added: REPLACEME
2144+
-->
2145+
2146+
Enable audit only for the permission model. When enabled, permission checks
2147+
are performed but access is not denied. Instead, a warning is emitted for
2148+
each permission violation via diagnostics channel.
2149+
21402150
### `--preserve-symlinks`
21412151

21422152
<!-- YAML
@@ -3661,6 +3671,7 @@ one is included in the list below.
36613671
*`--openssl-legacy-provider`
36623672
*`--openssl-shared-config`
36633673
*`--pending-deprecation`
3674+
*`--permission-audit`
36643675
*`--permission`
36653676
*`--preserve-symlinks-main`
36663677
*`--preserve-symlinks`

‎doc/node.1‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,11 @@ Among other uses, this can be used to enable FIPS-compliant crypto if Node.js is
468468
.ItFl-pending-deprecation
469469
Emit pending deprecation warnings.
470470
.
471+
.ItFl-permission-audit
472+
Enable audit only for the permission model. When enabled, permission checks
473+
are performed but access is not denied. Instead, a warning is emitted for
474+
each permission violation via diagnostics channel.
475+
.
471476
.ItFl-preserve-symlinks
472477
Instructs the module loader to preserve symbolic links when resolving and caching modules other than the main module.
473478
.

‎lib/internal/process/pre_execution.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ function setupDiagnosticsChannel() {
634634
}
635635

636636
functioninitializePermission(){
637-
constpermission=getOptionValue('--permission');
637+
constpermission=getOptionValue('--permission')||getOptionValue('--permission-audit');
638638
if(permission){
639639
process.binding=functionbinding(_module){
640640
thrownewERR_ACCESS_DENIED('process.binding');

‎src/env.cc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,8 +900,11 @@ Environment::Environment(IsolateData* isolate_data,
900900
tracing::CastTracedValue(traced_value));
901901
}
902902

903-
if (options_->permission) {
903+
if (options_->permission || options_->permission_audit) {
904904
permission()->EnablePermissions();
905+
if (options_->permission_audit) {
906+
permission()->EnableWarningOnly();
907+
}
905908
// The process shouldn't be able to neither
906909
// spawn/worker nor use addons or enable inspector
907910
// unless explicitly allowed by the user

‎src/node_options.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,11 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
639639
&EnvironmentOptions::permission,
640640
kAllowedInEnvvar,
641641
false);
642+
AddOption("--permission-audit",
643+
"enable audit only for the permission system",
644+
&EnvironmentOptions::permission_audit,
645+
kAllowedInEnvvar,
646+
false);
642647
AddOption("--allow-fs-read",
643648
"allow permissions to read the filesystem",
644649
&EnvironmentOptions::allow_fs_read,

‎src/node_options.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ class EnvironmentOptions : public Options {
143143
std::string input_type; // Value of --input-type
144144
bool entry_is_url = false;
145145
bool permission = false;
146+
bool permission_audit = false;
146147
std::vector<std::string> allow_fs_read;
147148
std::vector<std::string> allow_fs_write;
148149
bool allow_addons = false;

‎src/permission/permission.cc‎

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include"env-inl.h"
44
#include"memory_tracker-inl.h"
55
#include"node.h"
6+
#include"node_diagnostics_channel.h"
67
#include"node_errors.h"
78
#include"node_external_reference.h"
89
#include"node_file.h"
@@ -27,6 +28,27 @@ namespace permission {
2728

2829
namespace {
2930

31+
constexpr std::string_view GetDiagnosticsChannelName(PermissionScope scope) {
32+
switch (scope) {
33+
case PermissionScope::kFileSystem:
34+
case PermissionScope::kFileSystemRead:
35+
case PermissionScope::kFileSystemWrite:
36+
return"node:permission-model:fs";
37+
case PermissionScope::kChildProcess:
38+
return"node:permission-model:child";
39+
case PermissionScope::kWorkerThreads:
40+
return"node:permission-model:worker";
41+
case PermissionScope::kInspector:
42+
return"node:permission-model:inspector";
43+
case PermissionScope::kWASI:
44+
return"node:permission-model:wasi";
45+
case PermissionScope::kAddon:
46+
return"node:permission-model:addon";
47+
default:
48+
return {};
49+
}
50+
}
51+
3052
// permission.has('fs.in', '/tmp/')
3153
// permission.has('fs.in')
3254
staticvoidHas(const FunctionCallbackInfo<Value>& args) {
@@ -70,7 +92,7 @@ PermissionScope Permission::StringToPermission(const std::string& perm) {
7092
}
7193
#undef V
7294

73-
Permission::Permission() : enabled_(false) {
95+
Permission::Permission() : enabled_(false), warning_only_(false) {
7496
std::shared_ptr<PermissionBase> fs = std::make_shared<FSPermission>();
7597
std::shared_ptr<PermissionBase> child_p =
7698
std::make_shared<ChildProcessPermission>();
@@ -170,6 +192,74 @@ void Permission::EnablePermissions() {
170192
}
171193
}
172194

195+
voidPermission::EnableWarningOnly() {
196+
if (!warning_only_) {
197+
warning_only_ = true;
198+
}
199+
}
200+
201+
boolPermission::is_scope_granted(Environment* env,
202+
const PermissionScope permission,
203+
const std::string_view& res) const {
204+
auto perm_node = nodes_.find(permission);
205+
bool result = false;
206+
if (perm_node != nodes_.end()) {
207+
result = perm_node->second->is_granted(env, permission, res);
208+
}
209+
210+
if (!result && !publishing_) {
211+
auto channel_name = GetDiagnosticsChannelName(permission);
212+
if (!channel_name.empty()) {
213+
auto ch = GetOrCreateChannel(env, permission);
214+
if (ch && ch->HasSubscribers()) {
215+
publishing_ = true;
216+
v8::Isolate* isolate = env->isolate();
217+
v8::HandleScope handle_scope(isolate);
218+
v8::Local<v8::Context> context = env->context();
219+
v8::Local<v8::Object> msg =
220+
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
221+
constchar* perm_str = PermissionToString(permission);
222+
msg->Set(context,
223+
FIXED_ONE_BYTE_STRING(isolate, "permission"),
224+
v8::String::NewFromUtf8(isolate, perm_str).ToLocalChecked())
225+
.Check();
226+
msg->Set(context,
227+
FIXED_ONE_BYTE_STRING(isolate, "resource"),
228+
v8::String::NewFromUtf8(isolate,
229+
res.data(),
230+
v8::NewStringType::kNormal,
231+
static_cast<int>(res.size()))
232+
.ToLocalChecked())
233+
.Check();
234+
ch->Publish(env, msg);
235+
publishing_ = false;
236+
}
237+
}
238+
}
239+
240+
return result;
241+
}
242+
243+
BaseObjectPtr<diagnostics_channel::Channel> Permission::GetOrCreateChannel(
244+
Environment* env, PermissionScope scope) const {
245+
auto it = channels_.find(scope);
246+
if (it != channels_.end()) {
247+
// Promote weak ref to strong for the duration of this call.
248+
BaseObjectPtr<diagnostics_channel::Channel> ptr(it->second.get());
249+
if (ptr) return ptr;
250+
channels_.erase(it);
251+
}
252+
auto channel_name = GetDiagnosticsChannelName(scope);
253+
diagnostics_channel::Channel* ch =
254+
diagnostics_channel::Channel::Get(env, channel_name.data());
255+
if (ch != nullptr) {
256+
channels_.emplace(scope,
257+
BaseObjectWeakPtr<diagnostics_channel::Channel>(ch));
258+
return BaseObjectPtr<diagnostics_channel::Channel>(ch);
259+
}
260+
return {};
261+
}
262+
173263
voidPermission::Apply(Environment* env,
174264
const std::vector<std::string>& allow,
175265
PermissionScope scope) {

‎src/permission/permission.h‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

66
#include"debug_utils.h"
7+
#include"node_diagnostics_channel.h"
78
#include"node_options.h"
89
#include"permission/addon_permission.h"
910
#include"permission/child_process_permission.h"
@@ -36,7 +37,7 @@ namespace permission {
3637
[[unlikely]] { \
3738
node::permission::Permission::ThrowAccessDenied( \
3839
env__, perm__, resource__); \
39-
return __VA_ARGS__; \
40+
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
4041
} \
4142
} while (0)
4243

@@ -50,7 +51,7 @@ namespace permission {
5051
[[unlikely]] { \
5152
node::permission::Permission::AsyncThrowAccessDenied( \
5253
env__, (wrap), perm__, resource__); \
53-
return __VA_ARGS__; \
54+
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
5455
} \
5556
} while (0)
5657

@@ -99,6 +100,8 @@ class Permission {
99100

100101
FORCE_INLINEboolenabled() const { return enabled_; }
101102

103+
FORCE_INLINEboolwarning_only() const { return warning_only_; }
104+
102105
static PermissionScope StringToPermission(const std::string& perm);
103106
staticconstchar* PermissionToString(PermissionScope perm);
104107
staticvoidThrowAccessDenied(Environment* env,
@@ -114,20 +117,25 @@ class Permission {
114117
const std::vector<std::string>& allow,
115118
PermissionScope scope);
116119
voidEnablePermissions();
120+
voidEnableWarningOnly();
117121

118122
private:
119123
COLD_NOINLINEboolis_scope_granted(Environment* env,
120124
const PermissionScope permission,
121-
const std::string_view& res = "") const {
122-
auto perm_node = nodes_.find(permission);
123-
if (perm_node != nodes_.end()) {
124-
return perm_node->second->is_granted(env, permission, res);
125-
}
126-
returnfalse;
127-
}
125+
const std::string_view& res = "") const;
126+
127+
BaseObjectPtr<diagnostics_channel::Channel> GetOrCreateChannel(
128+
Environment* env, PermissionScope scope) const;
128129

129130
std::unordered_map<PermissionScope, std::shared_ptr<PermissionBase>> nodes_;
130131
bool enabled_;
132+
bool warning_only_;
133+
mutablebool publishing_ = false;
134+
// Weak refs: BindingData (via BaseObjectPtr) is the sole owner of Channels.
135+
// Using weak refs here avoids keeping Channels alive past Realm teardown.
136+
mutable std::unordered_map<PermissionScope,
137+
BaseObjectWeakPtr<diagnostics_channel::Channel>>
138+
channels_;
131139
};
132140

133141
} // namespace permission
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Flags: --permission --allow-fs-read=*
2+
'use strict';
3+
4+
constcommon=require('../common');
5+
const{ isMainThread }=require('worker_threads');
6+
7+
if(!isMainThread){
8+
common.skip('This test only works on a main thread');
9+
}
10+
11+
constassert=require('node:assert');
12+
constdc=require('node:diagnostics_channel');
13+
constfs=require('node:fs');
14+
15+
constmessages=[];
16+
dc.subscribe('node:permission-model:fs',(msg)=>{
17+
messages.push(msg);
18+
});
19+
20+
// Granted permission should not publish
21+
fs.readFileSync(__filename);
22+
assert.strictEqual(messages.length,0);
23+
24+
// Denied permission should publish
25+
consthasWrite=process.permission.has('fs.write','/tmp/test');
26+
assert.strictEqual(hasWrite,false);
27+
28+
assert.ok(messages.length>0,'Expected at least one denied message');
29+
assert.strictEqual(messages[0].permission,'FileSystemWrite');

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit cd1eb3e

Browse files
RafaelGSSaduh95
authored andcommitted
src,permission: add --permission-audit
Add --permission-audit flag that enables the permission model in warning-only mode. Instead of throwing ERR_ACCESS_DENIED, it emits a message via diagnostics channel and allows the operation to continue. Publish permission check results to per-scope diagnostics channels (e.g., node:permission-model:fs) so users can observe permission decisions at runtime via diagnostics_channel. Refs: #59935 PR-URL: #61869 Backport-PR-URL: #65354 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 82a0233 commit cd1eb3e

9 files changed

Lines changed: 164 additions & 12 deletions

File tree

‎doc/api/cli.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2137,6 +2137,16 @@ following permissions are restricted:
21372137
* WASI - manageable through [`--allow-wasi`][] flag
21382138
* Addons - manageable through [`--allow-addons`][] flag
21392139

2140+
### `--permission-audit`
2141+
2142+
<!-- YAML
2143+
added: REPLACEME
2144+
-->
2145+
2146+
Enable audit only for the permission model. When enabled, permission checks
2147+
are performed but access is not denied. Instead, a warning is emitted for
2148+
each permission violation via diagnostics channel.
2149+
21402150
### `--preserve-symlinks`
21412151

21422152
<!-- YAML
@@ -3661,6 +3671,7 @@ one is included in the list below.
36613671
*`--openssl-legacy-provider`
36623672
*`--openssl-shared-config`
36633673
*`--pending-deprecation`
3674+
*`--permission-audit`
36643675
*`--permission`
36653676
*`--preserve-symlinks-main`
36663677
*`--preserve-symlinks`

‎doc/node.1‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,11 @@ Among other uses, this can be used to enable FIPS-compliant crypto if Node.js is
468468
.ItFl-pending-deprecation
469469
Emit pending deprecation warnings.
470470
.
471+
.ItFl-permission-audit
472+
Enable audit only for the permission model. When enabled, permission checks
473+
are performed but access is not denied. Instead, a warning is emitted for
474+
each permission violation via diagnostics channel.
475+
.
471476
.ItFl-preserve-symlinks
472477
Instructs the module loader to preserve symbolic links when resolving and caching modules other than the main module.
473478
.

‎lib/internal/process/pre_execution.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ function setupDiagnosticsChannel() {
634634
}
635635

636636
functioninitializePermission(){
637-
constpermission=getOptionValue('--permission');
637+
constpermission=getOptionValue('--permission')||getOptionValue('--permission-audit');
638638
if(permission){
639639
process.binding=functionbinding(_module){
640640
thrownewERR_ACCESS_DENIED('process.binding');

‎src/env.cc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,8 +900,11 @@ Environment::Environment(IsolateData* isolate_data,
900900
tracing::CastTracedValue(traced_value));
901901
}
902902

903-
if (options_->permission) {
903+
if (options_->permission || options_->permission_audit) {
904904
permission()->EnablePermissions();
905+
if (options_->permission_audit) {
906+
permission()->EnableWarningOnly();
907+
}
905908
// The process shouldn't be able to neither
906909
// spawn/worker nor use addons or enable inspector
907910
// unless explicitly allowed by the user

‎src/node_options.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,11 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
639639
&EnvironmentOptions::permission,
640640
kAllowedInEnvvar,
641641
false);
642+
AddOption("--permission-audit",
643+
"enable audit only for the permission system",
644+
&EnvironmentOptions::permission_audit,
645+
kAllowedInEnvvar,
646+
false);
642647
AddOption("--allow-fs-read",
643648
"allow permissions to read the filesystem",
644649
&EnvironmentOptions::allow_fs_read,

‎src/node_options.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ class EnvironmentOptions : public Options {
143143
std::string input_type; // Value of --input-type
144144
bool entry_is_url = false;
145145
bool permission = false;
146+
bool permission_audit = false;
146147
std::vector<std::string> allow_fs_read;
147148
std::vector<std::string> allow_fs_write;
148149
bool allow_addons = false;

‎src/permission/permission.cc‎

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include"env-inl.h"
44
#include"memory_tracker-inl.h"
55
#include"node.h"
6+
#include"node_diagnostics_channel.h"
67
#include"node_errors.h"
78
#include"node_external_reference.h"
89
#include"node_file.h"
@@ -27,6 +28,27 @@ namespace permission {
2728

2829
namespace {
2930

31+
constexpr std::string_view GetDiagnosticsChannelName(PermissionScope scope) {
32+
switch (scope) {
33+
case PermissionScope::kFileSystem:
34+
case PermissionScope::kFileSystemRead:
35+
case PermissionScope::kFileSystemWrite:
36+
return"node:permission-model:fs";
37+
case PermissionScope::kChildProcess:
38+
return"node:permission-model:child";
39+
case PermissionScope::kWorkerThreads:
40+
return"node:permission-model:worker";
41+
case PermissionScope::kInspector:
42+
return"node:permission-model:inspector";
43+
case PermissionScope::kWASI:
44+
return"node:permission-model:wasi";
45+
case PermissionScope::kAddon:
46+
return"node:permission-model:addon";
47+
default:
48+
return {};
49+
}
50+
}
51+
3052
// permission.has('fs.in', '/tmp/')
3153
// permission.has('fs.in')
3254
staticvoidHas(const FunctionCallbackInfo<Value>& args) {
@@ -70,7 +92,7 @@ PermissionScope Permission::StringToPermission(const std::string& perm) {
7092
}
7193
#undef V
7294

73-
Permission::Permission() : enabled_(false) {
95+
Permission::Permission() : enabled_(false), warning_only_(false) {
7496
std::shared_ptr<PermissionBase> fs = std::make_shared<FSPermission>();
7597
std::shared_ptr<PermissionBase> child_p =
7698
std::make_shared<ChildProcessPermission>();
@@ -170,6 +192,74 @@ void Permission::EnablePermissions() {
170192
}
171193
}
172194

195+
voidPermission::EnableWarningOnly() {
196+
if (!warning_only_) {
197+
warning_only_ = true;
198+
}
199+
}
200+
201+
boolPermission::is_scope_granted(Environment* env,
202+
const PermissionScope permission,
203+
const std::string_view& res) const {
204+
auto perm_node = nodes_.find(permission);
205+
bool result = false;
206+
if (perm_node != nodes_.end()) {
207+
result = perm_node->second->is_granted(env, permission, res);
208+
}
209+
210+
if (!result && !publishing_) {
211+
auto channel_name = GetDiagnosticsChannelName(permission);
212+
if (!channel_name.empty()) {
213+
auto ch = GetOrCreateChannel(env, permission);
214+
if (ch && ch->HasSubscribers()) {
215+
publishing_ = true;
216+
v8::Isolate* isolate = env->isolate();
217+
v8::HandleScope handle_scope(isolate);
218+
v8::Local<v8::Context> context = env->context();
219+
v8::Local<v8::Object> msg =
220+
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
221+
constchar* perm_str = PermissionToString(permission);
222+
msg->Set(context,
223+
FIXED_ONE_BYTE_STRING(isolate, "permission"),
224+
v8::String::NewFromUtf8(isolate, perm_str).ToLocalChecked())
225+
.Check();
226+
msg->Set(context,
227+
FIXED_ONE_BYTE_STRING(isolate, "resource"),
228+
v8::String::NewFromUtf8(isolate,
229+
res.data(),
230+
v8::NewStringType::kNormal,
231+
static_cast<int>(res.size()))
232+
.ToLocalChecked())
233+
.Check();
234+
ch->Publish(env, msg);
235+
publishing_ = false;
236+
}
237+
}
238+
}
239+
240+
return result;
241+
}
242+
243+
BaseObjectPtr<diagnostics_channel::Channel> Permission::GetOrCreateChannel(
244+
Environment* env, PermissionScope scope) const {
245+
auto it = channels_.find(scope);
246+
if (it != channels_.end()) {
247+
// Promote weak ref to strong for the duration of this call.
248+
BaseObjectPtr<diagnostics_channel::Channel> ptr(it->second.get());
249+
if (ptr) return ptr;
250+
channels_.erase(it);
251+
}
252+
auto channel_name = GetDiagnosticsChannelName(scope);
253+
diagnostics_channel::Channel* ch =
254+
diagnostics_channel::Channel::Get(env, channel_name.data());
255+
if (ch != nullptr) {
256+
channels_.emplace(scope,
257+
BaseObjectWeakPtr<diagnostics_channel::Channel>(ch));
258+
return BaseObjectPtr<diagnostics_channel::Channel>(ch);
259+
}
260+
return {};
261+
}
262+
173263
voidPermission::Apply(Environment* env,
174264
const std::vector<std::string>& allow,
175265
PermissionScope scope) {

‎src/permission/permission.h‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

66
#include"debug_utils.h"
7+
#include"node_diagnostics_channel.h"
78
#include"node_options.h"
89
#include"permission/addon_permission.h"
910
#include"permission/child_process_permission.h"
@@ -36,7 +37,7 @@ namespace permission {
3637
[[unlikely]] { \
3738
node::permission::Permission::ThrowAccessDenied( \
3839
env__, perm__, resource__); \
39-
return __VA_ARGS__; \
40+
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
4041
} \
4142
} while (0)
4243

@@ -50,7 +51,7 @@ namespace permission {
5051
[[unlikely]] { \
5152
node::permission::Permission::AsyncThrowAccessDenied( \
5253
env__, (wrap), perm__, resource__); \
53-
return __VA_ARGS__; \
54+
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
5455
} \
5556
} while (0)
5657

@@ -99,6 +100,8 @@ class Permission {
99100

100101
FORCE_INLINEboolenabled() const { return enabled_; }
101102

103+
FORCE_INLINEboolwarning_only() const { return warning_only_; }
104+
102105
static PermissionScope StringToPermission(const std::string& perm);
103106
staticconstchar* PermissionToString(PermissionScope perm);
104107
staticvoidThrowAccessDenied(Environment* env,
@@ -114,20 +117,25 @@ class Permission {
114117
const std::vector<std::string>& allow,
115118
PermissionScope scope);
116119
voidEnablePermissions();
120+
voidEnableWarningOnly();
117121

118122
private:
119123
COLD_NOINLINEboolis_scope_granted(Environment* env,
120124
const PermissionScope permission,
121-
const std::string_view& res = "") const {
122-
auto perm_node = nodes_.find(permission);
123-
if (perm_node != nodes_.end()) {
124-
return perm_node->second->is_granted(env, permission, res);
125-
}
126-
returnfalse;
127-
}
125+
const std::string_view& res = "") const;
126+
127+
BaseObjectPtr<diagnostics_channel::Channel> GetOrCreateChannel(
128+
Environment* env, PermissionScope scope) const;
128129

129130
std::unordered_map<PermissionScope, std::shared_ptr<PermissionBase>> nodes_;
130131
bool enabled_;
132+
bool warning_only_;
133+
mutablebool publishing_ = false;
134+
// Weak refs: BindingData (via BaseObjectPtr) is the sole owner of Channels.
135+
// Using weak refs here avoids keeping Channels alive past Realm teardown.
136+
mutable std::unordered_map<PermissionScope,
137+
BaseObjectWeakPtr<diagnostics_channel::Channel>>
138+
channels_;
131139
};
132140

133141
} // namespace permission
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Flags: --permission --allow-fs-read=*
2+
'use strict';
3+
4+
constcommon=require('../common');
5+
const{ isMainThread }=require('worker_threads');
6+
7+
if(!isMainThread){
8+
common.skip('This test only works on a main thread');
9+
}
10+
11+
constassert=require('node:assert');
12+
constdc=require('node:diagnostics_channel');
13+
constfs=require('node:fs');
14+
15+
constmessages=[];
16+
dc.subscribe('node:permission-model:fs',(msg)=>{
17+
messages.push(msg);
18+
});
19+
20+
// Granted permission should not publish
21+
fs.readFileSync(__filename);
22+
assert.strictEqual(messages.length,0);
23+
24+
// Denied permission should publish
25+
consthasWrite=process.permission.has('fs.write','/tmp/test');
26+
assert.strictEqual(hasWrite,false);
27+
28+
assert.ok(messages.length>0,'Expected at least one denied message');
29+
assert.strictEqual(messages[0].permission,'FileSystemWrite');

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit cd1eb3e

Browse files
RafaelGSSaduh95
authored andcommitted
src,permission: add --permission-audit
Add --permission-audit flag that enables the permission model in warning-only mode. Instead of throwing ERR_ACCESS_DENIED, it emits a message via diagnostics channel and allows the operation to continue. Publish permission check results to per-scope diagnostics channels (e.g., node:permission-model:fs) so users can observe permission decisions at runtime via diagnostics_channel. Refs: #59935 PR-URL: #61869 Backport-PR-URL: #65354 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 82a0233 commit cd1eb3e

9 files changed

Lines changed: 164 additions & 12 deletions

File tree

‎doc/api/cli.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2137,6 +2137,16 @@ following permissions are restricted:
21372137
* WASI - manageable through [`--allow-wasi`][] flag
21382138
* Addons - manageable through [`--allow-addons`][] flag
21392139

2140+
### `--permission-audit`
2141+
2142+
<!-- YAML
2143+
added: REPLACEME
2144+
-->
2145+
2146+
Enable audit only for the permission model. When enabled, permission checks
2147+
are performed but access is not denied. Instead, a warning is emitted for
2148+
each permission violation via diagnostics channel.
2149+
21402150
### `--preserve-symlinks`
21412151

21422152
<!-- YAML
@@ -3661,6 +3671,7 @@ one is included in the list below.
36613671
*`--openssl-legacy-provider`
36623672
*`--openssl-shared-config`
36633673
*`--pending-deprecation`
3674+
*`--permission-audit`
36643675
*`--permission`
36653676
*`--preserve-symlinks-main`
36663677
*`--preserve-symlinks`

‎doc/node.1‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,11 @@ Among other uses, this can be used to enable FIPS-compliant crypto if Node.js is
468468
.ItFl-pending-deprecation
469469
Emit pending deprecation warnings.
470470
.
471+
.ItFl-permission-audit
472+
Enable audit only for the permission model. When enabled, permission checks
473+
are performed but access is not denied. Instead, a warning is emitted for
474+
each permission violation via diagnostics channel.
475+
.
471476
.ItFl-preserve-symlinks
472477
Instructs the module loader to preserve symbolic links when resolving and caching modules other than the main module.
473478
.

‎lib/internal/process/pre_execution.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ function setupDiagnosticsChannel() {
634634
}
635635

636636
functioninitializePermission(){
637-
constpermission=getOptionValue('--permission');
637+
constpermission=getOptionValue('--permission')||getOptionValue('--permission-audit');
638638
if(permission){
639639
process.binding=functionbinding(_module){
640640
thrownewERR_ACCESS_DENIED('process.binding');

‎src/env.cc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,8 +900,11 @@ Environment::Environment(IsolateData* isolate_data,
900900
tracing::CastTracedValue(traced_value));
901901
}
902902

903-
if (options_->permission) {
903+
if (options_->permission || options_->permission_audit) {
904904
permission()->EnablePermissions();
905+
if (options_->permission_audit) {
906+
permission()->EnableWarningOnly();
907+
}
905908
// The process shouldn't be able to neither
906909
// spawn/worker nor use addons or enable inspector
907910
// unless explicitly allowed by the user

‎src/node_options.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,11 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
639639
&EnvironmentOptions::permission,
640640
kAllowedInEnvvar,
641641
false);
642+
AddOption("--permission-audit",
643+
"enable audit only for the permission system",
644+
&EnvironmentOptions::permission_audit,
645+
kAllowedInEnvvar,
646+
false);
642647
AddOption("--allow-fs-read",
643648
"allow permissions to read the filesystem",
644649
&EnvironmentOptions::allow_fs_read,

‎src/node_options.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ class EnvironmentOptions : public Options {
143143
std::string input_type; // Value of --input-type
144144
bool entry_is_url = false;
145145
bool permission = false;
146+
bool permission_audit = false;
146147
std::vector<std::string> allow_fs_read;
147148
std::vector<std::string> allow_fs_write;
148149
bool allow_addons = false;

‎src/permission/permission.cc‎

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include"env-inl.h"
44
#include"memory_tracker-inl.h"
55
#include"node.h"
6+
#include"node_diagnostics_channel.h"
67
#include"node_errors.h"
78
#include"node_external_reference.h"
89
#include"node_file.h"
@@ -27,6 +28,27 @@ namespace permission {
2728

2829
namespace {
2930

31+
constexpr std::string_view GetDiagnosticsChannelName(PermissionScope scope) {
32+
switch (scope) {
33+
case PermissionScope::kFileSystem:
34+
case PermissionScope::kFileSystemRead:
35+
case PermissionScope::kFileSystemWrite:
36+
return"node:permission-model:fs";
37+
case PermissionScope::kChildProcess:
38+
return"node:permission-model:child";
39+
case PermissionScope::kWorkerThreads:
40+
return"node:permission-model:worker";
41+
case PermissionScope::kInspector:
42+
return"node:permission-model:inspector";
43+
case PermissionScope::kWASI:
44+
return"node:permission-model:wasi";
45+
case PermissionScope::kAddon:
46+
return"node:permission-model:addon";
47+
default:
48+
return {};
49+
}
50+
}
51+
3052
// permission.has('fs.in', '/tmp/')
3153
// permission.has('fs.in')
3254
staticvoidHas(const FunctionCallbackInfo<Value>& args) {
@@ -70,7 +92,7 @@ PermissionScope Permission::StringToPermission(const std::string& perm) {
7092
}
7193
#undef V
7294

73-
Permission::Permission() : enabled_(false) {
95+
Permission::Permission() : enabled_(false), warning_only_(false) {
7496
std::shared_ptr<PermissionBase> fs = std::make_shared<FSPermission>();
7597
std::shared_ptr<PermissionBase> child_p =
7698
std::make_shared<ChildProcessPermission>();
@@ -170,6 +192,74 @@ void Permission::EnablePermissions() {
170192
}
171193
}
172194

195+
voidPermission::EnableWarningOnly() {
196+
if (!warning_only_) {
197+
warning_only_ = true;
198+
}
199+
}
200+
201+
boolPermission::is_scope_granted(Environment* env,
202+
const PermissionScope permission,
203+
const std::string_view& res) const {
204+
auto perm_node = nodes_.find(permission);
205+
bool result = false;
206+
if (perm_node != nodes_.end()) {
207+
result = perm_node->second->is_granted(env, permission, res);
208+
}
209+
210+
if (!result && !publishing_) {
211+
auto channel_name = GetDiagnosticsChannelName(permission);
212+
if (!channel_name.empty()) {
213+
auto ch = GetOrCreateChannel(env, permission);
214+
if (ch && ch->HasSubscribers()) {
215+
publishing_ = true;
216+
v8::Isolate* isolate = env->isolate();
217+
v8::HandleScope handle_scope(isolate);
218+
v8::Local<v8::Context> context = env->context();
219+
v8::Local<v8::Object> msg =
220+
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
221+
constchar* perm_str = PermissionToString(permission);
222+
msg->Set(context,
223+
FIXED_ONE_BYTE_STRING(isolate, "permission"),
224+
v8::String::NewFromUtf8(isolate, perm_str).ToLocalChecked())
225+
.Check();
226+
msg->Set(context,
227+
FIXED_ONE_BYTE_STRING(isolate, "resource"),
228+
v8::String::NewFromUtf8(isolate,
229+
res.data(),
230+
v8::NewStringType::kNormal,
231+
static_cast<int>(res.size()))
232+
.ToLocalChecked())
233+
.Check();
234+
ch->Publish(env, msg);
235+
publishing_ = false;
236+
}
237+
}
238+
}
239+
240+
return result;
241+
}
242+
243+
BaseObjectPtr<diagnostics_channel::Channel> Permission::GetOrCreateChannel(
244+
Environment* env, PermissionScope scope) const {
245+
auto it = channels_.find(scope);
246+
if (it != channels_.end()) {
247+
// Promote weak ref to strong for the duration of this call.
248+
BaseObjectPtr<diagnostics_channel::Channel> ptr(it->second.get());
249+
if (ptr) return ptr;
250+
channels_.erase(it);
251+
}
252+
auto channel_name = GetDiagnosticsChannelName(scope);
253+
diagnostics_channel::Channel* ch =
254+
diagnostics_channel::Channel::Get(env, channel_name.data());
255+
if (ch != nullptr) {
256+
channels_.emplace(scope,
257+
BaseObjectWeakPtr<diagnostics_channel::Channel>(ch));
258+
return BaseObjectPtr<diagnostics_channel::Channel>(ch);
259+
}
260+
return {};
261+
}
262+
173263
voidPermission::Apply(Environment* env,
174264
const std::vector<std::string>& allow,
175265
PermissionScope scope) {

‎src/permission/permission.h‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

66
#include"debug_utils.h"
7+
#include"node_diagnostics_channel.h"
78
#include"node_options.h"
89
#include"permission/addon_permission.h"
910
#include"permission/child_process_permission.h"
@@ -36,7 +37,7 @@ namespace permission {
3637
[[unlikely]] { \
3738
node::permission::Permission::ThrowAccessDenied( \
3839
env__, perm__, resource__); \
39-
return __VA_ARGS__; \
40+
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
4041
} \
4142
} while (0)
4243

@@ -50,7 +51,7 @@ namespace permission {
5051
[[unlikely]] { \
5152
node::permission::Permission::AsyncThrowAccessDenied( \
5253
env__, (wrap), perm__, resource__); \
53-
return __VA_ARGS__; \
54+
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
5455
} \
5556
} while (0)
5657

@@ -99,6 +100,8 @@ class Permission {
99100

100101
FORCE_INLINEboolenabled() const { return enabled_; }
101102

103+
FORCE_INLINEboolwarning_only() const { return warning_only_; }
104+
102105
static PermissionScope StringToPermission(const std::string& perm);
103106
staticconstchar* PermissionToString(PermissionScope perm);
104107
staticvoidThrowAccessDenied(Environment* env,
@@ -114,20 +117,25 @@ class Permission {
114117
const std::vector<std::string>& allow,
115118
PermissionScope scope);
116119
voidEnablePermissions();
120+
voidEnableWarningOnly();
117121

118122
private:
119123
COLD_NOINLINEboolis_scope_granted(Environment* env,
120124
const PermissionScope permission,
121-
const std::string_view& res = "") const {
122-
auto perm_node = nodes_.find(permission);
123-
if (perm_node != nodes_.end()) {
124-
return perm_node->second->is_granted(env, permission, res);
125-
}
126-
returnfalse;
127-
}
125+
const std::string_view& res = "") const;
126+
127+
BaseObjectPtr<diagnostics_channel::Channel> GetOrCreateChannel(
128+
Environment* env, PermissionScope scope) const;
128129

129130
std::unordered_map<PermissionScope, std::shared_ptr<PermissionBase>> nodes_;
130131
bool enabled_;
132+
bool warning_only_;
133+
mutablebool publishing_ = false;
134+
// Weak refs: BindingData (via BaseObjectPtr) is the sole owner of Channels.
135+
// Using weak refs here avoids keeping Channels alive past Realm teardown.
136+
mutable std::unordered_map<PermissionScope,
137+
BaseObjectWeakPtr<diagnostics_channel::Channel>>
138+
channels_;
131139
};
132140

133141
} // namespace permission
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Flags: --permission --allow-fs-read=*
2+
'use strict';
3+
4+
constcommon=require('../common');
5+
const{ isMainThread }=require('worker_threads');
6+
7+
if(!isMainThread){
8+
common.skip('This test only works on a main thread');
9+
}
10+
11+
constassert=require('node:assert');
12+
constdc=require('node:diagnostics_channel');
13+
constfs=require('node:fs');
14+
15+
constmessages=[];
16+
dc.subscribe('node:permission-model:fs',(msg)=>{
17+
messages.push(msg);
18+
});
19+
20+
// Granted permission should not publish
21+
fs.readFileSync(__filename);
22+
assert.strictEqual(messages.length,0);
23+
24+
// Denied permission should publish
25+
consthasWrite=process.permission.has('fs.write','/tmp/test');
26+
assert.strictEqual(hasWrite,false);
27+
28+
assert.ok(messages.length>0,'Expected at least one denied message');
29+
assert.strictEqual(messages[0].permission,'FileSystemWrite');

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit cd1eb3e

Browse files
RafaelGSSaduh95
authored andcommitted
src,permission: add --permission-audit
Add --permission-audit flag that enables the permission model in warning-only mode. Instead of throwing ERR_ACCESS_DENIED, it emits a message via diagnostics channel and allows the operation to continue. Publish permission check results to per-scope diagnostics channels (e.g., node:permission-model:fs) so users can observe permission decisions at runtime via diagnostics_channel. Refs: #59935 PR-URL: #61869 Backport-PR-URL: #65354 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 82a0233 commit cd1eb3e

9 files changed

Lines changed: 164 additions & 12 deletions

File tree

‎doc/api/cli.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2137,6 +2137,16 @@ following permissions are restricted:
21372137
* WASI - manageable through [`--allow-wasi`][] flag
21382138
* Addons - manageable through [`--allow-addons`][] flag
21392139

2140+
### `--permission-audit`
2141+
2142+
<!-- YAML
2143+
added: REPLACEME
2144+
-->
2145+
2146+
Enable audit only for the permission model. When enabled, permission checks
2147+
are performed but access is not denied. Instead, a warning is emitted for
2148+
each permission violation via diagnostics channel.
2149+
21402150
### `--preserve-symlinks`
21412151

21422152
<!-- YAML
@@ -3661,6 +3671,7 @@ one is included in the list below.
36613671
*`--openssl-legacy-provider`
36623672
*`--openssl-shared-config`
36633673
*`--pending-deprecation`
3674+
*`--permission-audit`
36643675
*`--permission`
36653676
*`--preserve-symlinks-main`
36663677
*`--preserve-symlinks`

‎doc/node.1‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,11 @@ Among other uses, this can be used to enable FIPS-compliant crypto if Node.js is
468468
.ItFl-pending-deprecation
469469
Emit pending deprecation warnings.
470470
.
471+
.ItFl-permission-audit
472+
Enable audit only for the permission model. When enabled, permission checks
473+
are performed but access is not denied. Instead, a warning is emitted for
474+
each permission violation via diagnostics channel.
475+
.
471476
.ItFl-preserve-symlinks
472477
Instructs the module loader to preserve symbolic links when resolving and caching modules other than the main module.
473478
.

‎lib/internal/process/pre_execution.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ function setupDiagnosticsChannel() {
634634
}
635635

636636
functioninitializePermission(){
637-
constpermission=getOptionValue('--permission');
637+
constpermission=getOptionValue('--permission')||getOptionValue('--permission-audit');
638638
if(permission){
639639
process.binding=functionbinding(_module){
640640
thrownewERR_ACCESS_DENIED('process.binding');

‎src/env.cc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,8 +900,11 @@ Environment::Environment(IsolateData* isolate_data,
900900
tracing::CastTracedValue(traced_value));
901901
}
902902

903-
if (options_->permission) {
903+
if (options_->permission || options_->permission_audit) {
904904
permission()->EnablePermissions();
905+
if (options_->permission_audit) {
906+
permission()->EnableWarningOnly();
907+
}
905908
// The process shouldn't be able to neither
906909
// spawn/worker nor use addons or enable inspector
907910
// unless explicitly allowed by the user

‎src/node_options.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,11 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
639639
&EnvironmentOptions::permission,
640640
kAllowedInEnvvar,
641641
false);
642+
AddOption("--permission-audit",
643+
"enable audit only for the permission system",
644+
&EnvironmentOptions::permission_audit,
645+
kAllowedInEnvvar,
646+
false);
642647
AddOption("--allow-fs-read",
643648
"allow permissions to read the filesystem",
644649
&EnvironmentOptions::allow_fs_read,

‎src/node_options.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ class EnvironmentOptions : public Options {
143143
std::string input_type; // Value of --input-type
144144
bool entry_is_url = false;
145145
bool permission = false;
146+
bool permission_audit = false;
146147
std::vector<std::string> allow_fs_read;
147148
std::vector<std::string> allow_fs_write;
148149
bool allow_addons = false;

‎src/permission/permission.cc‎

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include"env-inl.h"
44
#include"memory_tracker-inl.h"
55
#include"node.h"
6+
#include"node_diagnostics_channel.h"
67
#include"node_errors.h"
78
#include"node_external_reference.h"
89
#include"node_file.h"
@@ -27,6 +28,27 @@ namespace permission {
2728

2829
namespace {
2930

31+
constexpr std::string_view GetDiagnosticsChannelName(PermissionScope scope) {
32+
switch (scope) {
33+
case PermissionScope::kFileSystem:
34+
case PermissionScope::kFileSystemRead:
35+
case PermissionScope::kFileSystemWrite:
36+
return"node:permission-model:fs";
37+
case PermissionScope::kChildProcess:
38+
return"node:permission-model:child";
39+
case PermissionScope::kWorkerThreads:
40+
return"node:permission-model:worker";
41+
case PermissionScope::kInspector:
42+
return"node:permission-model:inspector";
43+
case PermissionScope::kWASI:
44+
return"node:permission-model:wasi";
45+
case PermissionScope::kAddon:
46+
return"node:permission-model:addon";
47+
default:
48+
return {};
49+
}
50+
}
51+
3052
// permission.has('fs.in', '/tmp/')
3153
// permission.has('fs.in')
3254
staticvoidHas(const FunctionCallbackInfo<Value>& args) {
@@ -70,7 +92,7 @@ PermissionScope Permission::StringToPermission(const std::string& perm) {
7092
}
7193
#undef V
7294

73-
Permission::Permission() : enabled_(false) {
95+
Permission::Permission() : enabled_(false), warning_only_(false) {
7496
std::shared_ptr<PermissionBase> fs = std::make_shared<FSPermission>();
7597
std::shared_ptr<PermissionBase> child_p =
7698
std::make_shared<ChildProcessPermission>();
@@ -170,6 +192,74 @@ void Permission::EnablePermissions() {
170192
}
171193
}
172194

195+
voidPermission::EnableWarningOnly() {
196+
if (!warning_only_) {
197+
warning_only_ = true;
198+
}
199+
}
200+
201+
boolPermission::is_scope_granted(Environment* env,
202+
const PermissionScope permission,
203+
const std::string_view& res) const {
204+
auto perm_node = nodes_.find(permission);
205+
bool result = false;
206+
if (perm_node != nodes_.end()) {
207+
result = perm_node->second->is_granted(env, permission, res);
208+
}
209+
210+
if (!result && !publishing_) {
211+
auto channel_name = GetDiagnosticsChannelName(permission);
212+
if (!channel_name.empty()) {
213+
auto ch = GetOrCreateChannel(env, permission);
214+
if (ch && ch->HasSubscribers()) {
215+
publishing_ = true;
216+
v8::Isolate* isolate = env->isolate();
217+
v8::HandleScope handle_scope(isolate);
218+
v8::Local<v8::Context> context = env->context();
219+
v8::Local<v8::Object> msg =
220+
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
221+
constchar* perm_str = PermissionToString(permission);
222+
msg->Set(context,
223+
FIXED_ONE_BYTE_STRING(isolate, "permission"),
224+
v8::String::NewFromUtf8(isolate, perm_str).ToLocalChecked())
225+
.Check();
226+
msg->Set(context,
227+
FIXED_ONE_BYTE_STRING(isolate, "resource"),
228+
v8::String::NewFromUtf8(isolate,
229+
res.data(),
230+
v8::NewStringType::kNormal,
231+
static_cast<int>(res.size()))
232+
.ToLocalChecked())
233+
.Check();
234+
ch->Publish(env, msg);
235+
publishing_ = false;
236+
}
237+
}
238+
}
239+
240+
return result;
241+
}
242+
243+
BaseObjectPtr<diagnostics_channel::Channel> Permission::GetOrCreateChannel(
244+
Environment* env, PermissionScope scope) const {
245+
auto it = channels_.find(scope);
246+
if (it != channels_.end()) {
247+
// Promote weak ref to strong for the duration of this call.
248+
BaseObjectPtr<diagnostics_channel::Channel> ptr(it->second.get());
249+
if (ptr) return ptr;
250+
channels_.erase(it);
251+
}
252+
auto channel_name = GetDiagnosticsChannelName(scope);
253+
diagnostics_channel::Channel* ch =
254+
diagnostics_channel::Channel::Get(env, channel_name.data());
255+
if (ch != nullptr) {
256+
channels_.emplace(scope,
257+
BaseObjectWeakPtr<diagnostics_channel::Channel>(ch));
258+
return BaseObjectPtr<diagnostics_channel::Channel>(ch);
259+
}
260+
return {};
261+
}
262+
173263
voidPermission::Apply(Environment* env,
174264
const std::vector<std::string>& allow,
175265
PermissionScope scope) {

‎src/permission/permission.h‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

66
#include"debug_utils.h"
7+
#include"node_diagnostics_channel.h"
78
#include"node_options.h"
89
#include"permission/addon_permission.h"
910
#include"permission/child_process_permission.h"
@@ -36,7 +37,7 @@ namespace permission {
3637
[[unlikely]] { \
3738
node::permission::Permission::ThrowAccessDenied( \
3839
env__, perm__, resource__); \
39-
return __VA_ARGS__; \
40+
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
4041
} \
4142
} while (0)
4243

@@ -50,7 +51,7 @@ namespace permission {
5051
[[unlikely]] { \
5152
node::permission::Permission::AsyncThrowAccessDenied( \
5253
env__, (wrap), perm__, resource__); \
53-
return __VA_ARGS__; \
54+
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
5455
} \
5556
} while (0)
5657

@@ -99,6 +100,8 @@ class Permission {
99100

100101
FORCE_INLINEboolenabled() const { return enabled_; }
101102

103+
FORCE_INLINEboolwarning_only() const { return warning_only_; }
104+
102105
static PermissionScope StringToPermission(const std::string& perm);
103106
staticconstchar* PermissionToString(PermissionScope perm);
104107
staticvoidThrowAccessDenied(Environment* env,
@@ -114,20 +117,25 @@ class Permission {
114117
const std::vector<std::string>& allow,
115118
PermissionScope scope);
116119
voidEnablePermissions();
120+
voidEnableWarningOnly();
117121

118122
private:
119123
COLD_NOINLINEboolis_scope_granted(Environment* env,
120124
const PermissionScope permission,
121-
const std::string_view& res = "") const {
122-
auto perm_node = nodes_.find(permission);
123-
if (perm_node != nodes_.end()) {
124-
return perm_node->second->is_granted(env, permission, res);
125-
}
126-
returnfalse;
127-
}
125+
const std::string_view& res = "") const;
126+
127+
BaseObjectPtr<diagnostics_channel::Channel> GetOrCreateChannel(
128+
Environment* env, PermissionScope scope) const;
128129

129130
std::unordered_map<PermissionScope, std::shared_ptr<PermissionBase>> nodes_;
130131
bool enabled_;
132+
bool warning_only_;
133+
mutablebool publishing_ = false;
134+
// Weak refs: BindingData (via BaseObjectPtr) is the sole owner of Channels.
135+
// Using weak refs here avoids keeping Channels alive past Realm teardown.
136+
mutable std::unordered_map<PermissionScope,
137+
BaseObjectWeakPtr<diagnostics_channel::Channel>>
138+
channels_;
131139
};
132140

133141
} // namespace permission
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Flags: --permission --allow-fs-read=*
2+
'use strict';
3+
4+
constcommon=require('../common');
5+
const{ isMainThread }=require('worker_threads');
6+
7+
if(!isMainThread){
8+
common.skip('This test only works on a main thread');
9+
}
10+
11+
constassert=require('node:assert');
12+
constdc=require('node:diagnostics_channel');
13+
constfs=require('node:fs');
14+
15+
constmessages=[];
16+
dc.subscribe('node:permission-model:fs',(msg)=>{
17+
messages.push(msg);
18+
});
19+
20+
// Granted permission should not publish
21+
fs.readFileSync(__filename);
22+
assert.strictEqual(messages.length,0);
23+
24+
// Denied permission should publish
25+
consthasWrite=process.permission.has('fs.write','/tmp/test');
26+
assert.strictEqual(hasWrite,false);
27+
28+
assert.ok(messages.length>0,'Expected at least one denied message');
29+
assert.strictEqual(messages[0].permission,'FileSystemWrite');

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit cd1eb3e

Browse files
RafaelGSSaduh95
authored andcommitted
src,permission: add --permission-audit
Add --permission-audit flag that enables the permission model in warning-only mode. Instead of throwing ERR_ACCESS_DENIED, it emits a message via diagnostics channel and allows the operation to continue. Publish permission check results to per-scope diagnostics channels (e.g., node:permission-model:fs) so users can observe permission decisions at runtime via diagnostics_channel. Refs: #59935 PR-URL: #61869 Backport-PR-URL: #65354 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 82a0233 commit cd1eb3e

9 files changed

Lines changed: 164 additions & 12 deletions

File tree

‎doc/api/cli.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2137,6 +2137,16 @@ following permissions are restricted:
21372137
* WASI - manageable through [`--allow-wasi`][] flag
21382138
* Addons - manageable through [`--allow-addons`][] flag
21392139

2140+
### `--permission-audit`
2141+
2142+
<!-- YAML
2143+
added: REPLACEME
2144+
-->
2145+
2146+
Enable audit only for the permission model. When enabled, permission checks
2147+
are performed but access is not denied. Instead, a warning is emitted for
2148+
each permission violation via diagnostics channel.
2149+
21402150
### `--preserve-symlinks`
21412151

21422152
<!-- YAML
@@ -3661,6 +3671,7 @@ one is included in the list below.
36613671
*`--openssl-legacy-provider`
36623672
*`--openssl-shared-config`
36633673
*`--pending-deprecation`
3674+
*`--permission-audit`
36643675
*`--permission`
36653676
*`--preserve-symlinks-main`
36663677
*`--preserve-symlinks`

‎doc/node.1‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,11 @@ Among other uses, this can be used to enable FIPS-compliant crypto if Node.js is
468468
.ItFl-pending-deprecation
469469
Emit pending deprecation warnings.
470470
.
471+
.ItFl-permission-audit
472+
Enable audit only for the permission model. When enabled, permission checks
473+
are performed but access is not denied. Instead, a warning is emitted for
474+
each permission violation via diagnostics channel.
475+
.
471476
.ItFl-preserve-symlinks
472477
Instructs the module loader to preserve symbolic links when resolving and caching modules other than the main module.
473478
.

‎lib/internal/process/pre_execution.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ function setupDiagnosticsChannel() {
634634
}
635635

636636
functioninitializePermission(){
637-
constpermission=getOptionValue('--permission');
637+
constpermission=getOptionValue('--permission')||getOptionValue('--permission-audit');
638638
if(permission){
639639
process.binding=functionbinding(_module){
640640
thrownewERR_ACCESS_DENIED('process.binding');

‎src/env.cc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,8 +900,11 @@ Environment::Environment(IsolateData* isolate_data,
900900
tracing::CastTracedValue(traced_value));
901901
}
902902

903-
if (options_->permission) {
903+
if (options_->permission || options_->permission_audit) {
904904
permission()->EnablePermissions();
905+
if (options_->permission_audit) {
906+
permission()->EnableWarningOnly();
907+
}
905908
// The process shouldn't be able to neither
906909
// spawn/worker nor use addons or enable inspector
907910
// unless explicitly allowed by the user

‎src/node_options.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,11 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
639639
&EnvironmentOptions::permission,
640640
kAllowedInEnvvar,
641641
false);
642+
AddOption("--permission-audit",
643+
"enable audit only for the permission system",
644+
&EnvironmentOptions::permission_audit,
645+
kAllowedInEnvvar,
646+
false);
642647
AddOption("--allow-fs-read",
643648
"allow permissions to read the filesystem",
644649
&EnvironmentOptions::allow_fs_read,

‎src/node_options.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ class EnvironmentOptions : public Options {
143143
std::string input_type; // Value of --input-type
144144
bool entry_is_url = false;
145145
bool permission = false;
146+
bool permission_audit = false;
146147
std::vector<std::string> allow_fs_read;
147148
std::vector<std::string> allow_fs_write;
148149
bool allow_addons = false;

‎src/permission/permission.cc‎

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include"env-inl.h"
44
#include"memory_tracker-inl.h"
55
#include"node.h"
6+
#include"node_diagnostics_channel.h"
67
#include"node_errors.h"
78
#include"node_external_reference.h"
89
#include"node_file.h"
@@ -27,6 +28,27 @@ namespace permission {
2728

2829
namespace {
2930

31+
constexpr std::string_view GetDiagnosticsChannelName(PermissionScope scope) {
32+
switch (scope) {
33+
case PermissionScope::kFileSystem:
34+
case PermissionScope::kFileSystemRead:
35+
case PermissionScope::kFileSystemWrite:
36+
return"node:permission-model:fs";
37+
case PermissionScope::kChildProcess:
38+
return"node:permission-model:child";
39+
case PermissionScope::kWorkerThreads:
40+
return"node:permission-model:worker";
41+
case PermissionScope::kInspector:
42+
return"node:permission-model:inspector";
43+
case PermissionScope::kWASI:
44+
return"node:permission-model:wasi";
45+
case PermissionScope::kAddon:
46+
return"node:permission-model:addon";
47+
default:
48+
return {};
49+
}
50+
}
51+
3052
// permission.has('fs.in', '/tmp/')
3153
// permission.has('fs.in')
3254
staticvoidHas(const FunctionCallbackInfo<Value>& args) {
@@ -70,7 +92,7 @@ PermissionScope Permission::StringToPermission(const std::string& perm) {
7092
}
7193
#undef V
7294

73-
Permission::Permission() : enabled_(false) {
95+
Permission::Permission() : enabled_(false), warning_only_(false) {
7496
std::shared_ptr<PermissionBase> fs = std::make_shared<FSPermission>();
7597
std::shared_ptr<PermissionBase> child_p =
7698
std::make_shared<ChildProcessPermission>();
@@ -170,6 +192,74 @@ void Permission::EnablePermissions() {
170192
}
171193
}
172194

195+
voidPermission::EnableWarningOnly() {
196+
if (!warning_only_) {
197+
warning_only_ = true;
198+
}
199+
}
200+
201+
boolPermission::is_scope_granted(Environment* env,
202+
const PermissionScope permission,
203+
const std::string_view& res) const {
204+
auto perm_node = nodes_.find(permission);
205+
bool result = false;
206+
if (perm_node != nodes_.end()) {
207+
result = perm_node->second->is_granted(env, permission, res);
208+
}
209+
210+
if (!result && !publishing_) {
211+
auto channel_name = GetDiagnosticsChannelName(permission);
212+
if (!channel_name.empty()) {
213+
auto ch = GetOrCreateChannel(env, permission);
214+
if (ch && ch->HasSubscribers()) {
215+
publishing_ = true;
216+
v8::Isolate* isolate = env->isolate();
217+
v8::HandleScope handle_scope(isolate);
218+
v8::Local<v8::Context> context = env->context();
219+
v8::Local<v8::Object> msg =
220+
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
221+
constchar* perm_str = PermissionToString(permission);
222+
msg->Set(context,
223+
FIXED_ONE_BYTE_STRING(isolate, "permission"),
224+
v8::String::NewFromUtf8(isolate, perm_str).ToLocalChecked())
225+
.Check();
226+
msg->Set(context,
227+
FIXED_ONE_BYTE_STRING(isolate, "resource"),
228+
v8::String::NewFromUtf8(isolate,
229+
res.data(),
230+
v8::NewStringType::kNormal,
231+
static_cast<int>(res.size()))
232+
.ToLocalChecked())
233+
.Check();
234+
ch->Publish(env, msg);
235+
publishing_ = false;
236+
}
237+
}
238+
}
239+
240+
return result;
241+
}
242+
243+
BaseObjectPtr<diagnostics_channel::Channel> Permission::GetOrCreateChannel(
244+
Environment* env, PermissionScope scope) const {
245+
auto it = channels_.find(scope);
246+
if (it != channels_.end()) {
247+
// Promote weak ref to strong for the duration of this call.
248+
BaseObjectPtr<diagnostics_channel::Channel> ptr(it->second.get());
249+
if (ptr) return ptr;
250+
channels_.erase(it);
251+
}
252+
auto channel_name = GetDiagnosticsChannelName(scope);
253+
diagnostics_channel::Channel* ch =
254+
diagnostics_channel::Channel::Get(env, channel_name.data());
255+
if (ch != nullptr) {
256+
channels_.emplace(scope,
257+
BaseObjectWeakPtr<diagnostics_channel::Channel>(ch));
258+
return BaseObjectPtr<diagnostics_channel::Channel>(ch);
259+
}
260+
return {};
261+
}
262+
173263
voidPermission::Apply(Environment* env,
174264
const std::vector<std::string>& allow,
175265
PermissionScope scope) {

‎src/permission/permission.h‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

66
#include"debug_utils.h"
7+
#include"node_diagnostics_channel.h"
78
#include"node_options.h"
89
#include"permission/addon_permission.h"
910
#include"permission/child_process_permission.h"
@@ -36,7 +37,7 @@ namespace permission {
3637
[[unlikely]] { \
3738
node::permission::Permission::ThrowAccessDenied( \
3839
env__, perm__, resource__); \
39-
return __VA_ARGS__; \
40+
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
4041
} \
4142
} while (0)
4243

@@ -50,7 +51,7 @@ namespace permission {
5051
[[unlikely]] { \
5152
node::permission::Permission::AsyncThrowAccessDenied( \
5253
env__, (wrap), perm__, resource__); \
53-
return __VA_ARGS__; \
54+
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
5455
} \
5556
} while (0)
5657

@@ -99,6 +100,8 @@ class Permission {
99100

100101
FORCE_INLINEboolenabled() const { return enabled_; }
101102

103+
FORCE_INLINEboolwarning_only() const { return warning_only_; }
104+
102105
static PermissionScope StringToPermission(const std::string& perm);
103106
staticconstchar* PermissionToString(PermissionScope perm);
104107
staticvoidThrowAccessDenied(Environment* env,
@@ -114,20 +117,25 @@ class Permission {
114117
const std::vector<std::string>& allow,
115118
PermissionScope scope);
116119
voidEnablePermissions();
120+
voidEnableWarningOnly();
117121

118122
private:
119123
COLD_NOINLINEboolis_scope_granted(Environment* env,
120124
const PermissionScope permission,
121-
const std::string_view& res = "") const {
122-
auto perm_node = nodes_.find(permission);
123-
if (perm_node != nodes_.end()) {
124-
return perm_node->second->is_granted(env, permission, res);
125-
}
126-
returnfalse;
127-
}
125+
const std::string_view& res = "") const;
126+
127+
BaseObjectPtr<diagnostics_channel::Channel> GetOrCreateChannel(
128+
Environment* env, PermissionScope scope) const;
128129

129130
std::unordered_map<PermissionScope, std::shared_ptr<PermissionBase>> nodes_;
130131
bool enabled_;
132+
bool warning_only_;
133+
mutablebool publishing_ = false;
134+
// Weak refs: BindingData (via BaseObjectPtr) is the sole owner of Channels.
135+
// Using weak refs here avoids keeping Channels alive past Realm teardown.
136+
mutable std::unordered_map<PermissionScope,
137+
BaseObjectWeakPtr<diagnostics_channel::Channel>>
138+
channels_;
131139
};
132140

133141
} // namespace permission
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Flags: --permission --allow-fs-read=*
2+
'use strict';
3+
4+
constcommon=require('../common');
5+
const{ isMainThread }=require('worker_threads');
6+
7+
if(!isMainThread){
8+
common.skip('This test only works on a main thread');
9+
}
10+
11+
constassert=require('node:assert');
12+
constdc=require('node:diagnostics_channel');
13+
constfs=require('node:fs');
14+
15+
constmessages=[];
16+
dc.subscribe('node:permission-model:fs',(msg)=>{
17+
messages.push(msg);
18+
});
19+
20+
// Granted permission should not publish
21+
fs.readFileSync(__filename);
22+
assert.strictEqual(messages.length,0);
23+
24+
// Denied permission should publish
25+
consthasWrite=process.permission.has('fs.write','/tmp/test');
26+
assert.strictEqual(hasWrite,false);
27+
28+
assert.ok(messages.length>0,'Expected at least one denied message');
29+
assert.strictEqual(messages[0].permission,'FileSystemWrite');

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit cd1eb3e

Browse files
RafaelGSSaduh95
authored andcommitted
src,permission: add --permission-audit
Add --permission-audit flag that enables the permission model in warning-only mode. Instead of throwing ERR_ACCESS_DENIED, it emits a message via diagnostics channel and allows the operation to continue. Publish permission check results to per-scope diagnostics channels (e.g., node:permission-model:fs) so users can observe permission decisions at runtime via diagnostics_channel. Refs: #59935 PR-URL: #61869 Backport-PR-URL: #65354 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 82a0233 commit cd1eb3e

9 files changed

Lines changed: 164 additions & 12 deletions

File tree

‎doc/api/cli.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2137,6 +2137,16 @@ following permissions are restricted:
21372137
* WASI - manageable through [`--allow-wasi`][] flag
21382138
* Addons - manageable through [`--allow-addons`][] flag
21392139

2140+
### `--permission-audit`
2141+
2142+
<!-- YAML
2143+
added: REPLACEME
2144+
-->
2145+
2146+
Enable audit only for the permission model. When enabled, permission checks
2147+
are performed but access is not denied. Instead, a warning is emitted for
2148+
each permission violation via diagnostics channel.
2149+
21402150
### `--preserve-symlinks`
21412151

21422152
<!-- YAML
@@ -3661,6 +3671,7 @@ one is included in the list below.
36613671
*`--openssl-legacy-provider`
36623672
*`--openssl-shared-config`
36633673
*`--pending-deprecation`
3674+
*`--permission-audit`
36643675
*`--permission`
36653676
*`--preserve-symlinks-main`
36663677
*`--preserve-symlinks`

‎doc/node.1‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,11 @@ Among other uses, this can be used to enable FIPS-compliant crypto if Node.js is
468468
.ItFl-pending-deprecation
469469
Emit pending deprecation warnings.
470470
.
471+
.ItFl-permission-audit
472+
Enable audit only for the permission model. When enabled, permission checks
473+
are performed but access is not denied. Instead, a warning is emitted for
474+
each permission violation via diagnostics channel.
475+
.
471476
.ItFl-preserve-symlinks
472477
Instructs the module loader to preserve symbolic links when resolving and caching modules other than the main module.
473478
.

‎lib/internal/process/pre_execution.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ function setupDiagnosticsChannel() {
634634
}
635635

636636
functioninitializePermission(){
637-
constpermission=getOptionValue('--permission');
637+
constpermission=getOptionValue('--permission')||getOptionValue('--permission-audit');
638638
if(permission){
639639
process.binding=functionbinding(_module){
640640
thrownewERR_ACCESS_DENIED('process.binding');

‎src/env.cc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,8 +900,11 @@ Environment::Environment(IsolateData* isolate_data,
900900
tracing::CastTracedValue(traced_value));
901901
}
902902

903-
if (options_->permission) {
903+
if (options_->permission || options_->permission_audit) {
904904
permission()->EnablePermissions();
905+
if (options_->permission_audit) {
906+
permission()->EnableWarningOnly();
907+
}
905908
// The process shouldn't be able to neither
906909
// spawn/worker nor use addons or enable inspector
907910
// unless explicitly allowed by the user

‎src/node_options.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,11 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
639639
&EnvironmentOptions::permission,
640640
kAllowedInEnvvar,
641641
false);
642+
AddOption("--permission-audit",
643+
"enable audit only for the permission system",
644+
&EnvironmentOptions::permission_audit,
645+
kAllowedInEnvvar,
646+
false);
642647
AddOption("--allow-fs-read",
643648
"allow permissions to read the filesystem",
644649
&EnvironmentOptions::allow_fs_read,

‎src/node_options.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ class EnvironmentOptions : public Options {
143143
std::string input_type; // Value of --input-type
144144
bool entry_is_url = false;
145145
bool permission = false;
146+
bool permission_audit = false;
146147
std::vector<std::string> allow_fs_read;
147148
std::vector<std::string> allow_fs_write;
148149
bool allow_addons = false;

‎src/permission/permission.cc‎

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include"env-inl.h"
44
#include"memory_tracker-inl.h"
55
#include"node.h"
6+
#include"node_diagnostics_channel.h"
67
#include"node_errors.h"
78
#include"node_external_reference.h"
89
#include"node_file.h"
@@ -27,6 +28,27 @@ namespace permission {
2728

2829
namespace {
2930

31+
constexpr std::string_view GetDiagnosticsChannelName(PermissionScope scope) {
32+
switch (scope) {
33+
case PermissionScope::kFileSystem:
34+
case PermissionScope::kFileSystemRead:
35+
case PermissionScope::kFileSystemWrite:
36+
return"node:permission-model:fs";
37+
case PermissionScope::kChildProcess:
38+
return"node:permission-model:child";
39+
case PermissionScope::kWorkerThreads:
40+
return"node:permission-model:worker";
41+
case PermissionScope::kInspector:
42+
return"node:permission-model:inspector";
43+
case PermissionScope::kWASI:
44+
return"node:permission-model:wasi";
45+
case PermissionScope::kAddon:
46+
return"node:permission-model:addon";
47+
default:
48+
return {};
49+
}
50+
}
51+
3052
// permission.has('fs.in', '/tmp/')
3153
// permission.has('fs.in')
3254
staticvoidHas(const FunctionCallbackInfo<Value>& args) {
@@ -70,7 +92,7 @@ PermissionScope Permission::StringToPermission(const std::string& perm) {
7092
}
7193
#undef V
7294

73-
Permission::Permission() : enabled_(false) {
95+
Permission::Permission() : enabled_(false), warning_only_(false) {
7496
std::shared_ptr<PermissionBase> fs = std::make_shared<FSPermission>();
7597
std::shared_ptr<PermissionBase> child_p =
7698
std::make_shared<ChildProcessPermission>();
@@ -170,6 +192,74 @@ void Permission::EnablePermissions() {
170192
}
171193
}
172194

195+
voidPermission::EnableWarningOnly() {
196+
if (!warning_only_) {
197+
warning_only_ = true;
198+
}
199+
}
200+
201+
boolPermission::is_scope_granted(Environment* env,
202+
const PermissionScope permission,
203+
const std::string_view& res) const {
204+
auto perm_node = nodes_.find(permission);
205+
bool result = false;
206+
if (perm_node != nodes_.end()) {
207+
result = perm_node->second->is_granted(env, permission, res);
208+
}
209+
210+
if (!result && !publishing_) {
211+
auto channel_name = GetDiagnosticsChannelName(permission);
212+
if (!channel_name.empty()) {
213+
auto ch = GetOrCreateChannel(env, permission);
214+
if (ch && ch->HasSubscribers()) {
215+
publishing_ = true;
216+
v8::Isolate* isolate = env->isolate();
217+
v8::HandleScope handle_scope(isolate);
218+
v8::Local<v8::Context> context = env->context();
219+
v8::Local<v8::Object> msg =
220+
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
221+
constchar* perm_str = PermissionToString(permission);
222+
msg->Set(context,
223+
FIXED_ONE_BYTE_STRING(isolate, "permission"),
224+
v8::String::NewFromUtf8(isolate, perm_str).ToLocalChecked())
225+
.Check();
226+
msg->Set(context,
227+
FIXED_ONE_BYTE_STRING(isolate, "resource"),
228+
v8::String::NewFromUtf8(isolate,
229+
res.data(),
230+
v8::NewStringType::kNormal,
231+
static_cast<int>(res.size()))
232+
.ToLocalChecked())
233+
.Check();
234+
ch->Publish(env, msg);
235+
publishing_ = false;
236+
}
237+
}
238+
}
239+
240+
return result;
241+
}
242+
243+
BaseObjectPtr<diagnostics_channel::Channel> Permission::GetOrCreateChannel(
244+
Environment* env, PermissionScope scope) const {
245+
auto it = channels_.find(scope);
246+
if (it != channels_.end()) {
247+
// Promote weak ref to strong for the duration of this call.
248+
BaseObjectPtr<diagnostics_channel::Channel> ptr(it->second.get());
249+
if (ptr) return ptr;
250+
channels_.erase(it);
251+
}
252+
auto channel_name = GetDiagnosticsChannelName(scope);
253+
diagnostics_channel::Channel* ch =
254+
diagnostics_channel::Channel::Get(env, channel_name.data());
255+
if (ch != nullptr) {
256+
channels_.emplace(scope,
257+
BaseObjectWeakPtr<diagnostics_channel::Channel>(ch));
258+
return BaseObjectPtr<diagnostics_channel::Channel>(ch);
259+
}
260+
return {};
261+
}
262+
173263
voidPermission::Apply(Environment* env,
174264
const std::vector<std::string>& allow,
175265
PermissionScope scope) {

‎src/permission/permission.h‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

66
#include"debug_utils.h"
7+
#include"node_diagnostics_channel.h"
78
#include"node_options.h"
89
#include"permission/addon_permission.h"
910
#include"permission/child_process_permission.h"
@@ -36,7 +37,7 @@ namespace permission {
3637
[[unlikely]] { \
3738
node::permission::Permission::ThrowAccessDenied( \
3839
env__, perm__, resource__); \
39-
return __VA_ARGS__; \
40+
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
4041
} \
4142
} while (0)
4243

@@ -50,7 +51,7 @@ namespace permission {
5051
[[unlikely]] { \
5152
node::permission::Permission::AsyncThrowAccessDenied( \
5253
env__, (wrap), perm__, resource__); \
53-
return __VA_ARGS__; \
54+
if (!env__->permission()->warning_only()) return __VA_ARGS__; \
5455
} \
5556
} while (0)
5657

@@ -99,6 +100,8 @@ class Permission {
99100

100101
FORCE_INLINEboolenabled() const { return enabled_; }
101102

103+
FORCE_INLINEboolwarning_only() const { return warning_only_; }
104+
102105
static PermissionScope StringToPermission(const std::string& perm);
103106
staticconstchar* PermissionToString(PermissionScope perm);
104107
staticvoidThrowAccessDenied(Environment* env,
@@ -114,20 +117,25 @@ class Permission {
114117
const std::vector<std::string>& allow,
115118
PermissionScope scope);
116119
voidEnablePermissions();
120+
voidEnableWarningOnly();
117121

118122
private:
119123
COLD_NOINLINEboolis_scope_granted(Environment* env,
120124
const PermissionScope permission,
121-
const std::string_view& res = "") const {
122-
auto perm_node = nodes_.find(permission);
123-
if (perm_node != nodes_.end()) {
124-
return perm_node->second->is_granted(env, permission, res);
125-
}
126-
returnfalse;
127-
}
125+
const std::string_view& res = "") const;
126+
127+
BaseObjectPtr<diagnostics_channel::Channel> GetOrCreateChannel(
128+
Environment* env, PermissionScope scope) const;
128129

129130
std::unordered_map<PermissionScope, std::shared_ptr<PermissionBase>> nodes_;
130131
bool enabled_;
132+
bool warning_only_;
133+
mutablebool publishing_ = false;
134+
// Weak refs: BindingData (via BaseObjectPtr) is the sole owner of Channels.
135+
// Using weak refs here avoids keeping Channels alive past Realm teardown.
136+
mutable std::unordered_map<PermissionScope,
137+
BaseObjectWeakPtr<diagnostics_channel::Channel>>
138+
channels_;
131139
};
132140

133141
} // namespace permission
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Flags: --permission --allow-fs-read=*
2+
'use strict';
3+
4+
constcommon=require('../common');
5+
const{ isMainThread }=require('worker_threads');
6+
7+
if(!isMainThread){
8+
common.skip('This test only works on a main thread');
9+
}
10+
11+
constassert=require('node:assert');
12+
constdc=require('node:diagnostics_channel');
13+
constfs=require('node:fs');
14+
15+
constmessages=[];
16+
dc.subscribe('node:permission-model:fs',(msg)=>{
17+
messages.push(msg);
18+
});
19+
20+
// Granted permission should not publish
21+
fs.readFileSync(__filename);
22+
assert.strictEqual(messages.length,0);
23+
24+
// Denied permission should publish
25+
consthasWrite=process.permission.has('fs.write','/tmp/test');
26+
assert.strictEqual(hasWrite,false);
27+
28+
assert.ok(messages.length>0,'Expected at least one denied message');
29+
assert.strictEqual(messages[0].permission,'FileSystemWrite');

0 commit comments

Comments
 (0)