Commit 521aaf1

Browse files
jasnelladuh95
authored andcommitted
src: apply multiple general cleanups to permissions
Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65158 Reviewed-By: Xuguang Mei <meixuguang@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent ac920e0 commit 521aaf1

23 files changed

Lines changed: 98 additions & 99 deletions

‎src/env.cc‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,7 @@ Environment::Environment(IsolateData* isolate_data,
954954

955955
if (options_->permission || options_->permission_audit) {
956956
permission()->EnablePermissions();
957+
staticconst std::array args = {std::string("*")};
957958
if (options_->permission_audit) {
958959
permission()->EnableWarningOnly();
959960
}
@@ -962,29 +963,29 @@ Environment::Environment(IsolateData* isolate_data,
962963
// unless explicitly allowed by the user
963964
if (!options_->allow_addons) {
964965
options_->allow_native_addons = false;
965-
permission()->Apply(this, {"*"}, permission::PermissionScope::kAddon);
966+
permission()->Apply(this, args, permission::PermissionScope::kAddon);
966967
}
967968
if (!options_->allow_inspector) {
968969
flags_ = flags_ | EnvironmentFlags::kNoCreateInspector;
969-
permission()->Apply(this, {"*"}, permission::PermissionScope::kInspector);
970+
permission()->Apply(this, args, permission::PermissionScope::kInspector);
970971
}
971972
if (!options_->allow_child_process) {
972973
permission()->Apply(
973-
this, {"*"}, permission::PermissionScope::kChildProcess);
974+
this, args, permission::PermissionScope::kChildProcess);
974975
}
975976
if (!options_->allow_ffi) {
976-
permission()->Apply(this, {"*"}, permission::PermissionScope::kFFI);
977+
permission()->Apply(this, args, permission::PermissionScope::kFFI);
977978
}
978979
if (!options_->allow_openssl_store) {
979980
permission()->Apply(
980-
this, {"*"}, permission::PermissionScope::kOpenSSLStore);
981+
this, args, permission::PermissionScope::kOpenSSLStore);
981982
}
982983
if (!options_->allow_worker_threads) {
983984
permission()->Apply(
984-
this, {"*"}, permission::PermissionScope::kWorkerThreads);
985+
this, args, permission::PermissionScope::kWorkerThreads);
985986
}
986987
if (!options_->allow_wasi) {
987-
permission()->Apply(this, {"*"}, permission::PermissionScope::kWASI);
988+
permission()->Apply(this, args, permission::PermissionScope::kWASI);
988989
}
989990

990991
// Implicit allow entrypoint to kFileSystemRead
@@ -1019,7 +1020,7 @@ Environment::Environment(IsolateData* isolate_data,
10191020
}
10201021

10211022
if (options_->allow_net) {
1022-
permission()->Apply(this, {"*"}, permission::PermissionScope::kNet);
1023+
permission()->Apply(this, args, permission::PermissionScope::kNet);
10231024
}
10241025
}
10251026
}

‎src/node_diagnostics_channel.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ BaseObjectPtr<Channel> Channel::Get(Environment* env, std::string_view name) {
223223
HandleScope handle_scope(isolate);
224224
Local<Context> context = env->context();
225225
Local<Value> argv[] = {
226-
ToV8Value(context, name).ToLocalChecked(),
227-
Integer::NewFromUnsigned(isolate, index),
226+
ToV8Value(context, name).ToLocalChecked(),
227+
Integer::NewFromUnsigned(isolate, index),
228228
};
229229
Local<Value> result;
230230
if (binding->link_callback_.Get(isolate)

‎src/permission/addon_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ namespace permission {
99
// Currently, Addon manage a single state
1010
// Once denied, it's always denied
1111
voidAddonPermission::Apply(Environment* env,
12-
conststd::vector<std::string>& allow,
12+
std::span<conststd::string> allow,
1313
PermissionScope scope) {
1414
deny_all_ = true;
1515
}
1616

1717
voidAddonPermission::Drop(Environment* env,
1818
PermissionScope scope,
19-
conststd::string_view& param) {
19+
std::string_view param) {
2020
deny_all_ = true;
2121
}
2222

2323
boolAddonPermission::is_granted(Environment* env,
2424
PermissionScope perm,
25-
conststd::string_view& param) const {
25+
std::string_view param) const {
2626
return deny_all_ == false;
2727
}
2828

‎src/permission/addon_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classAddonPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_;

‎src/permission/child_process_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ namespace permission {
1010
// Currently, ChildProcess manage a single state
1111
// Once denied, it's always denied
1212
voidChildProcessPermission::Apply(Environment* env,
13-
conststd::vector<std::string>& allow,
13+
std::span<conststd::string> allow,
1414
PermissionScope scope) {
1515
deny_all_ = true;
1616
}
1717

1818
voidChildProcessPermission::Drop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param) {
20+
std::string_view param) {
2121
deny_all_ = true;
2222
}
2323

2424
boolChildProcessPermission::is_granted(Environment* env,
2525
PermissionScope perm,
26-
conststd::string_view& param) const {
26+
std::string_view param) const {
2727
return deny_all_ == false;
2828
}
2929

‎src/permission/child_process_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classChildProcessPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_;

‎src/permission/ffi_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ namespace permission {
99

1010
// Currently, FFIPermission manages a single global deny state for FFI.
1111
voidFFIPermission::Apply(Environment* env,
12-
conststd::vector<std::string>& allow,
12+
std::span<conststd::string> allow,
1313
PermissionScope scope) {
1414
deny_all_ = true;
1515
}
1616

1717
voidFFIPermission::Drop(Environment* env,
1818
PermissionScope scope,
19-
conststd::string_view& param) {
19+
std::string_view param) {
2020
deny_all_ = true;
2121
}
2222

2323
boolFFIPermission::is_granted(Environment* env,
2424
PermissionScope perm,
25-
conststd::string_view& param) const {
25+
std::string_view param) const {
2626
return perm != PermissionScope::kFFI || !deny_all_;
2727
}
2828

‎src/permission/ffi_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classFFIPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_ = false;

‎src/permission/fs_permission.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void FreeRecursivelyNode(
5252
boolis_tree_granted(
5353
node::Environment* env,
5454
const node::permission::FSPermission::RadixTree* granted_tree,
55-
conststd::string_view& param) {
55+
std::string_view param) {
5656
std::string resolved_param = node::PathResolve(env, {param});
5757
#ifdef _WIN32
5858
// Remove leading "\\?\" from UNC path
@@ -137,7 +137,7 @@ namespace permission {
137137
// allow = '*'
138138
// allow = '/tmp/,/home/example.js'
139139
voidFSPermission::Apply(Environment* env,
140-
conststd::vector<std::string>& allow,
140+
std::span<conststd::string> allow,
141141
PermissionScope scope) {
142142
for (const std::string& res : allow) {
143143
if (res == "*") {
@@ -156,7 +156,7 @@ void FSPermission::Apply(Environment* env,
156156

157157
voidFSPermission::Drop(Environment* env,
158158
PermissionScope scope,
159-
conststd::string_view& param) {
159+
std::string_view param) {
160160
if (param.empty()) {
161161
// Drop all access for this scope
162162
if (scope == PermissionScope::kFileSystemRead ||
@@ -250,7 +250,7 @@ void FSPermission::GrantAccess(PermissionScope perm, const std::string& res) {
250250

251251
boolFSPermission::is_granted(Environment* env,
252252
PermissionScope perm,
253-
conststd::string_view& param = "") const {
253+
std::string_view param = "") const {
254254
switch (perm) {
255255
case PermissionScope::kFileSystem:
256256
return allow_all_in_ && allow_all_out_;
@@ -287,7 +287,7 @@ void FSPermission::RadixTree::Clear() {
287287
root_node_->is_leaf = false;
288288
}
289289

290-
boolFSPermission::RadixTree::Lookup(conststd::string_view& s,
290+
boolFSPermission::RadixTree::Lookup(std::string_view s,
291291
bool when_empty_return) const {
292292
FSPermission::RadixTree::Node* current_node = root_node_;
293293
if (current_node->children.empty()) {

‎src/permission/fs_permission.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ namespace permission {
1616
classFSPermissionfinal : public PermissionBase {
1717
public:
1818
voidApply(Environment* env,
19-
conststd::vector<std::string>& allow,
19+
std::span<conststd::string> allow,
2020
PermissionScope scope) override;
2121
voidDrop(Environment* env,
2222
PermissionScope scope,
23-
conststd::string_view& param = "") override;
23+
std::string_view param) override;
2424
boolis_granted(Environment* env,
2525
PermissionScope perm,
26-
conststd::string_view& param) constoverride;
26+
std::string_view param) constoverride;
2727

2828
structRadixTree {
2929
structNode {
@@ -146,8 +146,8 @@ class FSPermission final : public PermissionBase {
146146
~RadixTree();
147147
voidInsert(const std::string& s);
148148
voidClear();
149-
boolLookup(conststd::string_view& s) const { returnLookup(s, false); }
150-
boolLookup(conststd::string_view& s, bool when_empty_return) const;
149+
boolLookup(std::string_view s) const { returnLookup(s, false); }
150+
boolLookup(std::string_view s, bool when_empty_return) const;
151151

152152
private:
153153
Node* root_node_;

0 commit comments

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

Commit 521aaf1

Browse files
jasnelladuh95
authored andcommitted
src: apply multiple general cleanups to permissions
Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65158 Reviewed-By: Xuguang Mei <meixuguang@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent ac920e0 commit 521aaf1

23 files changed

Lines changed: 98 additions & 99 deletions

‎src/env.cc‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,7 @@ Environment::Environment(IsolateData* isolate_data,
954954

955955
if (options_->permission || options_->permission_audit) {
956956
permission()->EnablePermissions();
957+
staticconst std::array args = {std::string("*")};
957958
if (options_->permission_audit) {
958959
permission()->EnableWarningOnly();
959960
}
@@ -962,29 +963,29 @@ Environment::Environment(IsolateData* isolate_data,
962963
// unless explicitly allowed by the user
963964
if (!options_->allow_addons) {
964965
options_->allow_native_addons = false;
965-
permission()->Apply(this, {"*"}, permission::PermissionScope::kAddon);
966+
permission()->Apply(this, args, permission::PermissionScope::kAddon);
966967
}
967968
if (!options_->allow_inspector) {
968969
flags_ = flags_ | EnvironmentFlags::kNoCreateInspector;
969-
permission()->Apply(this, {"*"}, permission::PermissionScope::kInspector);
970+
permission()->Apply(this, args, permission::PermissionScope::kInspector);
970971
}
971972
if (!options_->allow_child_process) {
972973
permission()->Apply(
973-
this, {"*"}, permission::PermissionScope::kChildProcess);
974+
this, args, permission::PermissionScope::kChildProcess);
974975
}
975976
if (!options_->allow_ffi) {
976-
permission()->Apply(this, {"*"}, permission::PermissionScope::kFFI);
977+
permission()->Apply(this, args, permission::PermissionScope::kFFI);
977978
}
978979
if (!options_->allow_openssl_store) {
979980
permission()->Apply(
980-
this, {"*"}, permission::PermissionScope::kOpenSSLStore);
981+
this, args, permission::PermissionScope::kOpenSSLStore);
981982
}
982983
if (!options_->allow_worker_threads) {
983984
permission()->Apply(
984-
this, {"*"}, permission::PermissionScope::kWorkerThreads);
985+
this, args, permission::PermissionScope::kWorkerThreads);
985986
}
986987
if (!options_->allow_wasi) {
987-
permission()->Apply(this, {"*"}, permission::PermissionScope::kWASI);
988+
permission()->Apply(this, args, permission::PermissionScope::kWASI);
988989
}
989990

990991
// Implicit allow entrypoint to kFileSystemRead
@@ -1019,7 +1020,7 @@ Environment::Environment(IsolateData* isolate_data,
10191020
}
10201021

10211022
if (options_->allow_net) {
1022-
permission()->Apply(this, {"*"}, permission::PermissionScope::kNet);
1023+
permission()->Apply(this, args, permission::PermissionScope::kNet);
10231024
}
10241025
}
10251026
}

‎src/node_diagnostics_channel.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ BaseObjectPtr<Channel> Channel::Get(Environment* env, std::string_view name) {
223223
HandleScope handle_scope(isolate);
224224
Local<Context> context = env->context();
225225
Local<Value> argv[] = {
226-
ToV8Value(context, name).ToLocalChecked(),
227-
Integer::NewFromUnsigned(isolate, index),
226+
ToV8Value(context, name).ToLocalChecked(),
227+
Integer::NewFromUnsigned(isolate, index),
228228
};
229229
Local<Value> result;
230230
if (binding->link_callback_.Get(isolate)

‎src/permission/addon_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ namespace permission {
99
// Currently, Addon manage a single state
1010
// Once denied, it's always denied
1111
voidAddonPermission::Apply(Environment* env,
12-
conststd::vector<std::string>& allow,
12+
std::span<conststd::string> allow,
1313
PermissionScope scope) {
1414
deny_all_ = true;
1515
}
1616

1717
voidAddonPermission::Drop(Environment* env,
1818
PermissionScope scope,
19-
conststd::string_view& param) {
19+
std::string_view param) {
2020
deny_all_ = true;
2121
}
2222

2323
boolAddonPermission::is_granted(Environment* env,
2424
PermissionScope perm,
25-
conststd::string_view& param) const {
25+
std::string_view param) const {
2626
return deny_all_ == false;
2727
}
2828

‎src/permission/addon_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classAddonPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_;

‎src/permission/child_process_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ namespace permission {
1010
// Currently, ChildProcess manage a single state
1111
// Once denied, it's always denied
1212
voidChildProcessPermission::Apply(Environment* env,
13-
conststd::vector<std::string>& allow,
13+
std::span<conststd::string> allow,
1414
PermissionScope scope) {
1515
deny_all_ = true;
1616
}
1717

1818
voidChildProcessPermission::Drop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param) {
20+
std::string_view param) {
2121
deny_all_ = true;
2222
}
2323

2424
boolChildProcessPermission::is_granted(Environment* env,
2525
PermissionScope perm,
26-
conststd::string_view& param) const {
26+
std::string_view param) const {
2727
return deny_all_ == false;
2828
}
2929

‎src/permission/child_process_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classChildProcessPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_;

‎src/permission/ffi_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ namespace permission {
99

1010
// Currently, FFIPermission manages a single global deny state for FFI.
1111
voidFFIPermission::Apply(Environment* env,
12-
conststd::vector<std::string>& allow,
12+
std::span<conststd::string> allow,
1313
PermissionScope scope) {
1414
deny_all_ = true;
1515
}
1616

1717
voidFFIPermission::Drop(Environment* env,
1818
PermissionScope scope,
19-
conststd::string_view& param) {
19+
std::string_view param) {
2020
deny_all_ = true;
2121
}
2222

2323
boolFFIPermission::is_granted(Environment* env,
2424
PermissionScope perm,
25-
conststd::string_view& param) const {
25+
std::string_view param) const {
2626
return perm != PermissionScope::kFFI || !deny_all_;
2727
}
2828

‎src/permission/ffi_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classFFIPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_ = false;

‎src/permission/fs_permission.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void FreeRecursivelyNode(
5252
boolis_tree_granted(
5353
node::Environment* env,
5454
const node::permission::FSPermission::RadixTree* granted_tree,
55-
conststd::string_view& param) {
55+
std::string_view param) {
5656
std::string resolved_param = node::PathResolve(env, {param});
5757
#ifdef _WIN32
5858
// Remove leading "\\?\" from UNC path
@@ -137,7 +137,7 @@ namespace permission {
137137
// allow = '*'
138138
// allow = '/tmp/,/home/example.js'
139139
voidFSPermission::Apply(Environment* env,
140-
conststd::vector<std::string>& allow,
140+
std::span<conststd::string> allow,
141141
PermissionScope scope) {
142142
for (const std::string& res : allow) {
143143
if (res == "*") {
@@ -156,7 +156,7 @@ void FSPermission::Apply(Environment* env,
156156

157157
voidFSPermission::Drop(Environment* env,
158158
PermissionScope scope,
159-
conststd::string_view& param) {
159+
std::string_view param) {
160160
if (param.empty()) {
161161
// Drop all access for this scope
162162
if (scope == PermissionScope::kFileSystemRead ||
@@ -250,7 +250,7 @@ void FSPermission::GrantAccess(PermissionScope perm, const std::string& res) {
250250

251251
boolFSPermission::is_granted(Environment* env,
252252
PermissionScope perm,
253-
conststd::string_view& param = "") const {
253+
std::string_view param = "") const {
254254
switch (perm) {
255255
case PermissionScope::kFileSystem:
256256
return allow_all_in_ && allow_all_out_;
@@ -287,7 +287,7 @@ void FSPermission::RadixTree::Clear() {
287287
root_node_->is_leaf = false;
288288
}
289289

290-
boolFSPermission::RadixTree::Lookup(conststd::string_view& s,
290+
boolFSPermission::RadixTree::Lookup(std::string_view s,
291291
bool when_empty_return) const {
292292
FSPermission::RadixTree::Node* current_node = root_node_;
293293
if (current_node->children.empty()) {

‎src/permission/fs_permission.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ namespace permission {
1616
classFSPermissionfinal : public PermissionBase {
1717
public:
1818
voidApply(Environment* env,
19-
conststd::vector<std::string>& allow,
19+
std::span<conststd::string> allow,
2020
PermissionScope scope) override;
2121
voidDrop(Environment* env,
2222
PermissionScope scope,
23-
conststd::string_view& param = "") override;
23+
std::string_view param) override;
2424
boolis_granted(Environment* env,
2525
PermissionScope perm,
26-
conststd::string_view& param) constoverride;
26+
std::string_view param) constoverride;
2727

2828
structRadixTree {
2929
structNode {
@@ -146,8 +146,8 @@ class FSPermission final : public PermissionBase {
146146
~RadixTree();
147147
voidInsert(const std::string& s);
148148
voidClear();
149-
boolLookup(conststd::string_view& s) const { returnLookup(s, false); }
150-
boolLookup(conststd::string_view& s, bool when_empty_return) const;
149+
boolLookup(std::string_view s) const { returnLookup(s, false); }
150+
boolLookup(std::string_view s, bool when_empty_return) const;
151151

152152
private:
153153
Node* root_node_;

0 commit comments

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

Commit 521aaf1

Browse files
jasnelladuh95
authored andcommitted
src: apply multiple general cleanups to permissions
Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65158 Reviewed-By: Xuguang Mei <meixuguang@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent ac920e0 commit 521aaf1

23 files changed

Lines changed: 98 additions & 99 deletions

‎src/env.cc‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,7 @@ Environment::Environment(IsolateData* isolate_data,
954954

955955
if (options_->permission || options_->permission_audit) {
956956
permission()->EnablePermissions();
957+
staticconst std::array args = {std::string("*")};
957958
if (options_->permission_audit) {
958959
permission()->EnableWarningOnly();
959960
}
@@ -962,29 +963,29 @@ Environment::Environment(IsolateData* isolate_data,
962963
// unless explicitly allowed by the user
963964
if (!options_->allow_addons) {
964965
options_->allow_native_addons = false;
965-
permission()->Apply(this, {"*"}, permission::PermissionScope::kAddon);
966+
permission()->Apply(this, args, permission::PermissionScope::kAddon);
966967
}
967968
if (!options_->allow_inspector) {
968969
flags_ = flags_ | EnvironmentFlags::kNoCreateInspector;
969-
permission()->Apply(this, {"*"}, permission::PermissionScope::kInspector);
970+
permission()->Apply(this, args, permission::PermissionScope::kInspector);
970971
}
971972
if (!options_->allow_child_process) {
972973
permission()->Apply(
973-
this, {"*"}, permission::PermissionScope::kChildProcess);
974+
this, args, permission::PermissionScope::kChildProcess);
974975
}
975976
if (!options_->allow_ffi) {
976-
permission()->Apply(this, {"*"}, permission::PermissionScope::kFFI);
977+
permission()->Apply(this, args, permission::PermissionScope::kFFI);
977978
}
978979
if (!options_->allow_openssl_store) {
979980
permission()->Apply(
980-
this, {"*"}, permission::PermissionScope::kOpenSSLStore);
981+
this, args, permission::PermissionScope::kOpenSSLStore);
981982
}
982983
if (!options_->allow_worker_threads) {
983984
permission()->Apply(
984-
this, {"*"}, permission::PermissionScope::kWorkerThreads);
985+
this, args, permission::PermissionScope::kWorkerThreads);
985986
}
986987
if (!options_->allow_wasi) {
987-
permission()->Apply(this, {"*"}, permission::PermissionScope::kWASI);
988+
permission()->Apply(this, args, permission::PermissionScope::kWASI);
988989
}
989990

990991
// Implicit allow entrypoint to kFileSystemRead
@@ -1019,7 +1020,7 @@ Environment::Environment(IsolateData* isolate_data,
10191020
}
10201021

10211022
if (options_->allow_net) {
1022-
permission()->Apply(this, {"*"}, permission::PermissionScope::kNet);
1023+
permission()->Apply(this, args, permission::PermissionScope::kNet);
10231024
}
10241025
}
10251026
}

‎src/node_diagnostics_channel.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ BaseObjectPtr<Channel> Channel::Get(Environment* env, std::string_view name) {
223223
HandleScope handle_scope(isolate);
224224
Local<Context> context = env->context();
225225
Local<Value> argv[] = {
226-
ToV8Value(context, name).ToLocalChecked(),
227-
Integer::NewFromUnsigned(isolate, index),
226+
ToV8Value(context, name).ToLocalChecked(),
227+
Integer::NewFromUnsigned(isolate, index),
228228
};
229229
Local<Value> result;
230230
if (binding->link_callback_.Get(isolate)

‎src/permission/addon_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ namespace permission {
99
// Currently, Addon manage a single state
1010
// Once denied, it's always denied
1111
voidAddonPermission::Apply(Environment* env,
12-
conststd::vector<std::string>& allow,
12+
std::span<conststd::string> allow,
1313
PermissionScope scope) {
1414
deny_all_ = true;
1515
}
1616

1717
voidAddonPermission::Drop(Environment* env,
1818
PermissionScope scope,
19-
conststd::string_view& param) {
19+
std::string_view param) {
2020
deny_all_ = true;
2121
}
2222

2323
boolAddonPermission::is_granted(Environment* env,
2424
PermissionScope perm,
25-
conststd::string_view& param) const {
25+
std::string_view param) const {
2626
return deny_all_ == false;
2727
}
2828

‎src/permission/addon_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classAddonPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_;

‎src/permission/child_process_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ namespace permission {
1010
// Currently, ChildProcess manage a single state
1111
// Once denied, it's always denied
1212
voidChildProcessPermission::Apply(Environment* env,
13-
conststd::vector<std::string>& allow,
13+
std::span<conststd::string> allow,
1414
PermissionScope scope) {
1515
deny_all_ = true;
1616
}
1717

1818
voidChildProcessPermission::Drop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param) {
20+
std::string_view param) {
2121
deny_all_ = true;
2222
}
2323

2424
boolChildProcessPermission::is_granted(Environment* env,
2525
PermissionScope perm,
26-
conststd::string_view& param) const {
26+
std::string_view param) const {
2727
return deny_all_ == false;
2828
}
2929

‎src/permission/child_process_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classChildProcessPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_;

‎src/permission/ffi_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ namespace permission {
99

1010
// Currently, FFIPermission manages a single global deny state for FFI.
1111
voidFFIPermission::Apply(Environment* env,
12-
conststd::vector<std::string>& allow,
12+
std::span<conststd::string> allow,
1313
PermissionScope scope) {
1414
deny_all_ = true;
1515
}
1616

1717
voidFFIPermission::Drop(Environment* env,
1818
PermissionScope scope,
19-
conststd::string_view& param) {
19+
std::string_view param) {
2020
deny_all_ = true;
2121
}
2222

2323
boolFFIPermission::is_granted(Environment* env,
2424
PermissionScope perm,
25-
conststd::string_view& param) const {
25+
std::string_view param) const {
2626
return perm != PermissionScope::kFFI || !deny_all_;
2727
}
2828

‎src/permission/ffi_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classFFIPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_ = false;

‎src/permission/fs_permission.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void FreeRecursivelyNode(
5252
boolis_tree_granted(
5353
node::Environment* env,
5454
const node::permission::FSPermission::RadixTree* granted_tree,
55-
conststd::string_view& param) {
55+
std::string_view param) {
5656
std::string resolved_param = node::PathResolve(env, {param});
5757
#ifdef _WIN32
5858
// Remove leading "\\?\" from UNC path
@@ -137,7 +137,7 @@ namespace permission {
137137
// allow = '*'
138138
// allow = '/tmp/,/home/example.js'
139139
voidFSPermission::Apply(Environment* env,
140-
conststd::vector<std::string>& allow,
140+
std::span<conststd::string> allow,
141141
PermissionScope scope) {
142142
for (const std::string& res : allow) {
143143
if (res == "*") {
@@ -156,7 +156,7 @@ void FSPermission::Apply(Environment* env,
156156

157157
voidFSPermission::Drop(Environment* env,
158158
PermissionScope scope,
159-
conststd::string_view& param) {
159+
std::string_view param) {
160160
if (param.empty()) {
161161
// Drop all access for this scope
162162
if (scope == PermissionScope::kFileSystemRead ||
@@ -250,7 +250,7 @@ void FSPermission::GrantAccess(PermissionScope perm, const std::string& res) {
250250

251251
boolFSPermission::is_granted(Environment* env,
252252
PermissionScope perm,
253-
conststd::string_view& param = "") const {
253+
std::string_view param = "") const {
254254
switch (perm) {
255255
case PermissionScope::kFileSystem:
256256
return allow_all_in_ && allow_all_out_;
@@ -287,7 +287,7 @@ void FSPermission::RadixTree::Clear() {
287287
root_node_->is_leaf = false;
288288
}
289289

290-
boolFSPermission::RadixTree::Lookup(conststd::string_view& s,
290+
boolFSPermission::RadixTree::Lookup(std::string_view s,
291291
bool when_empty_return) const {
292292
FSPermission::RadixTree::Node* current_node = root_node_;
293293
if (current_node->children.empty()) {

‎src/permission/fs_permission.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ namespace permission {
1616
classFSPermissionfinal : public PermissionBase {
1717
public:
1818
voidApply(Environment* env,
19-
conststd::vector<std::string>& allow,
19+
std::span<conststd::string> allow,
2020
PermissionScope scope) override;
2121
voidDrop(Environment* env,
2222
PermissionScope scope,
23-
conststd::string_view& param = "") override;
23+
std::string_view param) override;
2424
boolis_granted(Environment* env,
2525
PermissionScope perm,
26-
conststd::string_view& param) constoverride;
26+
std::string_view param) constoverride;
2727

2828
structRadixTree {
2929
structNode {
@@ -146,8 +146,8 @@ class FSPermission final : public PermissionBase {
146146
~RadixTree();
147147
voidInsert(const std::string& s);
148148
voidClear();
149-
boolLookup(conststd::string_view& s) const { returnLookup(s, false); }
150-
boolLookup(conststd::string_view& s, bool when_empty_return) const;
149+
boolLookup(std::string_view s) const { returnLookup(s, false); }
150+
boolLookup(std::string_view s, bool when_empty_return) const;
151151

152152
private:
153153
Node* root_node_;

0 commit comments

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

Commit 521aaf1

Browse files
jasnelladuh95
authored andcommitted
src: apply multiple general cleanups to permissions
Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65158 Reviewed-By: Xuguang Mei <meixuguang@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent ac920e0 commit 521aaf1

23 files changed

Lines changed: 98 additions & 99 deletions

‎src/env.cc‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,7 @@ Environment::Environment(IsolateData* isolate_data,
954954

955955
if (options_->permission || options_->permission_audit) {
956956
permission()->EnablePermissions();
957+
staticconst std::array args = {std::string("*")};
957958
if (options_->permission_audit) {
958959
permission()->EnableWarningOnly();
959960
}
@@ -962,29 +963,29 @@ Environment::Environment(IsolateData* isolate_data,
962963
// unless explicitly allowed by the user
963964
if (!options_->allow_addons) {
964965
options_->allow_native_addons = false;
965-
permission()->Apply(this, {"*"}, permission::PermissionScope::kAddon);
966+
permission()->Apply(this, args, permission::PermissionScope::kAddon);
966967
}
967968
if (!options_->allow_inspector) {
968969
flags_ = flags_ | EnvironmentFlags::kNoCreateInspector;
969-
permission()->Apply(this, {"*"}, permission::PermissionScope::kInspector);
970+
permission()->Apply(this, args, permission::PermissionScope::kInspector);
970971
}
971972
if (!options_->allow_child_process) {
972973
permission()->Apply(
973-
this, {"*"}, permission::PermissionScope::kChildProcess);
974+
this, args, permission::PermissionScope::kChildProcess);
974975
}
975976
if (!options_->allow_ffi) {
976-
permission()->Apply(this, {"*"}, permission::PermissionScope::kFFI);
977+
permission()->Apply(this, args, permission::PermissionScope::kFFI);
977978
}
978979
if (!options_->allow_openssl_store) {
979980
permission()->Apply(
980-
this, {"*"}, permission::PermissionScope::kOpenSSLStore);
981+
this, args, permission::PermissionScope::kOpenSSLStore);
981982
}
982983
if (!options_->allow_worker_threads) {
983984
permission()->Apply(
984-
this, {"*"}, permission::PermissionScope::kWorkerThreads);
985+
this, args, permission::PermissionScope::kWorkerThreads);
985986
}
986987
if (!options_->allow_wasi) {
987-
permission()->Apply(this, {"*"}, permission::PermissionScope::kWASI);
988+
permission()->Apply(this, args, permission::PermissionScope::kWASI);
988989
}
989990

990991
// Implicit allow entrypoint to kFileSystemRead
@@ -1019,7 +1020,7 @@ Environment::Environment(IsolateData* isolate_data,
10191020
}
10201021

10211022
if (options_->allow_net) {
1022-
permission()->Apply(this, {"*"}, permission::PermissionScope::kNet);
1023+
permission()->Apply(this, args, permission::PermissionScope::kNet);
10231024
}
10241025
}
10251026
}

‎src/node_diagnostics_channel.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ BaseObjectPtr<Channel> Channel::Get(Environment* env, std::string_view name) {
223223
HandleScope handle_scope(isolate);
224224
Local<Context> context = env->context();
225225
Local<Value> argv[] = {
226-
ToV8Value(context, name).ToLocalChecked(),
227-
Integer::NewFromUnsigned(isolate, index),
226+
ToV8Value(context, name).ToLocalChecked(),
227+
Integer::NewFromUnsigned(isolate, index),
228228
};
229229
Local<Value> result;
230230
if (binding->link_callback_.Get(isolate)

‎src/permission/addon_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ namespace permission {
99
// Currently, Addon manage a single state
1010
// Once denied, it's always denied
1111
voidAddonPermission::Apply(Environment* env,
12-
conststd::vector<std::string>& allow,
12+
std::span<conststd::string> allow,
1313
PermissionScope scope) {
1414
deny_all_ = true;
1515
}
1616

1717
voidAddonPermission::Drop(Environment* env,
1818
PermissionScope scope,
19-
conststd::string_view& param) {
19+
std::string_view param) {
2020
deny_all_ = true;
2121
}
2222

2323
boolAddonPermission::is_granted(Environment* env,
2424
PermissionScope perm,
25-
conststd::string_view& param) const {
25+
std::string_view param) const {
2626
return deny_all_ == false;
2727
}
2828

‎src/permission/addon_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classAddonPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_;

‎src/permission/child_process_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ namespace permission {
1010
// Currently, ChildProcess manage a single state
1111
// Once denied, it's always denied
1212
voidChildProcessPermission::Apply(Environment* env,
13-
conststd::vector<std::string>& allow,
13+
std::span<conststd::string> allow,
1414
PermissionScope scope) {
1515
deny_all_ = true;
1616
}
1717

1818
voidChildProcessPermission::Drop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param) {
20+
std::string_view param) {
2121
deny_all_ = true;
2222
}
2323

2424
boolChildProcessPermission::is_granted(Environment* env,
2525
PermissionScope perm,
26-
conststd::string_view& param) const {
26+
std::string_view param) const {
2727
return deny_all_ == false;
2828
}
2929

‎src/permission/child_process_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classChildProcessPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_;

‎src/permission/ffi_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ namespace permission {
99

1010
// Currently, FFIPermission manages a single global deny state for FFI.
1111
voidFFIPermission::Apply(Environment* env,
12-
conststd::vector<std::string>& allow,
12+
std::span<conststd::string> allow,
1313
PermissionScope scope) {
1414
deny_all_ = true;
1515
}
1616

1717
voidFFIPermission::Drop(Environment* env,
1818
PermissionScope scope,
19-
conststd::string_view& param) {
19+
std::string_view param) {
2020
deny_all_ = true;
2121
}
2222

2323
boolFFIPermission::is_granted(Environment* env,
2424
PermissionScope perm,
25-
conststd::string_view& param) const {
25+
std::string_view param) const {
2626
return perm != PermissionScope::kFFI || !deny_all_;
2727
}
2828

‎src/permission/ffi_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classFFIPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_ = false;

‎src/permission/fs_permission.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void FreeRecursivelyNode(
5252
boolis_tree_granted(
5353
node::Environment* env,
5454
const node::permission::FSPermission::RadixTree* granted_tree,
55-
conststd::string_view& param) {
55+
std::string_view param) {
5656
std::string resolved_param = node::PathResolve(env, {param});
5757
#ifdef _WIN32
5858
// Remove leading "\\?\" from UNC path
@@ -137,7 +137,7 @@ namespace permission {
137137
// allow = '*'
138138
// allow = '/tmp/,/home/example.js'
139139
voidFSPermission::Apply(Environment* env,
140-
conststd::vector<std::string>& allow,
140+
std::span<conststd::string> allow,
141141
PermissionScope scope) {
142142
for (const std::string& res : allow) {
143143
if (res == "*") {
@@ -156,7 +156,7 @@ void FSPermission::Apply(Environment* env,
156156

157157
voidFSPermission::Drop(Environment* env,
158158
PermissionScope scope,
159-
conststd::string_view& param) {
159+
std::string_view param) {
160160
if (param.empty()) {
161161
// Drop all access for this scope
162162
if (scope == PermissionScope::kFileSystemRead ||
@@ -250,7 +250,7 @@ void FSPermission::GrantAccess(PermissionScope perm, const std::string& res) {
250250

251251
boolFSPermission::is_granted(Environment* env,
252252
PermissionScope perm,
253-
conststd::string_view& param = "") const {
253+
std::string_view param = "") const {
254254
switch (perm) {
255255
case PermissionScope::kFileSystem:
256256
return allow_all_in_ && allow_all_out_;
@@ -287,7 +287,7 @@ void FSPermission::RadixTree::Clear() {
287287
root_node_->is_leaf = false;
288288
}
289289

290-
boolFSPermission::RadixTree::Lookup(conststd::string_view& s,
290+
boolFSPermission::RadixTree::Lookup(std::string_view s,
291291
bool when_empty_return) const {
292292
FSPermission::RadixTree::Node* current_node = root_node_;
293293
if (current_node->children.empty()) {

‎src/permission/fs_permission.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ namespace permission {
1616
classFSPermissionfinal : public PermissionBase {
1717
public:
1818
voidApply(Environment* env,
19-
conststd::vector<std::string>& allow,
19+
std::span<conststd::string> allow,
2020
PermissionScope scope) override;
2121
voidDrop(Environment* env,
2222
PermissionScope scope,
23-
conststd::string_view& param = "") override;
23+
std::string_view param) override;
2424
boolis_granted(Environment* env,
2525
PermissionScope perm,
26-
conststd::string_view& param) constoverride;
26+
std::string_view param) constoverride;
2727

2828
structRadixTree {
2929
structNode {
@@ -146,8 +146,8 @@ class FSPermission final : public PermissionBase {
146146
~RadixTree();
147147
voidInsert(const std::string& s);
148148
voidClear();
149-
boolLookup(conststd::string_view& s) const { returnLookup(s, false); }
150-
boolLookup(conststd::string_view& s, bool when_empty_return) const;
149+
boolLookup(std::string_view s) const { returnLookup(s, false); }
150+
boolLookup(std::string_view s, bool when_empty_return) const;
151151

152152
private:
153153
Node* root_node_;

0 commit comments

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

Commit 521aaf1

Browse files
jasnelladuh95
authored andcommitted
src: apply multiple general cleanups to permissions
Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65158 Reviewed-By: Xuguang Mei <meixuguang@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent ac920e0 commit 521aaf1

23 files changed

Lines changed: 98 additions & 99 deletions

‎src/env.cc‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,7 @@ Environment::Environment(IsolateData* isolate_data,
954954

955955
if (options_->permission || options_->permission_audit) {
956956
permission()->EnablePermissions();
957+
staticconst std::array args = {std::string("*")};
957958
if (options_->permission_audit) {
958959
permission()->EnableWarningOnly();
959960
}
@@ -962,29 +963,29 @@ Environment::Environment(IsolateData* isolate_data,
962963
// unless explicitly allowed by the user
963964
if (!options_->allow_addons) {
964965
options_->allow_native_addons = false;
965-
permission()->Apply(this, {"*"}, permission::PermissionScope::kAddon);
966+
permission()->Apply(this, args, permission::PermissionScope::kAddon);
966967
}
967968
if (!options_->allow_inspector) {
968969
flags_ = flags_ | EnvironmentFlags::kNoCreateInspector;
969-
permission()->Apply(this, {"*"}, permission::PermissionScope::kInspector);
970+
permission()->Apply(this, args, permission::PermissionScope::kInspector);
970971
}
971972
if (!options_->allow_child_process) {
972973
permission()->Apply(
973-
this, {"*"}, permission::PermissionScope::kChildProcess);
974+
this, args, permission::PermissionScope::kChildProcess);
974975
}
975976
if (!options_->allow_ffi) {
976-
permission()->Apply(this, {"*"}, permission::PermissionScope::kFFI);
977+
permission()->Apply(this, args, permission::PermissionScope::kFFI);
977978
}
978979
if (!options_->allow_openssl_store) {
979980
permission()->Apply(
980-
this, {"*"}, permission::PermissionScope::kOpenSSLStore);
981+
this, args, permission::PermissionScope::kOpenSSLStore);
981982
}
982983
if (!options_->allow_worker_threads) {
983984
permission()->Apply(
984-
this, {"*"}, permission::PermissionScope::kWorkerThreads);
985+
this, args, permission::PermissionScope::kWorkerThreads);
985986
}
986987
if (!options_->allow_wasi) {
987-
permission()->Apply(this, {"*"}, permission::PermissionScope::kWASI);
988+
permission()->Apply(this, args, permission::PermissionScope::kWASI);
988989
}
989990

990991
// Implicit allow entrypoint to kFileSystemRead
@@ -1019,7 +1020,7 @@ Environment::Environment(IsolateData* isolate_data,
10191020
}
10201021

10211022
if (options_->allow_net) {
1022-
permission()->Apply(this, {"*"}, permission::PermissionScope::kNet);
1023+
permission()->Apply(this, args, permission::PermissionScope::kNet);
10231024
}
10241025
}
10251026
}

‎src/node_diagnostics_channel.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ BaseObjectPtr<Channel> Channel::Get(Environment* env, std::string_view name) {
223223
HandleScope handle_scope(isolate);
224224
Local<Context> context = env->context();
225225
Local<Value> argv[] = {
226-
ToV8Value(context, name).ToLocalChecked(),
227-
Integer::NewFromUnsigned(isolate, index),
226+
ToV8Value(context, name).ToLocalChecked(),
227+
Integer::NewFromUnsigned(isolate, index),
228228
};
229229
Local<Value> result;
230230
if (binding->link_callback_.Get(isolate)

‎src/permission/addon_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ namespace permission {
99
// Currently, Addon manage a single state
1010
// Once denied, it's always denied
1111
voidAddonPermission::Apply(Environment* env,
12-
conststd::vector<std::string>& allow,
12+
std::span<conststd::string> allow,
1313
PermissionScope scope) {
1414
deny_all_ = true;
1515
}
1616

1717
voidAddonPermission::Drop(Environment* env,
1818
PermissionScope scope,
19-
conststd::string_view& param) {
19+
std::string_view param) {
2020
deny_all_ = true;
2121
}
2222

2323
boolAddonPermission::is_granted(Environment* env,
2424
PermissionScope perm,
25-
conststd::string_view& param) const {
25+
std::string_view param) const {
2626
return deny_all_ == false;
2727
}
2828

‎src/permission/addon_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classAddonPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_;

‎src/permission/child_process_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ namespace permission {
1010
// Currently, ChildProcess manage a single state
1111
// Once denied, it's always denied
1212
voidChildProcessPermission::Apply(Environment* env,
13-
conststd::vector<std::string>& allow,
13+
std::span<conststd::string> allow,
1414
PermissionScope scope) {
1515
deny_all_ = true;
1616
}
1717

1818
voidChildProcessPermission::Drop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param) {
20+
std::string_view param) {
2121
deny_all_ = true;
2222
}
2323

2424
boolChildProcessPermission::is_granted(Environment* env,
2525
PermissionScope perm,
26-
conststd::string_view& param) const {
26+
std::string_view param) const {
2727
return deny_all_ == false;
2828
}
2929

‎src/permission/child_process_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classChildProcessPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_;

‎src/permission/ffi_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ namespace permission {
99

1010
// Currently, FFIPermission manages a single global deny state for FFI.
1111
voidFFIPermission::Apply(Environment* env,
12-
conststd::vector<std::string>& allow,
12+
std::span<conststd::string> allow,
1313
PermissionScope scope) {
1414
deny_all_ = true;
1515
}
1616

1717
voidFFIPermission::Drop(Environment* env,
1818
PermissionScope scope,
19-
conststd::string_view& param) {
19+
std::string_view param) {
2020
deny_all_ = true;
2121
}
2222

2323
boolFFIPermission::is_granted(Environment* env,
2424
PermissionScope perm,
25-
conststd::string_view& param) const {
25+
std::string_view param) const {
2626
return perm != PermissionScope::kFFI || !deny_all_;
2727
}
2828

‎src/permission/ffi_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classFFIPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_ = false;

‎src/permission/fs_permission.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void FreeRecursivelyNode(
5252
boolis_tree_granted(
5353
node::Environment* env,
5454
const node::permission::FSPermission::RadixTree* granted_tree,
55-
conststd::string_view& param) {
55+
std::string_view param) {
5656
std::string resolved_param = node::PathResolve(env, {param});
5757
#ifdef _WIN32
5858
// Remove leading "\\?\" from UNC path
@@ -137,7 +137,7 @@ namespace permission {
137137
// allow = '*'
138138
// allow = '/tmp/,/home/example.js'
139139
voidFSPermission::Apply(Environment* env,
140-
conststd::vector<std::string>& allow,
140+
std::span<conststd::string> allow,
141141
PermissionScope scope) {
142142
for (const std::string& res : allow) {
143143
if (res == "*") {
@@ -156,7 +156,7 @@ void FSPermission::Apply(Environment* env,
156156

157157
voidFSPermission::Drop(Environment* env,
158158
PermissionScope scope,
159-
conststd::string_view& param) {
159+
std::string_view param) {
160160
if (param.empty()) {
161161
// Drop all access for this scope
162162
if (scope == PermissionScope::kFileSystemRead ||
@@ -250,7 +250,7 @@ void FSPermission::GrantAccess(PermissionScope perm, const std::string& res) {
250250

251251
boolFSPermission::is_granted(Environment* env,
252252
PermissionScope perm,
253-
conststd::string_view& param = "") const {
253+
std::string_view param = "") const {
254254
switch (perm) {
255255
case PermissionScope::kFileSystem:
256256
return allow_all_in_ && allow_all_out_;
@@ -287,7 +287,7 @@ void FSPermission::RadixTree::Clear() {
287287
root_node_->is_leaf = false;
288288
}
289289

290-
boolFSPermission::RadixTree::Lookup(conststd::string_view& s,
290+
boolFSPermission::RadixTree::Lookup(std::string_view s,
291291
bool when_empty_return) const {
292292
FSPermission::RadixTree::Node* current_node = root_node_;
293293
if (current_node->children.empty()) {

‎src/permission/fs_permission.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ namespace permission {
1616
classFSPermissionfinal : public PermissionBase {
1717
public:
1818
voidApply(Environment* env,
19-
conststd::vector<std::string>& allow,
19+
std::span<conststd::string> allow,
2020
PermissionScope scope) override;
2121
voidDrop(Environment* env,
2222
PermissionScope scope,
23-
conststd::string_view& param = "") override;
23+
std::string_view param) override;
2424
boolis_granted(Environment* env,
2525
PermissionScope perm,
26-
conststd::string_view& param) constoverride;
26+
std::string_view param) constoverride;
2727

2828
structRadixTree {
2929
structNode {
@@ -146,8 +146,8 @@ class FSPermission final : public PermissionBase {
146146
~RadixTree();
147147
voidInsert(const std::string& s);
148148
voidClear();
149-
boolLookup(conststd::string_view& s) const { returnLookup(s, false); }
150-
boolLookup(conststd::string_view& s, bool when_empty_return) const;
149+
boolLookup(std::string_view s) const { returnLookup(s, false); }
150+
boolLookup(std::string_view s, bool when_empty_return) const;
151151

152152
private:
153153
Node* root_node_;

0 commit comments

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

Commit 521aaf1

Browse files
jasnelladuh95
authored andcommitted
src: apply multiple general cleanups to permissions
Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65158 Reviewed-By: Xuguang Mei <meixuguang@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent ac920e0 commit 521aaf1

23 files changed

Lines changed: 98 additions & 99 deletions

‎src/env.cc‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,7 @@ Environment::Environment(IsolateData* isolate_data,
954954

955955
if (options_->permission || options_->permission_audit) {
956956
permission()->EnablePermissions();
957+
staticconst std::array args = {std::string("*")};
957958
if (options_->permission_audit) {
958959
permission()->EnableWarningOnly();
959960
}
@@ -962,29 +963,29 @@ Environment::Environment(IsolateData* isolate_data,
962963
// unless explicitly allowed by the user
963964
if (!options_->allow_addons) {
964965
options_->allow_native_addons = false;
965-
permission()->Apply(this, {"*"}, permission::PermissionScope::kAddon);
966+
permission()->Apply(this, args, permission::PermissionScope::kAddon);
966967
}
967968
if (!options_->allow_inspector) {
968969
flags_ = flags_ | EnvironmentFlags::kNoCreateInspector;
969-
permission()->Apply(this, {"*"}, permission::PermissionScope::kInspector);
970+
permission()->Apply(this, args, permission::PermissionScope::kInspector);
970971
}
971972
if (!options_->allow_child_process) {
972973
permission()->Apply(
973-
this, {"*"}, permission::PermissionScope::kChildProcess);
974+
this, args, permission::PermissionScope::kChildProcess);
974975
}
975976
if (!options_->allow_ffi) {
976-
permission()->Apply(this, {"*"}, permission::PermissionScope::kFFI);
977+
permission()->Apply(this, args, permission::PermissionScope::kFFI);
977978
}
978979
if (!options_->allow_openssl_store) {
979980
permission()->Apply(
980-
this, {"*"}, permission::PermissionScope::kOpenSSLStore);
981+
this, args, permission::PermissionScope::kOpenSSLStore);
981982
}
982983
if (!options_->allow_worker_threads) {
983984
permission()->Apply(
984-
this, {"*"}, permission::PermissionScope::kWorkerThreads);
985+
this, args, permission::PermissionScope::kWorkerThreads);
985986
}
986987
if (!options_->allow_wasi) {
987-
permission()->Apply(this, {"*"}, permission::PermissionScope::kWASI);
988+
permission()->Apply(this, args, permission::PermissionScope::kWASI);
988989
}
989990

990991
// Implicit allow entrypoint to kFileSystemRead
@@ -1019,7 +1020,7 @@ Environment::Environment(IsolateData* isolate_data,
10191020
}
10201021

10211022
if (options_->allow_net) {
1022-
permission()->Apply(this, {"*"}, permission::PermissionScope::kNet);
1023+
permission()->Apply(this, args, permission::PermissionScope::kNet);
10231024
}
10241025
}
10251026
}

‎src/node_diagnostics_channel.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ BaseObjectPtr<Channel> Channel::Get(Environment* env, std::string_view name) {
223223
HandleScope handle_scope(isolate);
224224
Local<Context> context = env->context();
225225
Local<Value> argv[] = {
226-
ToV8Value(context, name).ToLocalChecked(),
227-
Integer::NewFromUnsigned(isolate, index),
226+
ToV8Value(context, name).ToLocalChecked(),
227+
Integer::NewFromUnsigned(isolate, index),
228228
};
229229
Local<Value> result;
230230
if (binding->link_callback_.Get(isolate)

‎src/permission/addon_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ namespace permission {
99
// Currently, Addon manage a single state
1010
// Once denied, it's always denied
1111
voidAddonPermission::Apply(Environment* env,
12-
conststd::vector<std::string>& allow,
12+
std::span<conststd::string> allow,
1313
PermissionScope scope) {
1414
deny_all_ = true;
1515
}
1616

1717
voidAddonPermission::Drop(Environment* env,
1818
PermissionScope scope,
19-
conststd::string_view& param) {
19+
std::string_view param) {
2020
deny_all_ = true;
2121
}
2222

2323
boolAddonPermission::is_granted(Environment* env,
2424
PermissionScope perm,
25-
conststd::string_view& param) const {
25+
std::string_view param) const {
2626
return deny_all_ == false;
2727
}
2828

‎src/permission/addon_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classAddonPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_;

‎src/permission/child_process_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ namespace permission {
1010
// Currently, ChildProcess manage a single state
1111
// Once denied, it's always denied
1212
voidChildProcessPermission::Apply(Environment* env,
13-
conststd::vector<std::string>& allow,
13+
std::span<conststd::string> allow,
1414
PermissionScope scope) {
1515
deny_all_ = true;
1616
}
1717

1818
voidChildProcessPermission::Drop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param) {
20+
std::string_view param) {
2121
deny_all_ = true;
2222
}
2323

2424
boolChildProcessPermission::is_granted(Environment* env,
2525
PermissionScope perm,
26-
conststd::string_view& param) const {
26+
std::string_view param) const {
2727
return deny_all_ == false;
2828
}
2929

‎src/permission/child_process_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classChildProcessPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_;

‎src/permission/ffi_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ namespace permission {
99

1010
// Currently, FFIPermission manages a single global deny state for FFI.
1111
voidFFIPermission::Apply(Environment* env,
12-
conststd::vector<std::string>& allow,
12+
std::span<conststd::string> allow,
1313
PermissionScope scope) {
1414
deny_all_ = true;
1515
}
1616

1717
voidFFIPermission::Drop(Environment* env,
1818
PermissionScope scope,
19-
conststd::string_view& param) {
19+
std::string_view param) {
2020
deny_all_ = true;
2121
}
2222

2323
boolFFIPermission::is_granted(Environment* env,
2424
PermissionScope perm,
25-
conststd::string_view& param) const {
25+
std::string_view param) const {
2626
return perm != PermissionScope::kFFI || !deny_all_;
2727
}
2828

‎src/permission/ffi_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classFFIPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_ = false;

‎src/permission/fs_permission.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void FreeRecursivelyNode(
5252
boolis_tree_granted(
5353
node::Environment* env,
5454
const node::permission::FSPermission::RadixTree* granted_tree,
55-
conststd::string_view& param) {
55+
std::string_view param) {
5656
std::string resolved_param = node::PathResolve(env, {param});
5757
#ifdef _WIN32
5858
// Remove leading "\\?\" from UNC path
@@ -137,7 +137,7 @@ namespace permission {
137137
// allow = '*'
138138
// allow = '/tmp/,/home/example.js'
139139
voidFSPermission::Apply(Environment* env,
140-
conststd::vector<std::string>& allow,
140+
std::span<conststd::string> allow,
141141
PermissionScope scope) {
142142
for (const std::string& res : allow) {
143143
if (res == "*") {
@@ -156,7 +156,7 @@ void FSPermission::Apply(Environment* env,
156156

157157
voidFSPermission::Drop(Environment* env,
158158
PermissionScope scope,
159-
conststd::string_view& param) {
159+
std::string_view param) {
160160
if (param.empty()) {
161161
// Drop all access for this scope
162162
if (scope == PermissionScope::kFileSystemRead ||
@@ -250,7 +250,7 @@ void FSPermission::GrantAccess(PermissionScope perm, const std::string& res) {
250250

251251
boolFSPermission::is_granted(Environment* env,
252252
PermissionScope perm,
253-
conststd::string_view& param = "") const {
253+
std::string_view param = "") const {
254254
switch (perm) {
255255
case PermissionScope::kFileSystem:
256256
return allow_all_in_ && allow_all_out_;
@@ -287,7 +287,7 @@ void FSPermission::RadixTree::Clear() {
287287
root_node_->is_leaf = false;
288288
}
289289

290-
boolFSPermission::RadixTree::Lookup(conststd::string_view& s,
290+
boolFSPermission::RadixTree::Lookup(std::string_view s,
291291
bool when_empty_return) const {
292292
FSPermission::RadixTree::Node* current_node = root_node_;
293293
if (current_node->children.empty()) {

‎src/permission/fs_permission.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ namespace permission {
1616
classFSPermissionfinal : public PermissionBase {
1717
public:
1818
voidApply(Environment* env,
19-
conststd::vector<std::string>& allow,
19+
std::span<conststd::string> allow,
2020
PermissionScope scope) override;
2121
voidDrop(Environment* env,
2222
PermissionScope scope,
23-
conststd::string_view& param = "") override;
23+
std::string_view param) override;
2424
boolis_granted(Environment* env,
2525
PermissionScope perm,
26-
conststd::string_view& param) constoverride;
26+
std::string_view param) constoverride;
2727

2828
structRadixTree {
2929
structNode {
@@ -146,8 +146,8 @@ class FSPermission final : public PermissionBase {
146146
~RadixTree();
147147
voidInsert(const std::string& s);
148148
voidClear();
149-
boolLookup(conststd::string_view& s) const { returnLookup(s, false); }
150-
boolLookup(conststd::string_view& s, bool when_empty_return) const;
149+
boolLookup(std::string_view s) const { returnLookup(s, false); }
150+
boolLookup(std::string_view s, bool when_empty_return) const;
151151

152152
private:
153153
Node* root_node_;

0 commit comments

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

Commit 521aaf1

Browse files
jasnelladuh95
authored andcommitted
src: apply multiple general cleanups to permissions
Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65158 Reviewed-By: Xuguang Mei <meixuguang@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent ac920e0 commit 521aaf1

23 files changed

Lines changed: 98 additions & 99 deletions

‎src/env.cc‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,7 @@ Environment::Environment(IsolateData* isolate_data,
954954

955955
if (options_->permission || options_->permission_audit) {
956956
permission()->EnablePermissions();
957+
staticconst std::array args = {std::string("*")};
957958
if (options_->permission_audit) {
958959
permission()->EnableWarningOnly();
959960
}
@@ -962,29 +963,29 @@ Environment::Environment(IsolateData* isolate_data,
962963
// unless explicitly allowed by the user
963964
if (!options_->allow_addons) {
964965
options_->allow_native_addons = false;
965-
permission()->Apply(this, {"*"}, permission::PermissionScope::kAddon);
966+
permission()->Apply(this, args, permission::PermissionScope::kAddon);
966967
}
967968
if (!options_->allow_inspector) {
968969
flags_ = flags_ | EnvironmentFlags::kNoCreateInspector;
969-
permission()->Apply(this, {"*"}, permission::PermissionScope::kInspector);
970+
permission()->Apply(this, args, permission::PermissionScope::kInspector);
970971
}
971972
if (!options_->allow_child_process) {
972973
permission()->Apply(
973-
this, {"*"}, permission::PermissionScope::kChildProcess);
974+
this, args, permission::PermissionScope::kChildProcess);
974975
}
975976
if (!options_->allow_ffi) {
976-
permission()->Apply(this, {"*"}, permission::PermissionScope::kFFI);
977+
permission()->Apply(this, args, permission::PermissionScope::kFFI);
977978
}
978979
if (!options_->allow_openssl_store) {
979980
permission()->Apply(
980-
this, {"*"}, permission::PermissionScope::kOpenSSLStore);
981+
this, args, permission::PermissionScope::kOpenSSLStore);
981982
}
982983
if (!options_->allow_worker_threads) {
983984
permission()->Apply(
984-
this, {"*"}, permission::PermissionScope::kWorkerThreads);
985+
this, args, permission::PermissionScope::kWorkerThreads);
985986
}
986987
if (!options_->allow_wasi) {
987-
permission()->Apply(this, {"*"}, permission::PermissionScope::kWASI);
988+
permission()->Apply(this, args, permission::PermissionScope::kWASI);
988989
}
989990

990991
// Implicit allow entrypoint to kFileSystemRead
@@ -1019,7 +1020,7 @@ Environment::Environment(IsolateData* isolate_data,
10191020
}
10201021

10211022
if (options_->allow_net) {
1022-
permission()->Apply(this, {"*"}, permission::PermissionScope::kNet);
1023+
permission()->Apply(this, args, permission::PermissionScope::kNet);
10231024
}
10241025
}
10251026
}

‎src/node_diagnostics_channel.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ BaseObjectPtr<Channel> Channel::Get(Environment* env, std::string_view name) {
223223
HandleScope handle_scope(isolate);
224224
Local<Context> context = env->context();
225225
Local<Value> argv[] = {
226-
ToV8Value(context, name).ToLocalChecked(),
227-
Integer::NewFromUnsigned(isolate, index),
226+
ToV8Value(context, name).ToLocalChecked(),
227+
Integer::NewFromUnsigned(isolate, index),
228228
};
229229
Local<Value> result;
230230
if (binding->link_callback_.Get(isolate)

‎src/permission/addon_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ namespace permission {
99
// Currently, Addon manage a single state
1010
// Once denied, it's always denied
1111
voidAddonPermission::Apply(Environment* env,
12-
conststd::vector<std::string>& allow,
12+
std::span<conststd::string> allow,
1313
PermissionScope scope) {
1414
deny_all_ = true;
1515
}
1616

1717
voidAddonPermission::Drop(Environment* env,
1818
PermissionScope scope,
19-
conststd::string_view& param) {
19+
std::string_view param) {
2020
deny_all_ = true;
2121
}
2222

2323
boolAddonPermission::is_granted(Environment* env,
2424
PermissionScope perm,
25-
conststd::string_view& param) const {
25+
std::string_view param) const {
2626
return deny_all_ == false;
2727
}
2828

‎src/permission/addon_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classAddonPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_;

‎src/permission/child_process_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ namespace permission {
1010
// Currently, ChildProcess manage a single state
1111
// Once denied, it's always denied
1212
voidChildProcessPermission::Apply(Environment* env,
13-
conststd::vector<std::string>& allow,
13+
std::span<conststd::string> allow,
1414
PermissionScope scope) {
1515
deny_all_ = true;
1616
}
1717

1818
voidChildProcessPermission::Drop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param) {
20+
std::string_view param) {
2121
deny_all_ = true;
2222
}
2323

2424
boolChildProcessPermission::is_granted(Environment* env,
2525
PermissionScope perm,
26-
conststd::string_view& param) const {
26+
std::string_view param) const {
2727
return deny_all_ == false;
2828
}
2929

‎src/permission/child_process_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classChildProcessPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_;

‎src/permission/ffi_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ namespace permission {
99

1010
// Currently, FFIPermission manages a single global deny state for FFI.
1111
voidFFIPermission::Apply(Environment* env,
12-
conststd::vector<std::string>& allow,
12+
std::span<conststd::string> allow,
1313
PermissionScope scope) {
1414
deny_all_ = true;
1515
}
1616

1717
voidFFIPermission::Drop(Environment* env,
1818
PermissionScope scope,
19-
conststd::string_view& param) {
19+
std::string_view param) {
2020
deny_all_ = true;
2121
}
2222

2323
boolFFIPermission::is_granted(Environment* env,
2424
PermissionScope perm,
25-
conststd::string_view& param) const {
25+
std::string_view param) const {
2626
return perm != PermissionScope::kFFI || !deny_all_;
2727
}
2828

‎src/permission/ffi_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classFFIPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_ = false;

‎src/permission/fs_permission.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void FreeRecursivelyNode(
5252
boolis_tree_granted(
5353
node::Environment* env,
5454
const node::permission::FSPermission::RadixTree* granted_tree,
55-
conststd::string_view& param) {
55+
std::string_view param) {
5656
std::string resolved_param = node::PathResolve(env, {param});
5757
#ifdef _WIN32
5858
// Remove leading "\\?\" from UNC path
@@ -137,7 +137,7 @@ namespace permission {
137137
// allow = '*'
138138
// allow = '/tmp/,/home/example.js'
139139
voidFSPermission::Apply(Environment* env,
140-
conststd::vector<std::string>& allow,
140+
std::span<conststd::string> allow,
141141
PermissionScope scope) {
142142
for (const std::string& res : allow) {
143143
if (res == "*") {
@@ -156,7 +156,7 @@ void FSPermission::Apply(Environment* env,
156156

157157
voidFSPermission::Drop(Environment* env,
158158
PermissionScope scope,
159-
conststd::string_view& param) {
159+
std::string_view param) {
160160
if (param.empty()) {
161161
// Drop all access for this scope
162162
if (scope == PermissionScope::kFileSystemRead ||
@@ -250,7 +250,7 @@ void FSPermission::GrantAccess(PermissionScope perm, const std::string& res) {
250250

251251
boolFSPermission::is_granted(Environment* env,
252252
PermissionScope perm,
253-
conststd::string_view& param = "") const {
253+
std::string_view param = "") const {
254254
switch (perm) {
255255
case PermissionScope::kFileSystem:
256256
return allow_all_in_ && allow_all_out_;
@@ -287,7 +287,7 @@ void FSPermission::RadixTree::Clear() {
287287
root_node_->is_leaf = false;
288288
}
289289

290-
boolFSPermission::RadixTree::Lookup(conststd::string_view& s,
290+
boolFSPermission::RadixTree::Lookup(std::string_view s,
291291
bool when_empty_return) const {
292292
FSPermission::RadixTree::Node* current_node = root_node_;
293293
if (current_node->children.empty()) {

‎src/permission/fs_permission.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ namespace permission {
1616
classFSPermissionfinal : public PermissionBase {
1717
public:
1818
voidApply(Environment* env,
19-
conststd::vector<std::string>& allow,
19+
std::span<conststd::string> allow,
2020
PermissionScope scope) override;
2121
voidDrop(Environment* env,
2222
PermissionScope scope,
23-
conststd::string_view& param = "") override;
23+
std::string_view param) override;
2424
boolis_granted(Environment* env,
2525
PermissionScope perm,
26-
conststd::string_view& param) constoverride;
26+
std::string_view param) constoverride;
2727

2828
structRadixTree {
2929
structNode {
@@ -146,8 +146,8 @@ class FSPermission final : public PermissionBase {
146146
~RadixTree();
147147
voidInsert(const std::string& s);
148148
voidClear();
149-
boolLookup(conststd::string_view& s) const { returnLookup(s, false); }
150-
boolLookup(conststd::string_view& s, bool when_empty_return) const;
149+
boolLookup(std::string_view s) const { returnLookup(s, false); }
150+
boolLookup(std::string_view s, bool when_empty_return) const;
151151

152152
private:
153153
Node* root_node_;

0 commit comments

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

Commit 521aaf1

Browse files
jasnelladuh95
authored andcommitted
src: apply multiple general cleanups to permissions
Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65158 Reviewed-By: Xuguang Mei <meixuguang@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent ac920e0 commit 521aaf1

23 files changed

Lines changed: 98 additions & 99 deletions

‎src/env.cc‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,7 @@ Environment::Environment(IsolateData* isolate_data,
954954

955955
if (options_->permission || options_->permission_audit) {
956956
permission()->EnablePermissions();
957+
staticconst std::array args = {std::string("*")};
957958
if (options_->permission_audit) {
958959
permission()->EnableWarningOnly();
959960
}
@@ -962,29 +963,29 @@ Environment::Environment(IsolateData* isolate_data,
962963
// unless explicitly allowed by the user
963964
if (!options_->allow_addons) {
964965
options_->allow_native_addons = false;
965-
permission()->Apply(this, {"*"}, permission::PermissionScope::kAddon);
966+
permission()->Apply(this, args, permission::PermissionScope::kAddon);
966967
}
967968
if (!options_->allow_inspector) {
968969
flags_ = flags_ | EnvironmentFlags::kNoCreateInspector;
969-
permission()->Apply(this, {"*"}, permission::PermissionScope::kInspector);
970+
permission()->Apply(this, args, permission::PermissionScope::kInspector);
970971
}
971972
if (!options_->allow_child_process) {
972973
permission()->Apply(
973-
this, {"*"}, permission::PermissionScope::kChildProcess);
974+
this, args, permission::PermissionScope::kChildProcess);
974975
}
975976
if (!options_->allow_ffi) {
976-
permission()->Apply(this, {"*"}, permission::PermissionScope::kFFI);
977+
permission()->Apply(this, args, permission::PermissionScope::kFFI);
977978
}
978979
if (!options_->allow_openssl_store) {
979980
permission()->Apply(
980-
this, {"*"}, permission::PermissionScope::kOpenSSLStore);
981+
this, args, permission::PermissionScope::kOpenSSLStore);
981982
}
982983
if (!options_->allow_worker_threads) {
983984
permission()->Apply(
984-
this, {"*"}, permission::PermissionScope::kWorkerThreads);
985+
this, args, permission::PermissionScope::kWorkerThreads);
985986
}
986987
if (!options_->allow_wasi) {
987-
permission()->Apply(this, {"*"}, permission::PermissionScope::kWASI);
988+
permission()->Apply(this, args, permission::PermissionScope::kWASI);
988989
}
989990

990991
// Implicit allow entrypoint to kFileSystemRead
@@ -1019,7 +1020,7 @@ Environment::Environment(IsolateData* isolate_data,
10191020
}
10201021

10211022
if (options_->allow_net) {
1022-
permission()->Apply(this, {"*"}, permission::PermissionScope::kNet);
1023+
permission()->Apply(this, args, permission::PermissionScope::kNet);
10231024
}
10241025
}
10251026
}

‎src/node_diagnostics_channel.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ BaseObjectPtr<Channel> Channel::Get(Environment* env, std::string_view name) {
223223
HandleScope handle_scope(isolate);
224224
Local<Context> context = env->context();
225225
Local<Value> argv[] = {
226-
ToV8Value(context, name).ToLocalChecked(),
227-
Integer::NewFromUnsigned(isolate, index),
226+
ToV8Value(context, name).ToLocalChecked(),
227+
Integer::NewFromUnsigned(isolate, index),
228228
};
229229
Local<Value> result;
230230
if (binding->link_callback_.Get(isolate)

‎src/permission/addon_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ namespace permission {
99
// Currently, Addon manage a single state
1010
// Once denied, it's always denied
1111
voidAddonPermission::Apply(Environment* env,
12-
conststd::vector<std::string>& allow,
12+
std::span<conststd::string> allow,
1313
PermissionScope scope) {
1414
deny_all_ = true;
1515
}
1616

1717
voidAddonPermission::Drop(Environment* env,
1818
PermissionScope scope,
19-
conststd::string_view& param) {
19+
std::string_view param) {
2020
deny_all_ = true;
2121
}
2222

2323
boolAddonPermission::is_granted(Environment* env,
2424
PermissionScope perm,
25-
conststd::string_view& param) const {
25+
std::string_view param) const {
2626
return deny_all_ == false;
2727
}
2828

‎src/permission/addon_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classAddonPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_;

‎src/permission/child_process_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ namespace permission {
1010
// Currently, ChildProcess manage a single state
1111
// Once denied, it's always denied
1212
voidChildProcessPermission::Apply(Environment* env,
13-
conststd::vector<std::string>& allow,
13+
std::span<conststd::string> allow,
1414
PermissionScope scope) {
1515
deny_all_ = true;
1616
}
1717

1818
voidChildProcessPermission::Drop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param) {
20+
std::string_view param) {
2121
deny_all_ = true;
2222
}
2323

2424
boolChildProcessPermission::is_granted(Environment* env,
2525
PermissionScope perm,
26-
conststd::string_view& param) const {
26+
std::string_view param) const {
2727
return deny_all_ == false;
2828
}
2929

‎src/permission/child_process_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classChildProcessPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_;

‎src/permission/ffi_permission.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ namespace permission {
99

1010
// Currently, FFIPermission manages a single global deny state for FFI.
1111
voidFFIPermission::Apply(Environment* env,
12-
conststd::vector<std::string>& allow,
12+
std::span<conststd::string> allow,
1313
PermissionScope scope) {
1414
deny_all_ = true;
1515
}
1616

1717
voidFFIPermission::Drop(Environment* env,
1818
PermissionScope scope,
19-
conststd::string_view& param) {
19+
std::string_view param) {
2020
deny_all_ = true;
2121
}
2222

2323
boolFFIPermission::is_granted(Environment* env,
2424
PermissionScope perm,
25-
conststd::string_view& param) const {
25+
std::string_view param) const {
2626
return perm != PermissionScope::kFFI || !deny_all_;
2727
}
2828

‎src/permission/ffi_permission.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace permission {
1313
classFFIPermissionfinal : public PermissionBase {
1414
public:
1515
voidApply(Environment* env,
16-
conststd::vector<std::string>& allow,
16+
std::span<conststd::string> allow,
1717
PermissionScope scope) override;
1818
voidDrop(Environment* env,
1919
PermissionScope scope,
20-
conststd::string_view& param = "") override;
20+
std::string_view param) override;
2121
boolis_granted(Environment* env,
2222
PermissionScope perm,
23-
conststd::string_view& param = "") constoverride;
23+
std::string_view param) constoverride;
2424

2525
private:
2626
bool deny_all_ = false;

‎src/permission/fs_permission.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void FreeRecursivelyNode(
5252
boolis_tree_granted(
5353
node::Environment* env,
5454
const node::permission::FSPermission::RadixTree* granted_tree,
55-
conststd::string_view& param) {
55+
std::string_view param) {
5656
std::string resolved_param = node::PathResolve(env, {param});
5757
#ifdef _WIN32
5858
// Remove leading "\\?\" from UNC path
@@ -137,7 +137,7 @@ namespace permission {
137137
// allow = '*'
138138
// allow = '/tmp/,/home/example.js'
139139
voidFSPermission::Apply(Environment* env,
140-
conststd::vector<std::string>& allow,
140+
std::span<conststd::string> allow,
141141
PermissionScope scope) {
142142
for (const std::string& res : allow) {
143143
if (res == "*") {
@@ -156,7 +156,7 @@ void FSPermission::Apply(Environment* env,
156156

157157
voidFSPermission::Drop(Environment* env,
158158
PermissionScope scope,
159-
conststd::string_view& param) {
159+
std::string_view param) {
160160
if (param.empty()) {
161161
// Drop all access for this scope
162162
if (scope == PermissionScope::kFileSystemRead ||
@@ -250,7 +250,7 @@ void FSPermission::GrantAccess(PermissionScope perm, const std::string& res) {
250250

251251
boolFSPermission::is_granted(Environment* env,
252252
PermissionScope perm,
253-
conststd::string_view& param = "") const {
253+
std::string_view param = "") const {
254254
switch (perm) {
255255
case PermissionScope::kFileSystem:
256256
return allow_all_in_ && allow_all_out_;
@@ -287,7 +287,7 @@ void FSPermission::RadixTree::Clear() {
287287
root_node_->is_leaf = false;
288288
}
289289

290-
boolFSPermission::RadixTree::Lookup(conststd::string_view& s,
290+
boolFSPermission::RadixTree::Lookup(std::string_view s,
291291
bool when_empty_return) const {
292292
FSPermission::RadixTree::Node* current_node = root_node_;
293293
if (current_node->children.empty()) {

‎src/permission/fs_permission.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ namespace permission {
1616
classFSPermissionfinal : public PermissionBase {
1717
public:
1818
voidApply(Environment* env,
19-
conststd::vector<std::string>& allow,
19+
std::span<conststd::string> allow,
2020
PermissionScope scope) override;
2121
voidDrop(Environment* env,
2222
PermissionScope scope,
23-
conststd::string_view& param = "") override;
23+
std::string_view param) override;
2424
boolis_granted(Environment* env,
2525
PermissionScope perm,
26-
conststd::string_view& param) constoverride;
26+
std::string_view param) constoverride;
2727

2828
structRadixTree {
2929
structNode {
@@ -146,8 +146,8 @@ class FSPermission final : public PermissionBase {
146146
~RadixTree();
147147
voidInsert(const std::string& s);
148148
voidClear();
149-
boolLookup(conststd::string_view& s) const { returnLookup(s, false); }
150-
boolLookup(conststd::string_view& s, bool when_empty_return) const;
149+
boolLookup(std::string_view s) const { returnLookup(s, false); }
150+
boolLookup(std::string_view s, bool when_empty_return) const;
151151

152152
private:
153153
Node* root_node_;

0 commit comments

Comments
 (0)