src: apply multiple permissions improvements#65158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jasnell wants to merge 11 commits into from
Closed

src: apply multiple permissions improvements #65158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fd56532
src: cache permission strings
jasnell Aug 8, 2026
bac8975
src: use DictionaryTemplate for permission diag channel message
jasnell Aug 9, 2026
dfb1e00
src: make minor cleanup to permission checks
jasnell Aug 9, 2026
85cab29
src: simplify c++ diagnostics channel API
jasnell Aug 9, 2026
551b23b
src: apply multiple general cleanups to permissions
jasnell Aug 9, 2026
1998f95
src: make permission storage a bit more efficient
jasnell Aug 9, 2026
77a3aa4
src: apply a modest performance perf to permissions
jasnell Aug 9, 2026
857db71
src: simplify includes in permissions
jasnell Aug 9, 2026
78bfa4f
src: simplify permissions with BooleanPermissions
jasnell Aug 9, 2026
7dd8d04
src: apply minor namespace format tweak in permissions
jasnell Aug 9, 2026
d110091
test: add permission fast api test
jasnell Aug 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions node.gyp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -178,16 +178,8 @@
'src/node_worker.cc',
'src/node_zlib.cc',
'src/path.cc',
'src/permission/child_process_permission.cc',
'src/permission/openssl_store_permission.cc',
'src/permission/ffi_permission.cc',
'src/permission/fs_permission.cc',
'src/permission/inspector_permission.cc',
'src/permission/permission.cc',
'src/permission/wasi_permission.cc',
'src/permission/worker_permission.cc',
'src/permission/net_permission.cc',
'src/permission/addon_permission.cc',
'src/pipe_wrap.cc',
'src/process_wrap.cc',
'src/signal_wrap.cc',
Expand DownExpand Up@@ -314,16 +306,10 @@
'src/node_watchdog.h',
'src/node_worker.h',
'src/path.h',
'src/permission/child_process_permission.h',
'src/permission/openssl_store_permission.h',
'src/permission/ffi_permission.h',
'src/permission/boolean_permission.h',
'src/permission/fs_permission.h',
'src/permission/inspector_permission.h',
'src/permission/permission.h',
'src/permission/wasi_permission.h',
'src/permission/worker_permission.h',
'src/permission/net_permission.h',
'src/permission/addon_permission.h',
'src/permission/permission_base.h',
'src/pipe_wrap.h',
'src/req_wrap.h',
'src/req_wrap-inl.h',
Expand Down
14 changes: 14 additions & 0 deletions src/env-inl.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -841,6 +841,13 @@ void Environment::set_process_exit_handler(
#undef VY
#undef VP

#define V(Name, label, _, __) \
inline v8::Local<v8::String> IsolateData::Name##_permission_string() const { \
return Name##_permission_string##_.Get(isolate_); \
}
PERMISSIONS(V)
#undef V

#define VM(PropertyName) V(PropertyName##_binding_template, v8::ObjectTemplate)
#define V(PropertyName, TypeName) \
inline v8::Local<TypeName> IsolateData::PropertyName() const { \
Expand DownExpand Up@@ -870,6 +877,13 @@ void Environment::set_process_exit_handler(
#undef VY
#undef VP

#define V(Name, label, _, __) \
inline v8::Local<v8::String> Environment::Name##_permission_string() const { \
return isolate_data()->Name##_permission_string(); \
}
PERMISSIONS(V)
#undef V

#define V(PropertyName, TypeName) \
inline v8::Local<TypeName> Environment::PropertyName() const { \
return isolate_data()->PropertyName(); \
Expand Down
53 changes: 45 additions & 8 deletions src/env.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -360,6 +360,12 @@ IsolateDataSerializeInfo IsolateData::Serialize(SnapshotCreator* creator) {
#undef VS
#undef VP

#define V(Name, label, _, __) \
info.primitive_values.push_back( \
creator->AddData(Name##_permission_string##_.Get(isolate)));
PERMISSIONS(V)
#undef V

info.primitive_values.reserve(info.primitive_values.size() +
AsyncWrap::PROVIDERS_LENGTH);
for (size_t i = 0; i < AsyncWrap::PROVIDERS_LENGTH; i++) {
Expand DownExpand Up@@ -419,6 +425,20 @@ void IsolateData::DeserializeProperties(const IsolateDataSerializeInfo* info) {
#undef VS
#undef VP

#define V(Name, label, _, __) \
do { \
MaybeLocal<String> maybe_field = \
isolate_->GetDataFromSnapshotOnce<String>( \
info->primitive_values[i++]); \
Local<String> field; \
if (!maybe_field.ToLocal(&field)) { \
fprintf(stderr, "Failed to deserialize " #Name "_permission_string\n"); \
} \
Name##_permission_string##_.Set(isolate_, field); \
} while (0);
PERMISSIONS(V)
#undef V

for (size_t j = 0; j < AsyncWrap::PROVIDERS_LENGTH; j++) {
MaybeLocal<String> maybe_field =
isolate_->GetDataFromSnapshotOnce<String>(info->primitive_values[i++]);
Expand DownExpand Up@@ -520,6 +540,17 @@ void IsolateData::CreateProperties() {
PER_ISOLATE_STRING_PROPERTIES(V)
#undef V

#define V(Name, label, _, __) \
Name##_permission_string##_.Set( \
isolate_, \
String::NewFromOneByte(isolate_, \
reinterpret_cast<const uint8_t*>(#Name), \
NewStringType::kInternalized, \
sizeof(#Name) - 1) \
.ToLocalChecked());
PERMISSIONS(V)
#undef V

// Create all the provider strings that will be passed to JS. Place them in
// an array so the array index matches the PROVIDER id offset. This way the
// strings can be retrieved quickly.
Expand DownExpand Up@@ -630,6 +661,11 @@ void IsolateData::MemoryInfo(MemoryTracker* tracker) const {
PER_ISOLATE_STRING_PROPERTIES(V)
#undef V

#define V(Name, label, _, __) \
tracker->TrackField(#Name "_permission_string", Name##_permission_string());
PERMISSIONS(V)
#undef V

tracker->TrackField("async_wrap_providers", async_wrap_providers_);

if (node_allocator_ != nullptr) {
Expand DownExpand Up@@ -918,6 +954,7 @@ Environment::Environment(IsolateData* isolate_data,

if (options_->permission || options_->permission_audit) {
permission()->EnablePermissions();
static const std::array args = {std::string("*")};
if (options_->permission_audit) {
permission()->EnableWarningOnly();
}
Expand All@@ -926,29 +963,29 @@ Environment::Environment(IsolateData* isolate_data,
// unless explicitly allowed by the user
if (!options_->allow_addons) {
options_->allow_native_addons = false;
permission()->Apply(this, {"*"}, permission::PermissionScope::kAddon);
permission()->Apply(this, args, permission::PermissionScope::kAddon);
}
if (!options_->allow_inspector) {
flags_ = flags_ | EnvironmentFlags::kNoCreateInspector;
permission()->Apply(this, {"*"}, permission::PermissionScope::kInspector);
permission()->Apply(this, args, permission::PermissionScope::kInspector);
}
if (!options_->allow_child_process) {
permission()->Apply(
this, {"*"}, permission::PermissionScope::kChildProcess);
this, args, permission::PermissionScope::kChildProcess);
}
if (!options_->allow_ffi) {
permission()->Apply(this, {"*"}, permission::PermissionScope::kFFI);
permission()->Apply(this, args, permission::PermissionScope::kFFI);
}
if (!options_->allow_openssl_store) {
permission()->Apply(
this, {"*"}, permission::PermissionScope::kOpenSSLStore);
this, args, permission::PermissionScope::kOpenSSLStore);
}
if (!options_->allow_worker_threads) {
permission()->Apply(
this, {"*"}, permission::PermissionScope::kWorkerThreads);
this, args, permission::PermissionScope::kWorkerThreads);
}
if (!options_->allow_wasi) {
permission()->Apply(this, {"*"}, permission::PermissionScope::kWASI);
permission()->Apply(this, args, permission::PermissionScope::kWASI);
}

// Implicit allow entrypoint to kFileSystemRead
Expand DownExpand Up@@ -983,7 +1020,7 @@ Environment::Environment(IsolateData* isolate_data,
}

if (options_->allow_net) {
permission()->Apply(this, {"*"}, permission::PermissionScope::kNet);
permission()->Apply(this, args, permission::PermissionScope::kNet);
}
}
}
Expand Down
16 changes: 16 additions & 0 deletions src/env.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,6 +189,11 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
#undef VS
#undef VP

#define V(Name, label, _, __) \
inline v8::Local<v8::String> Name##_permission_string() const;
PERMISSIONS(V)
#undef V

#define VM(PropertyName) V(PropertyName##_binding_template, v8::ObjectTemplate)
#define V(PropertyName, TypeName) \
inline v8::Local<TypeName> PropertyName() const; \
Expand DownExpand Up@@ -234,6 +239,12 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
#undef VS
#undef VY
#undef VP

#define V(Name, label, _, __) \
v8::Eternal<v8::String> Name##_permission_string##_;
PERMISSIONS(V)
#undef V

// Keep a list of all Persistent strings used for AsyncWrap Provider types.
std::array<v8::Eternal<v8::String>, AsyncWrap::PROVIDERS_LENGTH>
async_wrap_providers_;
Expand DownExpand Up@@ -875,6 +886,11 @@ class Environment final : public MemoryRetainer {
#undef VY
#undef VP

#define V(Name, label, _, __) \
inline v8::Local<v8::String> Name##_permission_string() const;
PERMISSIONS(V)
#undef V

#define V(PropertyName, TypeName) \
inline v8::Local<TypeName> PropertyName() const; \
inline void set_ ## PropertyName(v8::Local<TypeName> value);
Expand Down
1 change: 1 addition & 0 deletions src/env_properties.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -463,6 +463,7 @@
V(naptr_record_template, v8::DictionaryTemplate) \
V(object_stats_template, v8::DictionaryTemplate) \
V(page_stats_template, v8::DictionaryTemplate) \
V(permission_diagnostic_channel_message, v8::DictionaryTemplate) \
V(pipe_constructor_template, v8::FunctionTemplate) \
V(script_context_constructor_template, v8::FunctionTemplate) \
V(secure_context_constructor_template, v8::FunctionTemplate) \
Expand Down
14 changes: 8 additions & 6 deletions src/node_diagnostics_channel.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -178,11 +178,11 @@ void Channel::Unlink() {
publish_fn_.Reset();
}

Channel* Channel::Get(Environment* env, const char* name) {
BaseObjectPtr<Channel> Channel::Get(Environment* env, std::string_view name) {
Realm* realm = env->principal_realm();
BindingData* binding = realm->GetBindingData<BindingData>();
if (binding == nullptr) {
return nullptr;
return {};
}
uint32_t index = binding->GetOrCreateChannelIndex(std::string(name));

Expand All@@ -208,22 +208,24 @@ Channel* Channel::Get(Environment* env, const char* name) {
.ToLocalChecked()
->NewInstance(context)
.ToLocal(&wrap)) {
return nullptr;
return {};
}

binding->channels_[index] = MakeDetachedBaseObject<Channel>(
env, wrap, binding, index, std::string(name));
}

Channel* channel = binding->channels_[index].get();
auto& channel = binding->channels_[index];

// Late-bind: link to the JS channel when the callback is available.
if (!binding->link_callback_.IsEmpty() && !channel->IsLinked()) {
Isolate* isolate = env->isolate();
HandleScope handle_scope(isolate);
Local<Context> context = env->context();
Local<String> js_name = String::NewFromUtf8(isolate, name).ToLocalChecked();
Local<Value> argv[] = {js_name, Integer::NewFromUnsigned(isolate, index)};
Local<Value> argv[] = {
ToV8Value(context, name).ToLocalChecked(),
Integer::NewFromUnsigned(isolate, index),
};
Local<Value> result;
if (binding->link_callback_.Get(isolate)
->Call(context, v8::Undefined(isolate), arraysize(argv), argv)
Expand Down
3 changes: 1 addition & 2 deletions src/node_diagnostics_channel.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,8 +73,7 @@ class Channel : public BaseObject {
uint32_t index,
std::string name);

// Returns a non-owning pointer. Lifetime is managed by BindingData.
static Channel* Get(Environment* env, const char* name);
static BaseObjectPtr<Channel> Get(Environment* env, std::string_view name);

inline bool HasSubscribers() const {
return binding_data_ != nullptr && binding_data_->subscribers_[index_] > 0;
Expand Down
30 changes: 0 additions & 30 deletions src/permission/addon_permission.cc
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions src/permission/addon_permission.h
View file
Open in desktop

This file was deleted.

50 changes: 50 additions & 0 deletions src/permission/boolean_permission.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
#ifndef SRC_PERMISSION_BOOLEAN_PERMISSION_H_
#define SRC_PERMISSION_BOOLEAN_PERMISSION_H_

#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "permission/permission_base.h"

namespace node::permission {

// A simple boolean permission that either denies or allows access.
// Used for permission scopes that don't need per-resource granularity.
template <bool deny_only>
class BooleanPermission final : public PermissionBase {
public:
void Apply(Environment* env,
std::span<const std::string> allow,
PermissionScope scope) override {
flag_ = true;
}

void Drop(Environment* env,
PermissionScope scope,
std::string_view param) override {
flag_ = deny_only;
}

bool is_granted(Environment* env,
PermissionScope perm,
std::string_view param) const override {
if constexpr (deny_only) {
return !flag_;
} else {
return flag_;
}
}

private:
bool flag_ = false;
};

// Once denied, the permission cannot be re-granted.
using DenyOnlyPermission = BooleanPermission<true>;

// Apply grants access, Drop revokes.
using AllowRevokePermission = BooleanPermission<false>;

} // namespace node::permission

#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
#endif // SRC_PERMISSION_BOOLEAN_PERMISSION_H_
Loading
Loading
, '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
src: apply multiple permissions improvements#65158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jasnell
wants to merge
11
commits into

from

 Closed


src: apply multiple permissions improvements
#65158
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
fd56532

src: cache permission strings


jasnell Aug 8, 2026
bac8975

src: use DictionaryTemplate for permission diag channel message


jasnell Aug 9, 2026
dfb1e00

src: make minor cleanup to permission checks


jasnell Aug 9, 2026
85cab29

src: simplify c++ diagnostics channel API


jasnell Aug 9, 2026
551b23b

src: apply multiple general cleanups to permissions


jasnell Aug 9, 2026
1998f95

src: make permission storage a bit more efficient


jasnell Aug 9, 2026
77a3aa4

src: apply a modest performance perf to permissions


jasnell Aug 9, 2026
857db71

src: simplify includes in permissions


jasnell Aug 9, 2026
78bfa4f

src: simplify permissions with BooleanPermissions


jasnell Aug 9, 2026
7dd8d04

src: apply minor namespace format tweak in permissions


jasnell Aug 9, 2026
d110091

test: add permission fast api test


jasnell Aug 9, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 2 additions & 16 deletions
node.gyp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,16 +178,8 @@
 'src/node_worker.cc',
 'src/node_zlib.cc',
 'src/path.cc',
 'src/permission/child_process_permission.cc',
 'src/permission/openssl_store_permission.cc',
 'src/permission/ffi_permission.cc',
 'src/permission/fs_permission.cc',
 'src/permission/inspector_permission.cc',
 'src/permission/permission.cc',
 'src/permission/wasi_permission.cc',
 'src/permission/worker_permission.cc',
 'src/permission/net_permission.cc',
 'src/permission/addon_permission.cc',
 'src/pipe_wrap.cc',
 'src/process_wrap.cc',
 'src/signal_wrap.cc',
Expand DownExpand Up@@ -314,16 +306,10 @@
 'src/node_watchdog.h',
 'src/node_worker.h',
 'src/path.h',
 'src/permission/child_process_permission.h',
 'src/permission/openssl_store_permission.h',
 'src/permission/ffi_permission.h',
 'src/permission/boolean_permission.h',
 'src/permission/fs_permission.h',
 'src/permission/inspector_permission.h',
 'src/permission/permission.h',
 'src/permission/wasi_permission.h',
 'src/permission/worker_permission.h',
 'src/permission/net_permission.h',
 'src/permission/addon_permission.h',
 'src/permission/permission_base.h',
 'src/pipe_wrap.h',
 'src/req_wrap.h',
 'src/req_wrap-inl.h',
Expand Down

14 changes: 14 additions & 0 deletions
src/env-inl.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -841,6 +841,13 @@ void Environment::set_process_exit_handler(
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> IsolateData::Name##_permission_string() const { \
 return Name##_permission_string##_.Get(isolate_); \
 }
 PERMISSIONS(V)
#undef V

#define VM(PropertyName) V(PropertyName##_binding_template, v8::ObjectTemplate)
#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> IsolateData::PropertyName() const { \
Expand DownExpand Up@@ -870,6 +877,13 @@ void Environment::set_process_exit_handler(
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Environment::Name##_permission_string() const { \
 return isolate_data()->Name##_permission_string(); \
 }
 PERMISSIONS(V)
#undef V

#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> Environment::PropertyName() const { \
 return isolate_data()->PropertyName(); \
Expand Down

53 changes: 45 additions & 8 deletions
src/env.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,6 +360,12 @@ IsolateDataSerializeInfo IsolateData::Serialize(SnapshotCreator* creator) {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 info.primitive_values.push_back( \
 creator->AddData(Name##_permission_string##_.Get(isolate)));
 PERMISSIONS(V)
#undef V

 info.primitive_values.reserve(info.primitive_values.size() +
 AsyncWrap::PROVIDERS_LENGTH);
 for (size_t i = 0; i < AsyncWrap::PROVIDERS_LENGTH; i++) {
Expand DownExpand Up@@ -419,6 +425,20 @@ void IsolateData::DeserializeProperties(const IsolateDataSerializeInfo* info) {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 do { \
 MaybeLocal<String> maybe_field = \
 isolate_->GetDataFromSnapshotOnce<String>( \
 info->primitive_values[i++]); \
 Local<String> field; \
 if (!maybe_field.ToLocal(&field)) { \
 fprintf(stderr, "Failed to deserialize " #Name "_permission_string\n"); \
 } \
 Name##_permission_string##_.Set(isolate_, field); \
 } while (0);
 PERMISSIONS(V)
#undef V

 for (size_t j = 0; j < AsyncWrap::PROVIDERS_LENGTH; j++) {
 MaybeLocal<String> maybe_field =
 isolate_->GetDataFromSnapshotOnce<String>(info->primitive_values[i++]);
Expand DownExpand Up@@ -520,6 +540,17 @@ void IsolateData::CreateProperties() {
 PER_ISOLATE_STRING_PROPERTIES(V)
#undef V

#define V(Name, label, _, __) \
 Name##_permission_string##_.Set( \
 isolate_, \
 String::NewFromOneByte(isolate_, \
 reinterpret_cast<const uint8_t*>(#Name), \
 NewStringType::kInternalized, \
 sizeof(#Name) - 1) \
 .ToLocalChecked());
 PERMISSIONS(V)
#undef V

 // Create all the provider strings that will be passed to JS. Place them in
 // an array so the array index matches the PROVIDER id offset. This way the
 // strings can be retrieved quickly.
Expand DownExpand Up@@ -630,6 +661,11 @@ void IsolateData::MemoryInfo(MemoryTracker* tracker) const {
 PER_ISOLATE_STRING_PROPERTIES(V)
#undef V

#define V(Name, label, _, __) \
 tracker->TrackField(#Name "_permission_string", Name##_permission_string());
 PERMISSIONS(V)
#undef V

 tracker->TrackField("async_wrap_providers", async_wrap_providers_);

 if (node_allocator_ != nullptr) {
Expand DownExpand Up@@ -918,6 +954,7 @@ Environment::Environment(IsolateData* isolate_data,

 if (options_->permission || options_->permission_audit) {
 permission()->EnablePermissions();
 static const std::array args = {std::string("*")};
 if (options_->permission_audit) {
 permission()->EnableWarningOnly();
 }
Expand All@@ -926,29 +963,29 @@ Environment::Environment(IsolateData* isolate_data,
 // unless explicitly allowed by the user
 if (!options_->allow_addons) {
 options_->allow_native_addons = false;
 permission()->Apply(this, {"*"}, permission::PermissionScope::kAddon);
 permission()->Apply(this, args, permission::PermissionScope::kAddon);
 }
 if (!options_->allow_inspector) {
 flags_ = flags_ | EnvironmentFlags::kNoCreateInspector;
 permission()->Apply(this, {"*"}, permission::PermissionScope::kInspector);
 permission()->Apply(this, args, permission::PermissionScope::kInspector);
 }
 if (!options_->allow_child_process) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kChildProcess);
 this, args, permission::PermissionScope::kChildProcess);
 }
 if (!options_->allow_ffi) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kFFI);
 permission()->Apply(this, args, permission::PermissionScope::kFFI);
 }
 if (!options_->allow_openssl_store) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kOpenSSLStore);
 this, args, permission::PermissionScope::kOpenSSLStore);
 }
 if (!options_->allow_worker_threads) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kWorkerThreads);
 this, args, permission::PermissionScope::kWorkerThreads);
 }
 if (!options_->allow_wasi) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kWASI);
 permission()->Apply(this, args, permission::PermissionScope::kWASI);
 }

 // Implicit allow entrypoint to kFileSystemRead
Expand DownExpand Up@@ -983,7 +1020,7 @@ Environment::Environment(IsolateData* isolate_data,
 }

 if (options_->allow_net) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kNet);
 permission()->Apply(this, args, permission::PermissionScope::kNet);
 }
 }
}
Expand Down

16 changes: 16 additions & 0 deletions
src/env.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,6 +189,11 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Name##_permission_string() const;
 PERMISSIONS(V)
#undef V

#define VM(PropertyName) V(PropertyName##_binding_template, v8::ObjectTemplate)
#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> PropertyName() const; \
Expand DownExpand Up@@ -234,6 +239,12 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
#undef VS
#undef VY
#undef VP

#define V(Name, label, _, __) \
 v8::Eternal<v8::String> Name##_permission_string##_;
 PERMISSIONS(V)
#undef V

 // Keep a list of all Persistent strings used for AsyncWrap Provider types.
 std::array<v8::Eternal<v8::String>, AsyncWrap::PROVIDERS_LENGTH>
 async_wrap_providers_;
Expand DownExpand Up@@ -875,6 +886,11 @@ class Environment final : public MemoryRetainer {
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Name##_permission_string() const;
 PERMISSIONS(V)
#undef V

#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> PropertyName() const; \
 inline void set_ ## PropertyName(v8::Local<TypeName> value);
Expand Down

1 change: 1 addition & 0 deletions
src/env_properties.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -463,6 +463,7 @@
 V(naptr_record_template, v8::DictionaryTemplate) \
 V(object_stats_template, v8::DictionaryTemplate) \
 V(page_stats_template, v8::DictionaryTemplate) \
 V(permission_diagnostic_channel_message, v8::DictionaryTemplate) \
 V(pipe_constructor_template, v8::FunctionTemplate) \
 V(script_context_constructor_template, v8::FunctionTemplate) \
 V(secure_context_constructor_template, v8::FunctionTemplate) \
Expand Down

14 changes: 8 additions & 6 deletions
src/node_diagnostics_channel.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,11 +178,11 @@ void Channel::Unlink() {
 publish_fn_.Reset();
}

Channel* Channel::Get(Environment* env, const char* name) {
BaseObjectPtr<Channel> Channel::Get(Environment* env, std::string_view name) {
 Realm* realm = env->principal_realm();
 BindingData* binding = realm->GetBindingData<BindingData>();
 if (binding == nullptr) {
 return nullptr;
 return {};
 }
 uint32_t index = binding->GetOrCreateChannelIndex(std::string(name));

Expand All@@ -208,22 +208,24 @@ Channel* Channel::Get(Environment* env, const char* name) {
 .ToLocalChecked()
 ->NewInstance(context)
 .ToLocal(&wrap)) {
 return nullptr;
 return {};
 }

 binding->channels_[index] = MakeDetachedBaseObject<Channel>(
 env, wrap, binding, index, std::string(name));
 }

Channel* channel = binding->channels_[index].get();
auto& channel = binding->channels_[index];

 // Late-bind: link to the JS channel when the callback is available.
 if (!binding->link_callback_.IsEmpty() && !channel->IsLinked()) {
 Isolate* isolate = env->isolate();
 HandleScope handle_scope(isolate);
 Local<Context> context = env->context();
 Local<String> js_name = String::NewFromUtf8(isolate, name).ToLocalChecked();
 Local<Value> argv[] = {js_name, Integer::NewFromUnsigned(isolate, index)};
 Local<Value> argv[] = {
 ToV8Value(context, name).ToLocalChecked(),
 Integer::NewFromUnsigned(isolate, index),
 };
 Local<Value> result;
 if (binding->link_callback_.Get(isolate)
 ->Call(context, v8::Undefined(isolate), arraysize(argv), argv)
Expand Down

3 changes: 1 addition & 2 deletions
src/node_diagnostics_channel.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,8 +73,7 @@ class Channel : public BaseObject {
 uint32_t index,
 std::string name);

 // Returns a non-owning pointer. Lifetime is managed by BindingData.
 static Channel* Get(Environment* env, const char* name);
 static BaseObjectPtr<Channel> Get(Environment* env, std::string_view name);

 inline bool HasSubscribers() const {
 return binding_data_ != nullptr && binding_data_->subscribers_[index_] > 0;
Expand Down

30 changes: 0 additions & 30 deletions
src/permission/addon_permission.cc

View file


Open in desktop


This file was deleted.


34 changes: 0 additions & 34 deletions
src/permission/addon_permission.h

View file


Open in desktop


This file was deleted.


50 changes: 50 additions & 0 deletions
src/permission/boolean_permission.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
#ifndef SRC_PERMISSION_BOOLEAN_PERMISSION_H_
#define SRC_PERMISSION_BOOLEAN_PERMISSION_H_

#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "permission/permission_base.h"

namespace node::permission {

// A simple boolean permission that either denies or allows access.
// Used for permission scopes that don't need per-resource granularity.
template <bool deny_only>
class BooleanPermission final : public PermissionBase {
 public:
 void Apply(Environment* env,
 std::span<const std::string> allow,
 PermissionScope scope) override {
 flag_ = true;
 }

 void Drop(Environment* env,
 PermissionScope scope,
 std::string_view param) override {
 flag_ = deny_only;
 }

 bool is_granted(Environment* env,
 PermissionScope perm,
 std::string_view param) const override {
 if constexpr (deny_only) {
 return !flag_;
 } else {
 return flag_;
 }
 }

 private:
 bool flag_ = false;
};

// Once denied, the permission cannot be re-granted.
using DenyOnlyPermission = BooleanPermission<true>;

// Apply grants access, Drop revokes.
using AllowRevokePermission = BooleanPermission<false>;

} // namespace node::permission

#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
#endif // SRC_PERMISSION_BOOLEAN_PERMISSION_H_
Loading
Loading

, '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
src: apply multiple permissions improvements#65158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jasnell
wants to merge
11
commits into

from

 Closed


src: apply multiple permissions improvements
#65158
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
fd56532

src: cache permission strings


jasnell Aug 8, 2026
bac8975

src: use DictionaryTemplate for permission diag channel message


jasnell Aug 9, 2026
dfb1e00

src: make minor cleanup to permission checks


jasnell Aug 9, 2026
85cab29

src: simplify c++ diagnostics channel API


jasnell Aug 9, 2026
551b23b

src: apply multiple general cleanups to permissions


jasnell Aug 9, 2026
1998f95

src: make permission storage a bit more efficient


jasnell Aug 9, 2026
77a3aa4

src: apply a modest performance perf to permissions


jasnell Aug 9, 2026
857db71

src: simplify includes in permissions


jasnell Aug 9, 2026
78bfa4f

src: simplify permissions with BooleanPermissions


jasnell Aug 9, 2026
7dd8d04

src: apply minor namespace format tweak in permissions


jasnell Aug 9, 2026
d110091

test: add permission fast api test


jasnell Aug 9, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 2 additions & 16 deletions
node.gyp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,16 +178,8 @@
 'src/node_worker.cc',
 'src/node_zlib.cc',
 'src/path.cc',
 'src/permission/child_process_permission.cc',
 'src/permission/openssl_store_permission.cc',
 'src/permission/ffi_permission.cc',
 'src/permission/fs_permission.cc',
 'src/permission/inspector_permission.cc',
 'src/permission/permission.cc',
 'src/permission/wasi_permission.cc',
 'src/permission/worker_permission.cc',
 'src/permission/net_permission.cc',
 'src/permission/addon_permission.cc',
 'src/pipe_wrap.cc',
 'src/process_wrap.cc',
 'src/signal_wrap.cc',
Expand DownExpand Up@@ -314,16 +306,10 @@
 'src/node_watchdog.h',
 'src/node_worker.h',
 'src/path.h',
 'src/permission/child_process_permission.h',
 'src/permission/openssl_store_permission.h',
 'src/permission/ffi_permission.h',
 'src/permission/boolean_permission.h',
 'src/permission/fs_permission.h',
 'src/permission/inspector_permission.h',
 'src/permission/permission.h',
 'src/permission/wasi_permission.h',
 'src/permission/worker_permission.h',
 'src/permission/net_permission.h',
 'src/permission/addon_permission.h',
 'src/permission/permission_base.h',
 'src/pipe_wrap.h',
 'src/req_wrap.h',
 'src/req_wrap-inl.h',
Expand Down

14 changes: 14 additions & 0 deletions
src/env-inl.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -841,6 +841,13 @@ void Environment::set_process_exit_handler(
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> IsolateData::Name##_permission_string() const { \
 return Name##_permission_string##_.Get(isolate_); \
 }
 PERMISSIONS(V)
#undef V

#define VM(PropertyName) V(PropertyName##_binding_template, v8::ObjectTemplate)
#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> IsolateData::PropertyName() const { \
Expand DownExpand Up@@ -870,6 +877,13 @@ void Environment::set_process_exit_handler(
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Environment::Name##_permission_string() const { \
 return isolate_data()->Name##_permission_string(); \
 }
 PERMISSIONS(V)
#undef V

#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> Environment::PropertyName() const { \
 return isolate_data()->PropertyName(); \
Expand Down

53 changes: 45 additions & 8 deletions
src/env.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,6 +360,12 @@ IsolateDataSerializeInfo IsolateData::Serialize(SnapshotCreator* creator) {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 info.primitive_values.push_back( \
 creator->AddData(Name##_permission_string##_.Get(isolate)));
 PERMISSIONS(V)
#undef V

 info.primitive_values.reserve(info.primitive_values.size() +
 AsyncWrap::PROVIDERS_LENGTH);
 for (size_t i = 0; i < AsyncWrap::PROVIDERS_LENGTH; i++) {
Expand DownExpand Up@@ -419,6 +425,20 @@ void IsolateData::DeserializeProperties(const IsolateDataSerializeInfo* info) {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 do { \
 MaybeLocal<String> maybe_field = \
 isolate_->GetDataFromSnapshotOnce<String>( \
 info->primitive_values[i++]); \
 Local<String> field; \
 if (!maybe_field.ToLocal(&field)) { \
 fprintf(stderr, "Failed to deserialize " #Name "_permission_string\n"); \
 } \
 Name##_permission_string##_.Set(isolate_, field); \
 } while (0);
 PERMISSIONS(V)
#undef V

 for (size_t j = 0; j < AsyncWrap::PROVIDERS_LENGTH; j++) {
 MaybeLocal<String> maybe_field =
 isolate_->GetDataFromSnapshotOnce<String>(info->primitive_values[i++]);
Expand DownExpand Up@@ -520,6 +540,17 @@ void IsolateData::CreateProperties() {
 PER_ISOLATE_STRING_PROPERTIES(V)
#undef V

#define V(Name, label, _, __) \
 Name##_permission_string##_.Set( \
 isolate_, \
 String::NewFromOneByte(isolate_, \
 reinterpret_cast<const uint8_t*>(#Name), \
 NewStringType::kInternalized, \
 sizeof(#Name) - 1) \
 .ToLocalChecked());
 PERMISSIONS(V)
#undef V

 // Create all the provider strings that will be passed to JS. Place them in
 // an array so the array index matches the PROVIDER id offset. This way the
 // strings can be retrieved quickly.
Expand DownExpand Up@@ -630,6 +661,11 @@ void IsolateData::MemoryInfo(MemoryTracker* tracker) const {
 PER_ISOLATE_STRING_PROPERTIES(V)
#undef V

#define V(Name, label, _, __) \
 tracker->TrackField(#Name "_permission_string", Name##_permission_string());
 PERMISSIONS(V)
#undef V

 tracker->TrackField("async_wrap_providers", async_wrap_providers_);

 if (node_allocator_ != nullptr) {
Expand DownExpand Up@@ -918,6 +954,7 @@ Environment::Environment(IsolateData* isolate_data,

 if (options_->permission || options_->permission_audit) {
 permission()->EnablePermissions();
 static const std::array args = {std::string("*")};
 if (options_->permission_audit) {
 permission()->EnableWarningOnly();
 }
Expand All@@ -926,29 +963,29 @@ Environment::Environment(IsolateData* isolate_data,
 // unless explicitly allowed by the user
 if (!options_->allow_addons) {
 options_->allow_native_addons = false;
 permission()->Apply(this, {"*"}, permission::PermissionScope::kAddon);
 permission()->Apply(this, args, permission::PermissionScope::kAddon);
 }
 if (!options_->allow_inspector) {
 flags_ = flags_ | EnvironmentFlags::kNoCreateInspector;
 permission()->Apply(this, {"*"}, permission::PermissionScope::kInspector);
 permission()->Apply(this, args, permission::PermissionScope::kInspector);
 }
 if (!options_->allow_child_process) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kChildProcess);
 this, args, permission::PermissionScope::kChildProcess);
 }
 if (!options_->allow_ffi) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kFFI);
 permission()->Apply(this, args, permission::PermissionScope::kFFI);
 }
 if (!options_->allow_openssl_store) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kOpenSSLStore);
 this, args, permission::PermissionScope::kOpenSSLStore);
 }
 if (!options_->allow_worker_threads) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kWorkerThreads);
 this, args, permission::PermissionScope::kWorkerThreads);
 }
 if (!options_->allow_wasi) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kWASI);
 permission()->Apply(this, args, permission::PermissionScope::kWASI);
 }

 // Implicit allow entrypoint to kFileSystemRead
Expand DownExpand Up@@ -983,7 +1020,7 @@ Environment::Environment(IsolateData* isolate_data,
 }

 if (options_->allow_net) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kNet);
 permission()->Apply(this, args, permission::PermissionScope::kNet);
 }
 }
}
Expand Down

16 changes: 16 additions & 0 deletions
src/env.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,6 +189,11 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Name##_permission_string() const;
 PERMISSIONS(V)
#undef V

#define VM(PropertyName) V(PropertyName##_binding_template, v8::ObjectTemplate)
#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> PropertyName() const; \
Expand DownExpand Up@@ -234,6 +239,12 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
#undef VS
#undef VY
#undef VP

#define V(Name, label, _, __) \
 v8::Eternal<v8::String> Name##_permission_string##_;
 PERMISSIONS(V)
#undef V

 // Keep a list of all Persistent strings used for AsyncWrap Provider types.
 std::array<v8::Eternal<v8::String>, AsyncWrap::PROVIDERS_LENGTH>
 async_wrap_providers_;
Expand DownExpand Up@@ -875,6 +886,11 @@ class Environment final : public MemoryRetainer {
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Name##_permission_string() const;
 PERMISSIONS(V)
#undef V

#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> PropertyName() const; \
 inline void set_ ## PropertyName(v8::Local<TypeName> value);
Expand Down

1 change: 1 addition & 0 deletions
src/env_properties.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -463,6 +463,7 @@
 V(naptr_record_template, v8::DictionaryTemplate) \
 V(object_stats_template, v8::DictionaryTemplate) \
 V(page_stats_template, v8::DictionaryTemplate) \
 V(permission_diagnostic_channel_message, v8::DictionaryTemplate) \
 V(pipe_constructor_template, v8::FunctionTemplate) \
 V(script_context_constructor_template, v8::FunctionTemplate) \
 V(secure_context_constructor_template, v8::FunctionTemplate) \
Expand Down

14 changes: 8 additions & 6 deletions
src/node_diagnostics_channel.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,11 +178,11 @@ void Channel::Unlink() {
 publish_fn_.Reset();
}

Channel* Channel::Get(Environment* env, const char* name) {
BaseObjectPtr<Channel> Channel::Get(Environment* env, std::string_view name) {
 Realm* realm = env->principal_realm();
 BindingData* binding = realm->GetBindingData<BindingData>();
 if (binding == nullptr) {
 return nullptr;
 return {};
 }
 uint32_t index = binding->GetOrCreateChannelIndex(std::string(name));

Expand All@@ -208,22 +208,24 @@ Channel* Channel::Get(Environment* env, const char* name) {
 .ToLocalChecked()
 ->NewInstance(context)
 .ToLocal(&wrap)) {
 return nullptr;
 return {};
 }

 binding->channels_[index] = MakeDetachedBaseObject<Channel>(
 env, wrap, binding, index, std::string(name));
 }

Channel* channel = binding->channels_[index].get();
auto& channel = binding->channels_[index];

 // Late-bind: link to the JS channel when the callback is available.
 if (!binding->link_callback_.IsEmpty() && !channel->IsLinked()) {
 Isolate* isolate = env->isolate();
 HandleScope handle_scope(isolate);
 Local<Context> context = env->context();
 Local<String> js_name = String::NewFromUtf8(isolate, name).ToLocalChecked();
 Local<Value> argv[] = {js_name, Integer::NewFromUnsigned(isolate, index)};
 Local<Value> argv[] = {
 ToV8Value(context, name).ToLocalChecked(),
 Integer::NewFromUnsigned(isolate, index),
 };
 Local<Value> result;
 if (binding->link_callback_.Get(isolate)
 ->Call(context, v8::Undefined(isolate), arraysize(argv), argv)
Expand Down

3 changes: 1 addition & 2 deletions
src/node_diagnostics_channel.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,8 +73,7 @@ class Channel : public BaseObject {
 uint32_t index,
 std::string name);

 // Returns a non-owning pointer. Lifetime is managed by BindingData.
 static Channel* Get(Environment* env, const char* name);
 static BaseObjectPtr<Channel> Get(Environment* env, std::string_view name);

 inline bool HasSubscribers() const {
 return binding_data_ != nullptr && binding_data_->subscribers_[index_] > 0;
Expand Down

30 changes: 0 additions & 30 deletions
src/permission/addon_permission.cc

View file


Open in desktop


This file was deleted.


34 changes: 0 additions & 34 deletions
src/permission/addon_permission.h

View file


Open in desktop


This file was deleted.


50 changes: 50 additions & 0 deletions
src/permission/boolean_permission.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
#ifndef SRC_PERMISSION_BOOLEAN_PERMISSION_H_
#define SRC_PERMISSION_BOOLEAN_PERMISSION_H_

#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "permission/permission_base.h"

namespace node::permission {

// A simple boolean permission that either denies or allows access.
// Used for permission scopes that don't need per-resource granularity.
template <bool deny_only>
class BooleanPermission final : public PermissionBase {
 public:
 void Apply(Environment* env,
 std::span<const std::string> allow,
 PermissionScope scope) override {
 flag_ = true;
 }

 void Drop(Environment* env,
 PermissionScope scope,
 std::string_view param) override {
 flag_ = deny_only;
 }

 bool is_granted(Environment* env,
 PermissionScope perm,
 std::string_view param) const override {
 if constexpr (deny_only) {
 return !flag_;
 } else {
 return flag_;
 }
 }

 private:
 bool flag_ = false;
};

// Once denied, the permission cannot be re-granted.
using DenyOnlyPermission = BooleanPermission<true>;

// Apply grants access, Drop revokes.
using AllowRevokePermission = BooleanPermission<false>;

} // namespace node::permission

#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
#endif // SRC_PERMISSION_BOOLEAN_PERMISSION_H_
Loading
Loading

, '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
src: apply multiple permissions improvements#65158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jasnell
wants to merge
11
commits into

from

 Closed


src: apply multiple permissions improvements
#65158
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
fd56532

src: cache permission strings


jasnell Aug 8, 2026
bac8975

src: use DictionaryTemplate for permission diag channel message


jasnell Aug 9, 2026
dfb1e00

src: make minor cleanup to permission checks


jasnell Aug 9, 2026
85cab29

src: simplify c++ diagnostics channel API


jasnell Aug 9, 2026
551b23b

src: apply multiple general cleanups to permissions


jasnell Aug 9, 2026
1998f95

src: make permission storage a bit more efficient


jasnell Aug 9, 2026
77a3aa4

src: apply a modest performance perf to permissions


jasnell Aug 9, 2026
857db71

src: simplify includes in permissions


jasnell Aug 9, 2026
78bfa4f

src: simplify permissions with BooleanPermissions


jasnell Aug 9, 2026
7dd8d04

src: apply minor namespace format tweak in permissions


jasnell Aug 9, 2026
d110091

test: add permission fast api test


jasnell Aug 9, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 2 additions & 16 deletions
node.gyp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,16 +178,8 @@
 'src/node_worker.cc',
 'src/node_zlib.cc',
 'src/path.cc',
 'src/permission/child_process_permission.cc',
 'src/permission/openssl_store_permission.cc',
 'src/permission/ffi_permission.cc',
 'src/permission/fs_permission.cc',
 'src/permission/inspector_permission.cc',
 'src/permission/permission.cc',
 'src/permission/wasi_permission.cc',
 'src/permission/worker_permission.cc',
 'src/permission/net_permission.cc',
 'src/permission/addon_permission.cc',
 'src/pipe_wrap.cc',
 'src/process_wrap.cc',
 'src/signal_wrap.cc',
Expand DownExpand Up@@ -314,16 +306,10 @@
 'src/node_watchdog.h',
 'src/node_worker.h',
 'src/path.h',
 'src/permission/child_process_permission.h',
 'src/permission/openssl_store_permission.h',
 'src/permission/ffi_permission.h',
 'src/permission/boolean_permission.h',
 'src/permission/fs_permission.h',
 'src/permission/inspector_permission.h',
 'src/permission/permission.h',
 'src/permission/wasi_permission.h',
 'src/permission/worker_permission.h',
 'src/permission/net_permission.h',
 'src/permission/addon_permission.h',
 'src/permission/permission_base.h',
 'src/pipe_wrap.h',
 'src/req_wrap.h',
 'src/req_wrap-inl.h',
Expand Down

14 changes: 14 additions & 0 deletions
src/env-inl.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -841,6 +841,13 @@ void Environment::set_process_exit_handler(
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> IsolateData::Name##_permission_string() const { \
 return Name##_permission_string##_.Get(isolate_); \
 }
 PERMISSIONS(V)
#undef V

#define VM(PropertyName) V(PropertyName##_binding_template, v8::ObjectTemplate)
#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> IsolateData::PropertyName() const { \
Expand DownExpand Up@@ -870,6 +877,13 @@ void Environment::set_process_exit_handler(
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Environment::Name##_permission_string() const { \
 return isolate_data()->Name##_permission_string(); \
 }
 PERMISSIONS(V)
#undef V

#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> Environment::PropertyName() const { \
 return isolate_data()->PropertyName(); \
Expand Down

53 changes: 45 additions & 8 deletions
src/env.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,6 +360,12 @@ IsolateDataSerializeInfo IsolateData::Serialize(SnapshotCreator* creator) {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 info.primitive_values.push_back( \
 creator->AddData(Name##_permission_string##_.Get(isolate)));
 PERMISSIONS(V)
#undef V

 info.primitive_values.reserve(info.primitive_values.size() +
 AsyncWrap::PROVIDERS_LENGTH);
 for (size_t i = 0; i < AsyncWrap::PROVIDERS_LENGTH; i++) {
Expand DownExpand Up@@ -419,6 +425,20 @@ void IsolateData::DeserializeProperties(const IsolateDataSerializeInfo* info) {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 do { \
 MaybeLocal<String> maybe_field = \
 isolate_->GetDataFromSnapshotOnce<String>( \
 info->primitive_values[i++]); \
 Local<String> field; \
 if (!maybe_field.ToLocal(&field)) { \
 fprintf(stderr, "Failed to deserialize " #Name "_permission_string\n"); \
 } \
 Name##_permission_string##_.Set(isolate_, field); \
 } while (0);
 PERMISSIONS(V)
#undef V

 for (size_t j = 0; j < AsyncWrap::PROVIDERS_LENGTH; j++) {
 MaybeLocal<String> maybe_field =
 isolate_->GetDataFromSnapshotOnce<String>(info->primitive_values[i++]);
Expand DownExpand Up@@ -520,6 +540,17 @@ void IsolateData::CreateProperties() {
 PER_ISOLATE_STRING_PROPERTIES(V)
#undef V

#define V(Name, label, _, __) \
 Name##_permission_string##_.Set( \
 isolate_, \
 String::NewFromOneByte(isolate_, \
 reinterpret_cast<const uint8_t*>(#Name), \
 NewStringType::kInternalized, \
 sizeof(#Name) - 1) \
 .ToLocalChecked());
 PERMISSIONS(V)
#undef V

 // Create all the provider strings that will be passed to JS. Place them in
 // an array so the array index matches the PROVIDER id offset. This way the
 // strings can be retrieved quickly.
Expand DownExpand Up@@ -630,6 +661,11 @@ void IsolateData::MemoryInfo(MemoryTracker* tracker) const {
 PER_ISOLATE_STRING_PROPERTIES(V)
#undef V

#define V(Name, label, _, __) \
 tracker->TrackField(#Name "_permission_string", Name##_permission_string());
 PERMISSIONS(V)
#undef V

 tracker->TrackField("async_wrap_providers", async_wrap_providers_);

 if (node_allocator_ != nullptr) {
Expand DownExpand Up@@ -918,6 +954,7 @@ Environment::Environment(IsolateData* isolate_data,

 if (options_->permission || options_->permission_audit) {
 permission()->EnablePermissions();
 static const std::array args = {std::string("*")};
 if (options_->permission_audit) {
 permission()->EnableWarningOnly();
 }
Expand All@@ -926,29 +963,29 @@ Environment::Environment(IsolateData* isolate_data,
 // unless explicitly allowed by the user
 if (!options_->allow_addons) {
 options_->allow_native_addons = false;
 permission()->Apply(this, {"*"}, permission::PermissionScope::kAddon);
 permission()->Apply(this, args, permission::PermissionScope::kAddon);
 }
 if (!options_->allow_inspector) {
 flags_ = flags_ | EnvironmentFlags::kNoCreateInspector;
 permission()->Apply(this, {"*"}, permission::PermissionScope::kInspector);
 permission()->Apply(this, args, permission::PermissionScope::kInspector);
 }
 if (!options_->allow_child_process) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kChildProcess);
 this, args, permission::PermissionScope::kChildProcess);
 }
 if (!options_->allow_ffi) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kFFI);
 permission()->Apply(this, args, permission::PermissionScope::kFFI);
 }
 if (!options_->allow_openssl_store) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kOpenSSLStore);
 this, args, permission::PermissionScope::kOpenSSLStore);
 }
 if (!options_->allow_worker_threads) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kWorkerThreads);
 this, args, permission::PermissionScope::kWorkerThreads);
 }
 if (!options_->allow_wasi) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kWASI);
 permission()->Apply(this, args, permission::PermissionScope::kWASI);
 }

 // Implicit allow entrypoint to kFileSystemRead
Expand DownExpand Up@@ -983,7 +1020,7 @@ Environment::Environment(IsolateData* isolate_data,
 }

 if (options_->allow_net) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kNet);
 permission()->Apply(this, args, permission::PermissionScope::kNet);
 }
 }
}
Expand Down

16 changes: 16 additions & 0 deletions
src/env.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,6 +189,11 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Name##_permission_string() const;
 PERMISSIONS(V)
#undef V

#define VM(PropertyName) V(PropertyName##_binding_template, v8::ObjectTemplate)
#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> PropertyName() const; \
Expand DownExpand Up@@ -234,6 +239,12 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
#undef VS
#undef VY
#undef VP

#define V(Name, label, _, __) \
 v8::Eternal<v8::String> Name##_permission_string##_;
 PERMISSIONS(V)
#undef V

 // Keep a list of all Persistent strings used for AsyncWrap Provider types.
 std::array<v8::Eternal<v8::String>, AsyncWrap::PROVIDERS_LENGTH>
 async_wrap_providers_;
Expand DownExpand Up@@ -875,6 +886,11 @@ class Environment final : public MemoryRetainer {
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Name##_permission_string() const;
 PERMISSIONS(V)
#undef V

#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> PropertyName() const; \
 inline void set_ ## PropertyName(v8::Local<TypeName> value);
Expand Down

1 change: 1 addition & 0 deletions
src/env_properties.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -463,6 +463,7 @@
 V(naptr_record_template, v8::DictionaryTemplate) \
 V(object_stats_template, v8::DictionaryTemplate) \
 V(page_stats_template, v8::DictionaryTemplate) \
 V(permission_diagnostic_channel_message, v8::DictionaryTemplate) \
 V(pipe_constructor_template, v8::FunctionTemplate) \
 V(script_context_constructor_template, v8::FunctionTemplate) \
 V(secure_context_constructor_template, v8::FunctionTemplate) \
Expand Down

14 changes: 8 additions & 6 deletions
src/node_diagnostics_channel.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,11 +178,11 @@ void Channel::Unlink() {
 publish_fn_.Reset();
}

Channel* Channel::Get(Environment* env, const char* name) {
BaseObjectPtr<Channel> Channel::Get(Environment* env, std::string_view name) {
 Realm* realm = env->principal_realm();
 BindingData* binding = realm->GetBindingData<BindingData>();
 if (binding == nullptr) {
 return nullptr;
 return {};
 }
 uint32_t index = binding->GetOrCreateChannelIndex(std::string(name));

Expand All@@ -208,22 +208,24 @@ Channel* Channel::Get(Environment* env, const char* name) {
 .ToLocalChecked()
 ->NewInstance(context)
 .ToLocal(&wrap)) {
 return nullptr;
 return {};
 }

 binding->channels_[index] = MakeDetachedBaseObject<Channel>(
 env, wrap, binding, index, std::string(name));
 }

Channel* channel = binding->channels_[index].get();
auto& channel = binding->channels_[index];

 // Late-bind: link to the JS channel when the callback is available.
 if (!binding->link_callback_.IsEmpty() && !channel->IsLinked()) {
 Isolate* isolate = env->isolate();
 HandleScope handle_scope(isolate);
 Local<Context> context = env->context();
 Local<String> js_name = String::NewFromUtf8(isolate, name).ToLocalChecked();
 Local<Value> argv[] = {js_name, Integer::NewFromUnsigned(isolate, index)};
 Local<Value> argv[] = {
 ToV8Value(context, name).ToLocalChecked(),
 Integer::NewFromUnsigned(isolate, index),
 };
 Local<Value> result;
 if (binding->link_callback_.Get(isolate)
 ->Call(context, v8::Undefined(isolate), arraysize(argv), argv)
Expand Down

3 changes: 1 addition & 2 deletions
src/node_diagnostics_channel.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,8 +73,7 @@ class Channel : public BaseObject {
 uint32_t index,
 std::string name);

 // Returns a non-owning pointer. Lifetime is managed by BindingData.
 static Channel* Get(Environment* env, const char* name);
 static BaseObjectPtr<Channel> Get(Environment* env, std::string_view name);

 inline bool HasSubscribers() const {
 return binding_data_ != nullptr && binding_data_->subscribers_[index_] > 0;
Expand Down

30 changes: 0 additions & 30 deletions
src/permission/addon_permission.cc

View file


Open in desktop


This file was deleted.


34 changes: 0 additions & 34 deletions
src/permission/addon_permission.h

View file


Open in desktop


This file was deleted.


50 changes: 50 additions & 0 deletions
src/permission/boolean_permission.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
#ifndef SRC_PERMISSION_BOOLEAN_PERMISSION_H_
#define SRC_PERMISSION_BOOLEAN_PERMISSION_H_

#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "permission/permission_base.h"

namespace node::permission {

// A simple boolean permission that either denies or allows access.
// Used for permission scopes that don't need per-resource granularity.
template <bool deny_only>
class BooleanPermission final : public PermissionBase {
 public:
 void Apply(Environment* env,
 std::span<const std::string> allow,
 PermissionScope scope) override {
 flag_ = true;
 }

 void Drop(Environment* env,
 PermissionScope scope,
 std::string_view param) override {
 flag_ = deny_only;
 }

 bool is_granted(Environment* env,
 PermissionScope perm,
 std::string_view param) const override {
 if constexpr (deny_only) {
 return !flag_;
 } else {
 return flag_;
 }
 }

 private:
 bool flag_ = false;
};

// Once denied, the permission cannot be re-granted.
using DenyOnlyPermission = BooleanPermission<true>;

// Apply grants access, Drop revokes.
using AllowRevokePermission = BooleanPermission<false>;

} // namespace node::permission

#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
#endif // SRC_PERMISSION_BOOLEAN_PERMISSION_H_
Loading
Loading

, '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
src: apply multiple permissions improvements#65158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jasnell
wants to merge
11
commits into

from

 Closed


src: apply multiple permissions improvements
#65158
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
fd56532

src: cache permission strings


jasnell Aug 8, 2026
bac8975

src: use DictionaryTemplate for permission diag channel message


jasnell Aug 9, 2026
dfb1e00

src: make minor cleanup to permission checks


jasnell Aug 9, 2026
85cab29

src: simplify c++ diagnostics channel API


jasnell Aug 9, 2026
551b23b

src: apply multiple general cleanups to permissions


jasnell Aug 9, 2026
1998f95

src: make permission storage a bit more efficient


jasnell Aug 9, 2026
77a3aa4

src: apply a modest performance perf to permissions


jasnell Aug 9, 2026
857db71

src: simplify includes in permissions


jasnell Aug 9, 2026
78bfa4f

src: simplify permissions with BooleanPermissions


jasnell Aug 9, 2026
7dd8d04

src: apply minor namespace format tweak in permissions


jasnell Aug 9, 2026
d110091

test: add permission fast api test


jasnell Aug 9, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 2 additions & 16 deletions
node.gyp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,16 +178,8 @@
 'src/node_worker.cc',
 'src/node_zlib.cc',
 'src/path.cc',
 'src/permission/child_process_permission.cc',
 'src/permission/openssl_store_permission.cc',
 'src/permission/ffi_permission.cc',
 'src/permission/fs_permission.cc',
 'src/permission/inspector_permission.cc',
 'src/permission/permission.cc',
 'src/permission/wasi_permission.cc',
 'src/permission/worker_permission.cc',
 'src/permission/net_permission.cc',
 'src/permission/addon_permission.cc',
 'src/pipe_wrap.cc',
 'src/process_wrap.cc',
 'src/signal_wrap.cc',
Expand DownExpand Up@@ -314,16 +306,10 @@
 'src/node_watchdog.h',
 'src/node_worker.h',
 'src/path.h',
 'src/permission/child_process_permission.h',
 'src/permission/openssl_store_permission.h',
 'src/permission/ffi_permission.h',
 'src/permission/boolean_permission.h',
 'src/permission/fs_permission.h',
 'src/permission/inspector_permission.h',
 'src/permission/permission.h',
 'src/permission/wasi_permission.h',
 'src/permission/worker_permission.h',
 'src/permission/net_permission.h',
 'src/permission/addon_permission.h',
 'src/permission/permission_base.h',
 'src/pipe_wrap.h',
 'src/req_wrap.h',
 'src/req_wrap-inl.h',
Expand Down

14 changes: 14 additions & 0 deletions
src/env-inl.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -841,6 +841,13 @@ void Environment::set_process_exit_handler(
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> IsolateData::Name##_permission_string() const { \
 return Name##_permission_string##_.Get(isolate_); \
 }
 PERMISSIONS(V)
#undef V

#define VM(PropertyName) V(PropertyName##_binding_template, v8::ObjectTemplate)
#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> IsolateData::PropertyName() const { \
Expand DownExpand Up@@ -870,6 +877,13 @@ void Environment::set_process_exit_handler(
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Environment::Name##_permission_string() const { \
 return isolate_data()->Name##_permission_string(); \
 }
 PERMISSIONS(V)
#undef V

#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> Environment::PropertyName() const { \
 return isolate_data()->PropertyName(); \
Expand Down

53 changes: 45 additions & 8 deletions
src/env.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,6 +360,12 @@ IsolateDataSerializeInfo IsolateData::Serialize(SnapshotCreator* creator) {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 info.primitive_values.push_back( \
 creator->AddData(Name##_permission_string##_.Get(isolate)));
 PERMISSIONS(V)
#undef V

 info.primitive_values.reserve(info.primitive_values.size() +
 AsyncWrap::PROVIDERS_LENGTH);
 for (size_t i = 0; i < AsyncWrap::PROVIDERS_LENGTH; i++) {
Expand DownExpand Up@@ -419,6 +425,20 @@ void IsolateData::DeserializeProperties(const IsolateDataSerializeInfo* info) {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 do { \
 MaybeLocal<String> maybe_field = \
 isolate_->GetDataFromSnapshotOnce<String>( \
 info->primitive_values[i++]); \
 Local<String> field; \
 if (!maybe_field.ToLocal(&field)) { \
 fprintf(stderr, "Failed to deserialize " #Name "_permission_string\n"); \
 } \
 Name##_permission_string##_.Set(isolate_, field); \
 } while (0);
 PERMISSIONS(V)
#undef V

 for (size_t j = 0; j < AsyncWrap::PROVIDERS_LENGTH; j++) {
 MaybeLocal<String> maybe_field =
 isolate_->GetDataFromSnapshotOnce<String>(info->primitive_values[i++]);
Expand DownExpand Up@@ -520,6 +540,17 @@ void IsolateData::CreateProperties() {
 PER_ISOLATE_STRING_PROPERTIES(V)
#undef V

#define V(Name, label, _, __) \
 Name##_permission_string##_.Set( \
 isolate_, \
 String::NewFromOneByte(isolate_, \
 reinterpret_cast<const uint8_t*>(#Name), \
 NewStringType::kInternalized, \
 sizeof(#Name) - 1) \
 .ToLocalChecked());
 PERMISSIONS(V)
#undef V

 // Create all the provider strings that will be passed to JS. Place them in
 // an array so the array index matches the PROVIDER id offset. This way the
 // strings can be retrieved quickly.
Expand DownExpand Up@@ -630,6 +661,11 @@ void IsolateData::MemoryInfo(MemoryTracker* tracker) const {
 PER_ISOLATE_STRING_PROPERTIES(V)
#undef V

#define V(Name, label, _, __) \
 tracker->TrackField(#Name "_permission_string", Name##_permission_string());
 PERMISSIONS(V)
#undef V

 tracker->TrackField("async_wrap_providers", async_wrap_providers_);

 if (node_allocator_ != nullptr) {
Expand DownExpand Up@@ -918,6 +954,7 @@ Environment::Environment(IsolateData* isolate_data,

 if (options_->permission || options_->permission_audit) {
 permission()->EnablePermissions();
 static const std::array args = {std::string("*")};
 if (options_->permission_audit) {
 permission()->EnableWarningOnly();
 }
Expand All@@ -926,29 +963,29 @@ Environment::Environment(IsolateData* isolate_data,
 // unless explicitly allowed by the user
 if (!options_->allow_addons) {
 options_->allow_native_addons = false;
 permission()->Apply(this, {"*"}, permission::PermissionScope::kAddon);
 permission()->Apply(this, args, permission::PermissionScope::kAddon);
 }
 if (!options_->allow_inspector) {
 flags_ = flags_ | EnvironmentFlags::kNoCreateInspector;
 permission()->Apply(this, {"*"}, permission::PermissionScope::kInspector);
 permission()->Apply(this, args, permission::PermissionScope::kInspector);
 }
 if (!options_->allow_child_process) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kChildProcess);
 this, args, permission::PermissionScope::kChildProcess);
 }
 if (!options_->allow_ffi) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kFFI);
 permission()->Apply(this, args, permission::PermissionScope::kFFI);
 }
 if (!options_->allow_openssl_store) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kOpenSSLStore);
 this, args, permission::PermissionScope::kOpenSSLStore);
 }
 if (!options_->allow_worker_threads) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kWorkerThreads);
 this, args, permission::PermissionScope::kWorkerThreads);
 }
 if (!options_->allow_wasi) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kWASI);
 permission()->Apply(this, args, permission::PermissionScope::kWASI);
 }

 // Implicit allow entrypoint to kFileSystemRead
Expand DownExpand Up@@ -983,7 +1020,7 @@ Environment::Environment(IsolateData* isolate_data,
 }

 if (options_->allow_net) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kNet);
 permission()->Apply(this, args, permission::PermissionScope::kNet);
 }
 }
}
Expand Down

16 changes: 16 additions & 0 deletions
src/env.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,6 +189,11 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Name##_permission_string() const;
 PERMISSIONS(V)
#undef V

#define VM(PropertyName) V(PropertyName##_binding_template, v8::ObjectTemplate)
#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> PropertyName() const; \
Expand DownExpand Up@@ -234,6 +239,12 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
#undef VS
#undef VY
#undef VP

#define V(Name, label, _, __) \
 v8::Eternal<v8::String> Name##_permission_string##_;
 PERMISSIONS(V)
#undef V

 // Keep a list of all Persistent strings used for AsyncWrap Provider types.
 std::array<v8::Eternal<v8::String>, AsyncWrap::PROVIDERS_LENGTH>
 async_wrap_providers_;
Expand DownExpand Up@@ -875,6 +886,11 @@ class Environment final : public MemoryRetainer {
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Name##_permission_string() const;
 PERMISSIONS(V)
#undef V

#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> PropertyName() const; \
 inline void set_ ## PropertyName(v8::Local<TypeName> value);
Expand Down

1 change: 1 addition & 0 deletions
src/env_properties.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -463,6 +463,7 @@
 V(naptr_record_template, v8::DictionaryTemplate) \
 V(object_stats_template, v8::DictionaryTemplate) \
 V(page_stats_template, v8::DictionaryTemplate) \
 V(permission_diagnostic_channel_message, v8::DictionaryTemplate) \
 V(pipe_constructor_template, v8::FunctionTemplate) \
 V(script_context_constructor_template, v8::FunctionTemplate) \
 V(secure_context_constructor_template, v8::FunctionTemplate) \
Expand Down

14 changes: 8 additions & 6 deletions
src/node_diagnostics_channel.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,11 +178,11 @@ void Channel::Unlink() {
 publish_fn_.Reset();
}

Channel* Channel::Get(Environment* env, const char* name) {
BaseObjectPtr<Channel> Channel::Get(Environment* env, std::string_view name) {
 Realm* realm = env->principal_realm();
 BindingData* binding = realm->GetBindingData<BindingData>();
 if (binding == nullptr) {
 return nullptr;
 return {};
 }
 uint32_t index = binding->GetOrCreateChannelIndex(std::string(name));

Expand All@@ -208,22 +208,24 @@ Channel* Channel::Get(Environment* env, const char* name) {
 .ToLocalChecked()
 ->NewInstance(context)
 .ToLocal(&wrap)) {
 return nullptr;
 return {};
 }

 binding->channels_[index] = MakeDetachedBaseObject<Channel>(
 env, wrap, binding, index, std::string(name));
 }

Channel* channel = binding->channels_[index].get();
auto& channel = binding->channels_[index];

 // Late-bind: link to the JS channel when the callback is available.
 if (!binding->link_callback_.IsEmpty() && !channel->IsLinked()) {
 Isolate* isolate = env->isolate();
 HandleScope handle_scope(isolate);
 Local<Context> context = env->context();
 Local<String> js_name = String::NewFromUtf8(isolate, name).ToLocalChecked();
 Local<Value> argv[] = {js_name, Integer::NewFromUnsigned(isolate, index)};
 Local<Value> argv[] = {
 ToV8Value(context, name).ToLocalChecked(),
 Integer::NewFromUnsigned(isolate, index),
 };
 Local<Value> result;
 if (binding->link_callback_.Get(isolate)
 ->Call(context, v8::Undefined(isolate), arraysize(argv), argv)
Expand Down

3 changes: 1 addition & 2 deletions
src/node_diagnostics_channel.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,8 +73,7 @@ class Channel : public BaseObject {
 uint32_t index,
 std::string name);

 // Returns a non-owning pointer. Lifetime is managed by BindingData.
 static Channel* Get(Environment* env, const char* name);
 static BaseObjectPtr<Channel> Get(Environment* env, std::string_view name);

 inline bool HasSubscribers() const {
 return binding_data_ != nullptr && binding_data_->subscribers_[index_] > 0;
Expand Down

30 changes: 0 additions & 30 deletions
src/permission/addon_permission.cc

View file


Open in desktop


This file was deleted.


34 changes: 0 additions & 34 deletions
src/permission/addon_permission.h

View file


Open in desktop


This file was deleted.


50 changes: 50 additions & 0 deletions
src/permission/boolean_permission.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
#ifndef SRC_PERMISSION_BOOLEAN_PERMISSION_H_
#define SRC_PERMISSION_BOOLEAN_PERMISSION_H_

#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "permission/permission_base.h"

namespace node::permission {

// A simple boolean permission that either denies or allows access.
// Used for permission scopes that don't need per-resource granularity.
template <bool deny_only>
class BooleanPermission final : public PermissionBase {
 public:
 void Apply(Environment* env,
 std::span<const std::string> allow,
 PermissionScope scope) override {
 flag_ = true;
 }

 void Drop(Environment* env,
 PermissionScope scope,
 std::string_view param) override {
 flag_ = deny_only;
 }

 bool is_granted(Environment* env,
 PermissionScope perm,
 std::string_view param) const override {
 if constexpr (deny_only) {
 return !flag_;
 } else {
 return flag_;
 }
 }

 private:
 bool flag_ = false;
};

// Once denied, the permission cannot be re-granted.
using DenyOnlyPermission = BooleanPermission<true>;

// Apply grants access, Drop revokes.
using AllowRevokePermission = BooleanPermission<false>;

} // namespace node::permission

#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
#endif // SRC_PERMISSION_BOOLEAN_PERMISSION_H_
Loading
Loading

, '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
src: apply multiple permissions improvements#65158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jasnell
wants to merge
11
commits into

from

 Closed


src: apply multiple permissions improvements
#65158
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
fd56532

src: cache permission strings


jasnell Aug 8, 2026
bac8975

src: use DictionaryTemplate for permission diag channel message


jasnell Aug 9, 2026
dfb1e00

src: make minor cleanup to permission checks


jasnell Aug 9, 2026
85cab29

src: simplify c++ diagnostics channel API


jasnell Aug 9, 2026
551b23b

src: apply multiple general cleanups to permissions


jasnell Aug 9, 2026
1998f95

src: make permission storage a bit more efficient


jasnell Aug 9, 2026
77a3aa4

src: apply a modest performance perf to permissions


jasnell Aug 9, 2026
857db71

src: simplify includes in permissions


jasnell Aug 9, 2026
78bfa4f

src: simplify permissions with BooleanPermissions


jasnell Aug 9, 2026
7dd8d04

src: apply minor namespace format tweak in permissions


jasnell Aug 9, 2026
d110091

test: add permission fast api test


jasnell Aug 9, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 2 additions & 16 deletions
node.gyp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,16 +178,8 @@
 'src/node_worker.cc',
 'src/node_zlib.cc',
 'src/path.cc',
 'src/permission/child_process_permission.cc',
 'src/permission/openssl_store_permission.cc',
 'src/permission/ffi_permission.cc',
 'src/permission/fs_permission.cc',
 'src/permission/inspector_permission.cc',
 'src/permission/permission.cc',
 'src/permission/wasi_permission.cc',
 'src/permission/worker_permission.cc',
 'src/permission/net_permission.cc',
 'src/permission/addon_permission.cc',
 'src/pipe_wrap.cc',
 'src/process_wrap.cc',
 'src/signal_wrap.cc',
Expand DownExpand Up@@ -314,16 +306,10 @@
 'src/node_watchdog.h',
 'src/node_worker.h',
 'src/path.h',
 'src/permission/child_process_permission.h',
 'src/permission/openssl_store_permission.h',
 'src/permission/ffi_permission.h',
 'src/permission/boolean_permission.h',
 'src/permission/fs_permission.h',
 'src/permission/inspector_permission.h',
 'src/permission/permission.h',
 'src/permission/wasi_permission.h',
 'src/permission/worker_permission.h',
 'src/permission/net_permission.h',
 'src/permission/addon_permission.h',
 'src/permission/permission_base.h',
 'src/pipe_wrap.h',
 'src/req_wrap.h',
 'src/req_wrap-inl.h',
Expand Down

14 changes: 14 additions & 0 deletions
src/env-inl.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -841,6 +841,13 @@ void Environment::set_process_exit_handler(
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> IsolateData::Name##_permission_string() const { \
 return Name##_permission_string##_.Get(isolate_); \
 }
 PERMISSIONS(V)
#undef V

#define VM(PropertyName) V(PropertyName##_binding_template, v8::ObjectTemplate)
#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> IsolateData::PropertyName() const { \
Expand DownExpand Up@@ -870,6 +877,13 @@ void Environment::set_process_exit_handler(
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Environment::Name##_permission_string() const { \
 return isolate_data()->Name##_permission_string(); \
 }
 PERMISSIONS(V)
#undef V

#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> Environment::PropertyName() const { \
 return isolate_data()->PropertyName(); \
Expand Down

53 changes: 45 additions & 8 deletions
src/env.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,6 +360,12 @@ IsolateDataSerializeInfo IsolateData::Serialize(SnapshotCreator* creator) {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 info.primitive_values.push_back( \
 creator->AddData(Name##_permission_string##_.Get(isolate)));
 PERMISSIONS(V)
#undef V

 info.primitive_values.reserve(info.primitive_values.size() +
 AsyncWrap::PROVIDERS_LENGTH);
 for (size_t i = 0; i < AsyncWrap::PROVIDERS_LENGTH; i++) {
Expand DownExpand Up@@ -419,6 +425,20 @@ void IsolateData::DeserializeProperties(const IsolateDataSerializeInfo* info) {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 do { \
 MaybeLocal<String> maybe_field = \
 isolate_->GetDataFromSnapshotOnce<String>( \
 info->primitive_values[i++]); \
 Local<String> field; \
 if (!maybe_field.ToLocal(&field)) { \
 fprintf(stderr, "Failed to deserialize " #Name "_permission_string\n"); \
 } \
 Name##_permission_string##_.Set(isolate_, field); \
 } while (0);
 PERMISSIONS(V)
#undef V

 for (size_t j = 0; j < AsyncWrap::PROVIDERS_LENGTH; j++) {
 MaybeLocal<String> maybe_field =
 isolate_->GetDataFromSnapshotOnce<String>(info->primitive_values[i++]);
Expand DownExpand Up@@ -520,6 +540,17 @@ void IsolateData::CreateProperties() {
 PER_ISOLATE_STRING_PROPERTIES(V)
#undef V

#define V(Name, label, _, __) \
 Name##_permission_string##_.Set( \
 isolate_, \
 String::NewFromOneByte(isolate_, \
 reinterpret_cast<const uint8_t*>(#Name), \
 NewStringType::kInternalized, \
 sizeof(#Name) - 1) \
 .ToLocalChecked());
 PERMISSIONS(V)
#undef V

 // Create all the provider strings that will be passed to JS. Place them in
 // an array so the array index matches the PROVIDER id offset. This way the
 // strings can be retrieved quickly.
Expand DownExpand Up@@ -630,6 +661,11 @@ void IsolateData::MemoryInfo(MemoryTracker* tracker) const {
 PER_ISOLATE_STRING_PROPERTIES(V)
#undef V

#define V(Name, label, _, __) \
 tracker->TrackField(#Name "_permission_string", Name##_permission_string());
 PERMISSIONS(V)
#undef V

 tracker->TrackField("async_wrap_providers", async_wrap_providers_);

 if (node_allocator_ != nullptr) {
Expand DownExpand Up@@ -918,6 +954,7 @@ Environment::Environment(IsolateData* isolate_data,

 if (options_->permission || options_->permission_audit) {
 permission()->EnablePermissions();
 static const std::array args = {std::string("*")};
 if (options_->permission_audit) {
 permission()->EnableWarningOnly();
 }
Expand All@@ -926,29 +963,29 @@ Environment::Environment(IsolateData* isolate_data,
 // unless explicitly allowed by the user
 if (!options_->allow_addons) {
 options_->allow_native_addons = false;
 permission()->Apply(this, {"*"}, permission::PermissionScope::kAddon);
 permission()->Apply(this, args, permission::PermissionScope::kAddon);
 }
 if (!options_->allow_inspector) {
 flags_ = flags_ | EnvironmentFlags::kNoCreateInspector;
 permission()->Apply(this, {"*"}, permission::PermissionScope::kInspector);
 permission()->Apply(this, args, permission::PermissionScope::kInspector);
 }
 if (!options_->allow_child_process) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kChildProcess);
 this, args, permission::PermissionScope::kChildProcess);
 }
 if (!options_->allow_ffi) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kFFI);
 permission()->Apply(this, args, permission::PermissionScope::kFFI);
 }
 if (!options_->allow_openssl_store) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kOpenSSLStore);
 this, args, permission::PermissionScope::kOpenSSLStore);
 }
 if (!options_->allow_worker_threads) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kWorkerThreads);
 this, args, permission::PermissionScope::kWorkerThreads);
 }
 if (!options_->allow_wasi) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kWASI);
 permission()->Apply(this, args, permission::PermissionScope::kWASI);
 }

 // Implicit allow entrypoint to kFileSystemRead
Expand DownExpand Up@@ -983,7 +1020,7 @@ Environment::Environment(IsolateData* isolate_data,
 }

 if (options_->allow_net) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kNet);
 permission()->Apply(this, args, permission::PermissionScope::kNet);
 }
 }
}
Expand Down

16 changes: 16 additions & 0 deletions
src/env.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,6 +189,11 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Name##_permission_string() const;
 PERMISSIONS(V)
#undef V

#define VM(PropertyName) V(PropertyName##_binding_template, v8::ObjectTemplate)
#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> PropertyName() const; \
Expand DownExpand Up@@ -234,6 +239,12 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
#undef VS
#undef VY
#undef VP

#define V(Name, label, _, __) \
 v8::Eternal<v8::String> Name##_permission_string##_;
 PERMISSIONS(V)
#undef V

 // Keep a list of all Persistent strings used for AsyncWrap Provider types.
 std::array<v8::Eternal<v8::String>, AsyncWrap::PROVIDERS_LENGTH>
 async_wrap_providers_;
Expand DownExpand Up@@ -875,6 +886,11 @@ class Environment final : public MemoryRetainer {
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Name##_permission_string() const;
 PERMISSIONS(V)
#undef V

#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> PropertyName() const; \
 inline void set_ ## PropertyName(v8::Local<TypeName> value);
Expand Down

1 change: 1 addition & 0 deletions
src/env_properties.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -463,6 +463,7 @@
 V(naptr_record_template, v8::DictionaryTemplate) \
 V(object_stats_template, v8::DictionaryTemplate) \
 V(page_stats_template, v8::DictionaryTemplate) \
 V(permission_diagnostic_channel_message, v8::DictionaryTemplate) \
 V(pipe_constructor_template, v8::FunctionTemplate) \
 V(script_context_constructor_template, v8::FunctionTemplate) \
 V(secure_context_constructor_template, v8::FunctionTemplate) \
Expand Down

14 changes: 8 additions & 6 deletions
src/node_diagnostics_channel.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,11 +178,11 @@ void Channel::Unlink() {
 publish_fn_.Reset();
}

Channel* Channel::Get(Environment* env, const char* name) {
BaseObjectPtr<Channel> Channel::Get(Environment* env, std::string_view name) {
 Realm* realm = env->principal_realm();
 BindingData* binding = realm->GetBindingData<BindingData>();
 if (binding == nullptr) {
 return nullptr;
 return {};
 }
 uint32_t index = binding->GetOrCreateChannelIndex(std::string(name));

Expand All@@ -208,22 +208,24 @@ Channel* Channel::Get(Environment* env, const char* name) {
 .ToLocalChecked()
 ->NewInstance(context)
 .ToLocal(&wrap)) {
 return nullptr;
 return {};
 }

 binding->channels_[index] = MakeDetachedBaseObject<Channel>(
 env, wrap, binding, index, std::string(name));
 }

Channel* channel = binding->channels_[index].get();
auto& channel = binding->channels_[index];

 // Late-bind: link to the JS channel when the callback is available.
 if (!binding->link_callback_.IsEmpty() && !channel->IsLinked()) {
 Isolate* isolate = env->isolate();
 HandleScope handle_scope(isolate);
 Local<Context> context = env->context();
 Local<String> js_name = String::NewFromUtf8(isolate, name).ToLocalChecked();
 Local<Value> argv[] = {js_name, Integer::NewFromUnsigned(isolate, index)};
 Local<Value> argv[] = {
 ToV8Value(context, name).ToLocalChecked(),
 Integer::NewFromUnsigned(isolate, index),
 };
 Local<Value> result;
 if (binding->link_callback_.Get(isolate)
 ->Call(context, v8::Undefined(isolate), arraysize(argv), argv)
Expand Down

3 changes: 1 addition & 2 deletions
src/node_diagnostics_channel.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,8 +73,7 @@ class Channel : public BaseObject {
 uint32_t index,
 std::string name);

 // Returns a non-owning pointer. Lifetime is managed by BindingData.
 static Channel* Get(Environment* env, const char* name);
 static BaseObjectPtr<Channel> Get(Environment* env, std::string_view name);

 inline bool HasSubscribers() const {
 return binding_data_ != nullptr && binding_data_->subscribers_[index_] > 0;
Expand Down

30 changes: 0 additions & 30 deletions
src/permission/addon_permission.cc

View file


Open in desktop


This file was deleted.


34 changes: 0 additions & 34 deletions
src/permission/addon_permission.h

View file


Open in desktop


This file was deleted.


50 changes: 50 additions & 0 deletions
src/permission/boolean_permission.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
#ifndef SRC_PERMISSION_BOOLEAN_PERMISSION_H_
#define SRC_PERMISSION_BOOLEAN_PERMISSION_H_

#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "permission/permission_base.h"

namespace node::permission {

// A simple boolean permission that either denies or allows access.
// Used for permission scopes that don't need per-resource granularity.
template <bool deny_only>
class BooleanPermission final : public PermissionBase {
 public:
 void Apply(Environment* env,
 std::span<const std::string> allow,
 PermissionScope scope) override {
 flag_ = true;
 }

 void Drop(Environment* env,
 PermissionScope scope,
 std::string_view param) override {
 flag_ = deny_only;
 }

 bool is_granted(Environment* env,
 PermissionScope perm,
 std::string_view param) const override {
 if constexpr (deny_only) {
 return !flag_;
 } else {
 return flag_;
 }
 }

 private:
 bool flag_ = false;
};

// Once denied, the permission cannot be re-granted.
using DenyOnlyPermission = BooleanPermission<true>;

// Apply grants access, Drop revokes.
using AllowRevokePermission = BooleanPermission<false>;

} // namespace node::permission

#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
#endif // SRC_PERMISSION_BOOLEAN_PERMISSION_H_
Loading
Loading

, '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
src: apply multiple permissions improvements#65158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jasnell
wants to merge
11
commits into

from

 Closed


src: apply multiple permissions improvements
#65158
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
fd56532

src: cache permission strings


jasnell Aug 8, 2026
bac8975

src: use DictionaryTemplate for permission diag channel message


jasnell Aug 9, 2026
dfb1e00

src: make minor cleanup to permission checks


jasnell Aug 9, 2026
85cab29

src: simplify c++ diagnostics channel API


jasnell Aug 9, 2026
551b23b

src: apply multiple general cleanups to permissions


jasnell Aug 9, 2026
1998f95

src: make permission storage a bit more efficient


jasnell Aug 9, 2026
77a3aa4

src: apply a modest performance perf to permissions


jasnell Aug 9, 2026
857db71

src: simplify includes in permissions


jasnell Aug 9, 2026
78bfa4f

src: simplify permissions with BooleanPermissions


jasnell Aug 9, 2026
7dd8d04

src: apply minor namespace format tweak in permissions


jasnell Aug 9, 2026
d110091

test: add permission fast api test


jasnell Aug 9, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 2 additions & 16 deletions
node.gyp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,16 +178,8 @@
 'src/node_worker.cc',
 'src/node_zlib.cc',
 'src/path.cc',
 'src/permission/child_process_permission.cc',
 'src/permission/openssl_store_permission.cc',
 'src/permission/ffi_permission.cc',
 'src/permission/fs_permission.cc',
 'src/permission/inspector_permission.cc',
 'src/permission/permission.cc',
 'src/permission/wasi_permission.cc',
 'src/permission/worker_permission.cc',
 'src/permission/net_permission.cc',
 'src/permission/addon_permission.cc',
 'src/pipe_wrap.cc',
 'src/process_wrap.cc',
 'src/signal_wrap.cc',
Expand DownExpand Up@@ -314,16 +306,10 @@
 'src/node_watchdog.h',
 'src/node_worker.h',
 'src/path.h',
 'src/permission/child_process_permission.h',
 'src/permission/openssl_store_permission.h',
 'src/permission/ffi_permission.h',
 'src/permission/boolean_permission.h',
 'src/permission/fs_permission.h',
 'src/permission/inspector_permission.h',
 'src/permission/permission.h',
 'src/permission/wasi_permission.h',
 'src/permission/worker_permission.h',
 'src/permission/net_permission.h',
 'src/permission/addon_permission.h',
 'src/permission/permission_base.h',
 'src/pipe_wrap.h',
 'src/req_wrap.h',
 'src/req_wrap-inl.h',
Expand Down

14 changes: 14 additions & 0 deletions
src/env-inl.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -841,6 +841,13 @@ void Environment::set_process_exit_handler(
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> IsolateData::Name##_permission_string() const { \
 return Name##_permission_string##_.Get(isolate_); \
 }
 PERMISSIONS(V)
#undef V

#define VM(PropertyName) V(PropertyName##_binding_template, v8::ObjectTemplate)
#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> IsolateData::PropertyName() const { \
Expand DownExpand Up@@ -870,6 +877,13 @@ void Environment::set_process_exit_handler(
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Environment::Name##_permission_string() const { \
 return isolate_data()->Name##_permission_string(); \
 }
 PERMISSIONS(V)
#undef V

#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> Environment::PropertyName() const { \
 return isolate_data()->PropertyName(); \
Expand Down

53 changes: 45 additions & 8 deletions
src/env.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,6 +360,12 @@ IsolateDataSerializeInfo IsolateData::Serialize(SnapshotCreator* creator) {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 info.primitive_values.push_back( \
 creator->AddData(Name##_permission_string##_.Get(isolate)));
 PERMISSIONS(V)
#undef V

 info.primitive_values.reserve(info.primitive_values.size() +
 AsyncWrap::PROVIDERS_LENGTH);
 for (size_t i = 0; i < AsyncWrap::PROVIDERS_LENGTH; i++) {
Expand DownExpand Up@@ -419,6 +425,20 @@ void IsolateData::DeserializeProperties(const IsolateDataSerializeInfo* info) {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 do { \
 MaybeLocal<String> maybe_field = \
 isolate_->GetDataFromSnapshotOnce<String>( \
 info->primitive_values[i++]); \
 Local<String> field; \
 if (!maybe_field.ToLocal(&field)) { \
 fprintf(stderr, "Failed to deserialize " #Name "_permission_string\n"); \
 } \
 Name##_permission_string##_.Set(isolate_, field); \
 } while (0);
 PERMISSIONS(V)
#undef V

 for (size_t j = 0; j < AsyncWrap::PROVIDERS_LENGTH; j++) {
 MaybeLocal<String> maybe_field =
 isolate_->GetDataFromSnapshotOnce<String>(info->primitive_values[i++]);
Expand DownExpand Up@@ -520,6 +540,17 @@ void IsolateData::CreateProperties() {
 PER_ISOLATE_STRING_PROPERTIES(V)
#undef V

#define V(Name, label, _, __) \
 Name##_permission_string##_.Set( \
 isolate_, \
 String::NewFromOneByte(isolate_, \
 reinterpret_cast<const uint8_t*>(#Name), \
 NewStringType::kInternalized, \
 sizeof(#Name) - 1) \
 .ToLocalChecked());
 PERMISSIONS(V)
#undef V

 // Create all the provider strings that will be passed to JS. Place them in
 // an array so the array index matches the PROVIDER id offset. This way the
 // strings can be retrieved quickly.
Expand DownExpand Up@@ -630,6 +661,11 @@ void IsolateData::MemoryInfo(MemoryTracker* tracker) const {
 PER_ISOLATE_STRING_PROPERTIES(V)
#undef V

#define V(Name, label, _, __) \
 tracker->TrackField(#Name "_permission_string", Name##_permission_string());
 PERMISSIONS(V)
#undef V

 tracker->TrackField("async_wrap_providers", async_wrap_providers_);

 if (node_allocator_ != nullptr) {
Expand DownExpand Up@@ -918,6 +954,7 @@ Environment::Environment(IsolateData* isolate_data,

 if (options_->permission || options_->permission_audit) {
 permission()->EnablePermissions();
 static const std::array args = {std::string("*")};
 if (options_->permission_audit) {
 permission()->EnableWarningOnly();
 }
Expand All@@ -926,29 +963,29 @@ Environment::Environment(IsolateData* isolate_data,
 // unless explicitly allowed by the user
 if (!options_->allow_addons) {
 options_->allow_native_addons = false;
 permission()->Apply(this, {"*"}, permission::PermissionScope::kAddon);
 permission()->Apply(this, args, permission::PermissionScope::kAddon);
 }
 if (!options_->allow_inspector) {
 flags_ = flags_ | EnvironmentFlags::kNoCreateInspector;
 permission()->Apply(this, {"*"}, permission::PermissionScope::kInspector);
 permission()->Apply(this, args, permission::PermissionScope::kInspector);
 }
 if (!options_->allow_child_process) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kChildProcess);
 this, args, permission::PermissionScope::kChildProcess);
 }
 if (!options_->allow_ffi) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kFFI);
 permission()->Apply(this, args, permission::PermissionScope::kFFI);
 }
 if (!options_->allow_openssl_store) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kOpenSSLStore);
 this, args, permission::PermissionScope::kOpenSSLStore);
 }
 if (!options_->allow_worker_threads) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kWorkerThreads);
 this, args, permission::PermissionScope::kWorkerThreads);
 }
 if (!options_->allow_wasi) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kWASI);
 permission()->Apply(this, args, permission::PermissionScope::kWASI);
 }

 // Implicit allow entrypoint to kFileSystemRead
Expand DownExpand Up@@ -983,7 +1020,7 @@ Environment::Environment(IsolateData* isolate_data,
 }

 if (options_->allow_net) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kNet);
 permission()->Apply(this, args, permission::PermissionScope::kNet);
 }
 }
}
Expand Down

16 changes: 16 additions & 0 deletions
src/env.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,6 +189,11 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Name##_permission_string() const;
 PERMISSIONS(V)
#undef V

#define VM(PropertyName) V(PropertyName##_binding_template, v8::ObjectTemplate)
#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> PropertyName() const; \
Expand DownExpand Up@@ -234,6 +239,12 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
#undef VS
#undef VY
#undef VP

#define V(Name, label, _, __) \
 v8::Eternal<v8::String> Name##_permission_string##_;
 PERMISSIONS(V)
#undef V

 // Keep a list of all Persistent strings used for AsyncWrap Provider types.
 std::array<v8::Eternal<v8::String>, AsyncWrap::PROVIDERS_LENGTH>
 async_wrap_providers_;
Expand DownExpand Up@@ -875,6 +886,11 @@ class Environment final : public MemoryRetainer {
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Name##_permission_string() const;
 PERMISSIONS(V)
#undef V

#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> PropertyName() const; \
 inline void set_ ## PropertyName(v8::Local<TypeName> value);
Expand Down

1 change: 1 addition & 0 deletions
src/env_properties.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -463,6 +463,7 @@
 V(naptr_record_template, v8::DictionaryTemplate) \
 V(object_stats_template, v8::DictionaryTemplate) \
 V(page_stats_template, v8::DictionaryTemplate) \
 V(permission_diagnostic_channel_message, v8::DictionaryTemplate) \
 V(pipe_constructor_template, v8::FunctionTemplate) \
 V(script_context_constructor_template, v8::FunctionTemplate) \
 V(secure_context_constructor_template, v8::FunctionTemplate) \
Expand Down

14 changes: 8 additions & 6 deletions
src/node_diagnostics_channel.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,11 +178,11 @@ void Channel::Unlink() {
 publish_fn_.Reset();
}

Channel* Channel::Get(Environment* env, const char* name) {
BaseObjectPtr<Channel> Channel::Get(Environment* env, std::string_view name) {
 Realm* realm = env->principal_realm();
 BindingData* binding = realm->GetBindingData<BindingData>();
 if (binding == nullptr) {
 return nullptr;
 return {};
 }
 uint32_t index = binding->GetOrCreateChannelIndex(std::string(name));

Expand All@@ -208,22 +208,24 @@ Channel* Channel::Get(Environment* env, const char* name) {
 .ToLocalChecked()
 ->NewInstance(context)
 .ToLocal(&wrap)) {
 return nullptr;
 return {};
 }

 binding->channels_[index] = MakeDetachedBaseObject<Channel>(
 env, wrap, binding, index, std::string(name));
 }

Channel* channel = binding->channels_[index].get();
auto& channel = binding->channels_[index];

 // Late-bind: link to the JS channel when the callback is available.
 if (!binding->link_callback_.IsEmpty() && !channel->IsLinked()) {
 Isolate* isolate = env->isolate();
 HandleScope handle_scope(isolate);
 Local<Context> context = env->context();
 Local<String> js_name = String::NewFromUtf8(isolate, name).ToLocalChecked();
 Local<Value> argv[] = {js_name, Integer::NewFromUnsigned(isolate, index)};
 Local<Value> argv[] = {
 ToV8Value(context, name).ToLocalChecked(),
 Integer::NewFromUnsigned(isolate, index),
 };
 Local<Value> result;
 if (binding->link_callback_.Get(isolate)
 ->Call(context, v8::Undefined(isolate), arraysize(argv), argv)
Expand Down

3 changes: 1 addition & 2 deletions
src/node_diagnostics_channel.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,8 +73,7 @@ class Channel : public BaseObject {
 uint32_t index,
 std::string name);

 // Returns a non-owning pointer. Lifetime is managed by BindingData.
 static Channel* Get(Environment* env, const char* name);
 static BaseObjectPtr<Channel> Get(Environment* env, std::string_view name);

 inline bool HasSubscribers() const {
 return binding_data_ != nullptr && binding_data_->subscribers_[index_] > 0;
Expand Down

30 changes: 0 additions & 30 deletions
src/permission/addon_permission.cc

View file


Open in desktop


This file was deleted.


34 changes: 0 additions & 34 deletions
src/permission/addon_permission.h

View file


Open in desktop


This file was deleted.


50 changes: 50 additions & 0 deletions
src/permission/boolean_permission.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
#ifndef SRC_PERMISSION_BOOLEAN_PERMISSION_H_
#define SRC_PERMISSION_BOOLEAN_PERMISSION_H_

#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "permission/permission_base.h"

namespace node::permission {

// A simple boolean permission that either denies or allows access.
// Used for permission scopes that don't need per-resource granularity.
template <bool deny_only>
class BooleanPermission final : public PermissionBase {
 public:
 void Apply(Environment* env,
 std::span<const std::string> allow,
 PermissionScope scope) override {
 flag_ = true;
 }

 void Drop(Environment* env,
 PermissionScope scope,
 std::string_view param) override {
 flag_ = deny_only;
 }

 bool is_granted(Environment* env,
 PermissionScope perm,
 std::string_view param) const override {
 if constexpr (deny_only) {
 return !flag_;
 } else {
 return flag_;
 }
 }

 private:
 bool flag_ = false;
};

// Once denied, the permission cannot be re-granted.
using DenyOnlyPermission = BooleanPermission<true>;

// Apply grants access, Drop revokes.
using AllowRevokePermission = BooleanPermission<false>;

} // namespace node::permission

#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
#endif // SRC_PERMISSION_BOOLEAN_PERMISSION_H_
Loading
Loading

, '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
src: apply multiple permissions improvements#65158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jasnell
wants to merge
11
commits into

from

 Closed


src: apply multiple permissions improvements
#65158
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
fd56532

src: cache permission strings


jasnell Aug 8, 2026
bac8975

src: use DictionaryTemplate for permission diag channel message


jasnell Aug 9, 2026
dfb1e00

src: make minor cleanup to permission checks


jasnell Aug 9, 2026
85cab29

src: simplify c++ diagnostics channel API


jasnell Aug 9, 2026
551b23b

src: apply multiple general cleanups to permissions


jasnell Aug 9, 2026
1998f95

src: make permission storage a bit more efficient


jasnell Aug 9, 2026
77a3aa4

src: apply a modest performance perf to permissions


jasnell Aug 9, 2026
857db71

src: simplify includes in permissions


jasnell Aug 9, 2026
78bfa4f

src: simplify permissions with BooleanPermissions


jasnell Aug 9, 2026
7dd8d04

src: apply minor namespace format tweak in permissions


jasnell Aug 9, 2026
d110091

test: add permission fast api test


jasnell Aug 9, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 2 additions & 16 deletions
node.gyp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,16 +178,8 @@
 'src/node_worker.cc',
 'src/node_zlib.cc',
 'src/path.cc',
 'src/permission/child_process_permission.cc',
 'src/permission/openssl_store_permission.cc',
 'src/permission/ffi_permission.cc',
 'src/permission/fs_permission.cc',
 'src/permission/inspector_permission.cc',
 'src/permission/permission.cc',
 'src/permission/wasi_permission.cc',
 'src/permission/worker_permission.cc',
 'src/permission/net_permission.cc',
 'src/permission/addon_permission.cc',
 'src/pipe_wrap.cc',
 'src/process_wrap.cc',
 'src/signal_wrap.cc',
Expand DownExpand Up@@ -314,16 +306,10 @@
 'src/node_watchdog.h',
 'src/node_worker.h',
 'src/path.h',
 'src/permission/child_process_permission.h',
 'src/permission/openssl_store_permission.h',
 'src/permission/ffi_permission.h',
 'src/permission/boolean_permission.h',
 'src/permission/fs_permission.h',
 'src/permission/inspector_permission.h',
 'src/permission/permission.h',
 'src/permission/wasi_permission.h',
 'src/permission/worker_permission.h',
 'src/permission/net_permission.h',
 'src/permission/addon_permission.h',
 'src/permission/permission_base.h',
 'src/pipe_wrap.h',
 'src/req_wrap.h',
 'src/req_wrap-inl.h',
Expand Down

14 changes: 14 additions & 0 deletions
src/env-inl.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -841,6 +841,13 @@ void Environment::set_process_exit_handler(
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> IsolateData::Name##_permission_string() const { \
 return Name##_permission_string##_.Get(isolate_); \
 }
 PERMISSIONS(V)
#undef V

#define VM(PropertyName) V(PropertyName##_binding_template, v8::ObjectTemplate)
#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> IsolateData::PropertyName() const { \
Expand DownExpand Up@@ -870,6 +877,13 @@ void Environment::set_process_exit_handler(
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Environment::Name##_permission_string() const { \
 return isolate_data()->Name##_permission_string(); \
 }
 PERMISSIONS(V)
#undef V

#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> Environment::PropertyName() const { \
 return isolate_data()->PropertyName(); \
Expand Down

53 changes: 45 additions & 8 deletions
src/env.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,6 +360,12 @@ IsolateDataSerializeInfo IsolateData::Serialize(SnapshotCreator* creator) {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 info.primitive_values.push_back( \
 creator->AddData(Name##_permission_string##_.Get(isolate)));
 PERMISSIONS(V)
#undef V

 info.primitive_values.reserve(info.primitive_values.size() +
 AsyncWrap::PROVIDERS_LENGTH);
 for (size_t i = 0; i < AsyncWrap::PROVIDERS_LENGTH; i++) {
Expand DownExpand Up@@ -419,6 +425,20 @@ void IsolateData::DeserializeProperties(const IsolateDataSerializeInfo* info) {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 do { \
 MaybeLocal<String> maybe_field = \
 isolate_->GetDataFromSnapshotOnce<String>( \
 info->primitive_values[i++]); \
 Local<String> field; \
 if (!maybe_field.ToLocal(&field)) { \
 fprintf(stderr, "Failed to deserialize " #Name "_permission_string\n"); \
 } \
 Name##_permission_string##_.Set(isolate_, field); \
 } while (0);
 PERMISSIONS(V)
#undef V

 for (size_t j = 0; j < AsyncWrap::PROVIDERS_LENGTH; j++) {
 MaybeLocal<String> maybe_field =
 isolate_->GetDataFromSnapshotOnce<String>(info->primitive_values[i++]);
Expand DownExpand Up@@ -520,6 +540,17 @@ void IsolateData::CreateProperties() {
 PER_ISOLATE_STRING_PROPERTIES(V)
#undef V

#define V(Name, label, _, __) \
 Name##_permission_string##_.Set( \
 isolate_, \
 String::NewFromOneByte(isolate_, \
 reinterpret_cast<const uint8_t*>(#Name), \
 NewStringType::kInternalized, \
 sizeof(#Name) - 1) \
 .ToLocalChecked());
 PERMISSIONS(V)
#undef V

 // Create all the provider strings that will be passed to JS. Place them in
 // an array so the array index matches the PROVIDER id offset. This way the
 // strings can be retrieved quickly.
Expand DownExpand Up@@ -630,6 +661,11 @@ void IsolateData::MemoryInfo(MemoryTracker* tracker) const {
 PER_ISOLATE_STRING_PROPERTIES(V)
#undef V

#define V(Name, label, _, __) \
 tracker->TrackField(#Name "_permission_string", Name##_permission_string());
 PERMISSIONS(V)
#undef V

 tracker->TrackField("async_wrap_providers", async_wrap_providers_);

 if (node_allocator_ != nullptr) {
Expand DownExpand Up@@ -918,6 +954,7 @@ Environment::Environment(IsolateData* isolate_data,

 if (options_->permission || options_->permission_audit) {
 permission()->EnablePermissions();
 static const std::array args = {std::string("*")};
 if (options_->permission_audit) {
 permission()->EnableWarningOnly();
 }
Expand All@@ -926,29 +963,29 @@ Environment::Environment(IsolateData* isolate_data,
 // unless explicitly allowed by the user
 if (!options_->allow_addons) {
 options_->allow_native_addons = false;
 permission()->Apply(this, {"*"}, permission::PermissionScope::kAddon);
 permission()->Apply(this, args, permission::PermissionScope::kAddon);
 }
 if (!options_->allow_inspector) {
 flags_ = flags_ | EnvironmentFlags::kNoCreateInspector;
 permission()->Apply(this, {"*"}, permission::PermissionScope::kInspector);
 permission()->Apply(this, args, permission::PermissionScope::kInspector);
 }
 if (!options_->allow_child_process) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kChildProcess);
 this, args, permission::PermissionScope::kChildProcess);
 }
 if (!options_->allow_ffi) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kFFI);
 permission()->Apply(this, args, permission::PermissionScope::kFFI);
 }
 if (!options_->allow_openssl_store) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kOpenSSLStore);
 this, args, permission::PermissionScope::kOpenSSLStore);
 }
 if (!options_->allow_worker_threads) {
 permission()->Apply(
 this, {"*"}, permission::PermissionScope::kWorkerThreads);
 this, args, permission::PermissionScope::kWorkerThreads);
 }
 if (!options_->allow_wasi) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kWASI);
 permission()->Apply(this, args, permission::PermissionScope::kWASI);
 }

 // Implicit allow entrypoint to kFileSystemRead
Expand DownExpand Up@@ -983,7 +1020,7 @@ Environment::Environment(IsolateData* isolate_data,
 }

 if (options_->allow_net) {
 permission()->Apply(this, {"*"}, permission::PermissionScope::kNet);
 permission()->Apply(this, args, permission::PermissionScope::kNet);
 }
 }
}
Expand Down

16 changes: 16 additions & 0 deletions
src/env.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,6 +189,11 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
#undef VS
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Name##_permission_string() const;
 PERMISSIONS(V)
#undef V

#define VM(PropertyName) V(PropertyName##_binding_template, v8::ObjectTemplate)
#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> PropertyName() const; \
Expand DownExpand Up@@ -234,6 +239,12 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
#undef VS
#undef VY
#undef VP

#define V(Name, label, _, __) \
 v8::Eternal<v8::String> Name##_permission_string##_;
 PERMISSIONS(V)
#undef V

 // Keep a list of all Persistent strings used for AsyncWrap Provider types.
 std::array<v8::Eternal<v8::String>, AsyncWrap::PROVIDERS_LENGTH>
 async_wrap_providers_;
Expand DownExpand Up@@ -875,6 +886,11 @@ class Environment final : public MemoryRetainer {
#undef VY
#undef VP

#define V(Name, label, _, __) \
 inline v8::Local<v8::String> Name##_permission_string() const;
 PERMISSIONS(V)
#undef V

#define V(PropertyName, TypeName) \
 inline v8::Local<TypeName> PropertyName() const; \
 inline void set_ ## PropertyName(v8::Local<TypeName> value);
Expand Down

1 change: 1 addition & 0 deletions
src/env_properties.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -463,6 +463,7 @@
 V(naptr_record_template, v8::DictionaryTemplate) \
 V(object_stats_template, v8::DictionaryTemplate) \
 V(page_stats_template, v8::DictionaryTemplate) \
 V(permission_diagnostic_channel_message, v8::DictionaryTemplate) \
 V(pipe_constructor_template, v8::FunctionTemplate) \
 V(script_context_constructor_template, v8::FunctionTemplate) \
 V(secure_context_constructor_template, v8::FunctionTemplate) \
Expand Down

14 changes: 8 additions & 6 deletions
src/node_diagnostics_channel.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,11 +178,11 @@ void Channel::Unlink() {
 publish_fn_.Reset();
}

Channel* Channel::Get(Environment* env, const char* name) {
BaseObjectPtr<Channel> Channel::Get(Environment* env, std::string_view name) {
 Realm* realm = env->principal_realm();
 BindingData* binding = realm->GetBindingData<BindingData>();
 if (binding == nullptr) {
 return nullptr;
 return {};
 }
 uint32_t index = binding->GetOrCreateChannelIndex(std::string(name));

Expand All@@ -208,22 +208,24 @@ Channel* Channel::Get(Environment* env, const char* name) {
 .ToLocalChecked()
 ->NewInstance(context)
 .ToLocal(&wrap)) {
 return nullptr;
 return {};
 }

 binding->channels_[index] = MakeDetachedBaseObject<Channel>(
 env, wrap, binding, index, std::string(name));
 }

Channel* channel = binding->channels_[index].get();
auto& channel = binding->channels_[index];

 // Late-bind: link to the JS channel when the callback is available.
 if (!binding->link_callback_.IsEmpty() && !channel->IsLinked()) {
 Isolate* isolate = env->isolate();
 HandleScope handle_scope(isolate);
 Local<Context> context = env->context();
 Local<String> js_name = String::NewFromUtf8(isolate, name).ToLocalChecked();
 Local<Value> argv[] = {js_name, Integer::NewFromUnsigned(isolate, index)};
 Local<Value> argv[] = {
 ToV8Value(context, name).ToLocalChecked(),
 Integer::NewFromUnsigned(isolate, index),
 };
 Local<Value> result;
 if (binding->link_callback_.Get(isolate)
 ->Call(context, v8::Undefined(isolate), arraysize(argv), argv)
Expand Down

3 changes: 1 addition & 2 deletions
src/node_diagnostics_channel.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,8 +73,7 @@ class Channel : public BaseObject {
 uint32_t index,
 std::string name);

 // Returns a non-owning pointer. Lifetime is managed by BindingData.
 static Channel* Get(Environment* env, const char* name);
 static BaseObjectPtr<Channel> Get(Environment* env, std::string_view name);

 inline bool HasSubscribers() const {
 return binding_data_ != nullptr && binding_data_->subscribers_[index_] > 0;
Expand Down

30 changes: 0 additions & 30 deletions
src/permission/addon_permission.cc

View file


Open in desktop


This file was deleted.


34 changes: 0 additions & 34 deletions
src/permission/addon_permission.h

View file


Open in desktop


This file was deleted.


50 changes: 50 additions & 0 deletions
src/permission/boolean_permission.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
#ifndef SRC_PERMISSION_BOOLEAN_PERMISSION_H_
#define SRC_PERMISSION_BOOLEAN_PERMISSION_H_

#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "permission/permission_base.h"

namespace node::permission {

// A simple boolean permission that either denies or allows access.
// Used for permission scopes that don't need per-resource granularity.
template <bool deny_only>
class BooleanPermission final : public PermissionBase {
 public:
 void Apply(Environment* env,
 std::span<const std::string> allow,
 PermissionScope scope) override {
 flag_ = true;
 }

 void Drop(Environment* env,
 PermissionScope scope,
 std::string_view param) override {
 flag_ = deny_only;
 }

 bool is_granted(Environment* env,
 PermissionScope perm,
 std::string_view param) const override {
 if constexpr (deny_only) {
 return !flag_;
 } else {
 return flag_;
 }
 }

 private:
 bool flag_ = false;
};

// Once denied, the permission cannot be re-granted.
using DenyOnlyPermission = BooleanPermission<true>;

// Apply grants access, Drop revokes.
using AllowRevokePermission = BooleanPermission<false>;

} // namespace node::permission

#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
#endif // SRC_PERMISSION_BOOLEAN_PERMISSION_H_
Loading
Loading