Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 32 additions & 22 deletions lib/internal/process/permission.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,44 @@
const {
ArrayPrototypePush,
ObjectFreeze,
StringPrototypeStartsWith,
} = primordials;

const permission = internalBinding('permission');
const { validateString, validateBuffer } = require('internal/validators');
const { Buffer } = require('buffer');
const { isBuffer } = Buffer;
const { validateString } = require('internal/validators');
const { isUint8Array } = require('internal/util/types');
const { isURL, fileURLToPath } = require('internal/url');

let _permission;
let _audit;
let _ffi;

function normalizeReference(scope, reference, name) {
if (reference == null) {
return reference;
}

if (isURL(reference)) {
// Reference is only meaningful for fs.* scopes (FSPermission does
// per-path checks); every other scope ignores it (BooleanPermission),
// so only fs.* scopes require a file: URL.
if (StringPrototypeStartsWith(scope, 'fs')) {
return fileURLToPath(reference);
}
return reference.href;
}

if (isUint8Array(reference)) {
// Passed through as-is: the native binding copies the raw bytes
// directly instead of forcing a (potentially lossy) UTF-8 string
// conversion, since paths are not guaranteed to be valid UTF-8.
return reference;
}

validateString(reference, name);
return reference;
}

module.exports = ObjectFreeze({
__proto__: null,
isEnabled() {
Expand All@@ -32,28 +59,11 @@ module.exports = ObjectFreeze({
},
has(scope, reference) {
validateString(scope, 'scope');
if (reference != null) {
// TODO: add support for WHATWG URLs and Uint8Arrays.
if (isBuffer(reference)) {
validateBuffer(reference, 'reference');
} else {
validateString(reference, 'reference');
}
}

return permission.has(scope, reference);
return permission.has(scope, normalizeReference(scope, reference, 'reference'));
},
drop(scope, reference) {
validateString(scope, 'scope');
if (reference != null) {
if (isBuffer(reference)) {
validateBuffer(reference, 'reference');
} else {
validateString(reference, 'reference');
}
}

permission.drop(scope, reference);
permission.drop(scope, normalizeReference(scope, reference, 'reference'));
},
availableFlags() {
if (_ffi === undefined) {
Expand Down
36 changes: 24 additions & 12 deletions src/permission/permission.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,9 +90,12 @@ static void Drop(const FunctionCallbackInfo<Value>& args) {
}

if (args.Length() > 1 && !args[1]->IsUndefined()) {
Utf8Value utf8_arg(env->isolate(), args[1]);
if (utf8_arg.length() > 0) {
env->permission()->Drop(env, scope, utf8_arg.ToStringView());
// BufferValue copies raw bytes out of a Buffer/TypedArray as-is instead
// of forcing a (potentially lossy) UTF-8 string conversion, since paths
// are not guaranteed to be valid UTF-8.
BufferValue resource(env->isolate(), args[1]);
if (resource.length() > 0) {
env->permission()->Drop(env, scope, resource.ToStringView());
return;
}
}
Expand All@@ -113,13 +116,16 @@ static void Has(const FunctionCallbackInfo<Value>& args) {
}

if (args.Length() > 1 && !args[1]->IsUndefined()) {
Utf8Value utf8_arg(env->isolate(), args[1]);
if (utf8_arg.length() == 0) {
// BufferValue copies raw bytes out of a Buffer/TypedArray as-is instead
// of forcing a (potentially lossy) UTF-8 string conversion, since paths
// are not guaranteed to be valid UTF-8.
BufferValue resource(env->isolate(), args[1]);
if (resource.length() == 0) {
args.GetReturnValue().Set(false);
return;
}
return args.GetReturnValue().Set(
env->permission()->is_granted(env, scope, utf8_arg.ToStringView()));
env->permission()->is_granted(env, scope, resource.ToStringView()));
}

return args.GetReturnValue().Set(env->permission()->is_granted(env, scope));
Expand DownExpand Up@@ -174,16 +180,22 @@ static bool FastHasResource(
return false;
}

Local<String> res_str;
if (!resource_arg->ToString(context).ToLocal(&res_str)) {
return false;
// The JS wrapper always calls this with 2 arguments, passing undefined
// when no resource was given, so this path (unlike Has()) has to check
// for that explicitly and fall back to the scope-only check.
if (resource_arg->IsUndefined()) {
return env->permission()->is_granted(env, scope);
}
Utf8Value utf8_res(isolate, res_str);
if (utf8_res.length() == 0) {

// BufferValue is constructed directly from resource_arg (not from a
// pre-converted String) so that a Buffer/TypedArray's raw bytes are
// copied as-is instead of going through a lossy UTF-8 string conversion.
BufferValue resource(isolate, resource_arg);
if (resource.length() == 0) {
return false;
}

return env->permission()->is_granted(env, scope, utf8_res.ToStringView());
return env->permission()->is_granted(env, scope, resource.ToStringView());
}

static CFunction fast_has_methods_[] = {CFunction::Make(FastHas),
Expand Down
41 changes: 41 additions & 0 deletions test/fixtures/permission/has-reference-types.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
'use strict';

const assert = require('assert');
const { pathToFileURL } = require('url');

const allowedDir = process.env.ALLOWED_DIR;
const allowedFile = process.env.ALLOWED_FILE;
const deniedFile = process.env.DENIED_FILE;

// file: URL
{
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(allowedFile)), true);
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(deniedFile)), false);
assert.throws(() => {
process.permission.has('fs.read', new URL('https://example.com'));
}, { code: 'ERR_INVALID_URL_SCHEME' });
}

// Non-fs scopes like net ignore the reference, so a non-file: URL must not be rejected here.
{
assert.strictEqual(process.permission.has('net', new URL('https://example.com')), false);
}

// Uint8Array
{
const allowedBytes = new Uint8Array(Buffer.from(allowedFile));
const deniedBytes = new Uint8Array(Buffer.from(deniedFile));
assert.strictEqual(process.permission.has('fs.read', allowedBytes), true);
assert.strictEqual(process.permission.has('fs.read', deniedBytes), false);

// Must respect byteOffset/byteLength, not read from the start of the buffer.
const padded = Buffer.concat([Buffer.from('padding-'), Buffer.from(allowedFile)]);
const view = new Uint8Array(padded.buffer, padded.byteOffset + 8, Buffer.byteLength(allowedFile));
assert.strictEqual(process.permission.has('fs.read', view), true);
}

// drop() only matches the exact granted path (the directory), not a file inside it.
{
process.permission.drop('fs.read', pathToFileURL(allowedDir));
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(allowedFile)), false);
}
48 changes: 48 additions & 0 deletions test/parallel/test-permission-has-reference-types.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
'use strict';

// Test that process.permission.has()/drop() accept a URL or Uint8Array reference.

require('../common');
const { spawnSync } = require('child_process');
const assert = require('assert');
const { isMainThread } = require('worker_threads');

if (!isMainThread) {
process.exit(0);
}

const tmpdir = require('../common/tmpdir');
const fixtures = require('../common/fixtures');
const fs = require('fs');
const path = require('path');

tmpdir.refresh();

const allowedDir = path.join(tmpdir.path, 'allowed');
const deniedDir = path.join(tmpdir.path, 'denied');
fs.mkdirSync(allowedDir);
fs.mkdirSync(deniedDir);

const allowedFile = path.join(allowedDir, 'a.txt');
const deniedFile = path.join(deniedDir, 'b.txt');
fs.writeFileSync(allowedFile, 'allowed');
fs.writeFileSync(deniedFile, 'denied');

const { status, stderr } = spawnSync(
process.execPath,
[
'--permission',
`--allow-fs-read=${allowedDir}`,
fixtures.path('permission', 'has-reference-types.js'),
],
{
env: {
...process.env,
ALLOWED_DIR: allowedDir,
ALLOWED_FILE: allowedFile,
DENIED_FILE: deniedFile,
},
},
);

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 32 additions & 22 deletions lib/internal/process/permission.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,44 @@
const {
ArrayPrototypePush,
ObjectFreeze,
StringPrototypeStartsWith,
} = primordials;

const permission = internalBinding('permission');
const { validateString, validateBuffer } = require('internal/validators');
const { Buffer } = require('buffer');
const { isBuffer } = Buffer;
const { validateString } = require('internal/validators');
const { isUint8Array } = require('internal/util/types');
const { isURL, fileURLToPath } = require('internal/url');

let _permission;
let _audit;
let _ffi;

function normalizeReference(scope, reference, name) {
if (reference == null) {
return reference;
}

if (isURL(reference)) {
// Reference is only meaningful for fs.* scopes (FSPermission does
// per-path checks); every other scope ignores it (BooleanPermission),
// so only fs.* scopes require a file: URL.
if (StringPrototypeStartsWith(scope, 'fs')) {
return fileURLToPath(reference);
}
return reference.href;
}

if (isUint8Array(reference)) {
// Passed through as-is: the native binding copies the raw bytes
// directly instead of forcing a (potentially lossy) UTF-8 string
// conversion, since paths are not guaranteed to be valid UTF-8.
return reference;
}

validateString(reference, name);
return reference;
}

module.exports = ObjectFreeze({
__proto__: null,
isEnabled() {
Expand All@@ -32,28 +59,11 @@ module.exports = ObjectFreeze({
},
has(scope, reference) {
validateString(scope, 'scope');
if (reference != null) {
// TODO: add support for WHATWG URLs and Uint8Arrays.
if (isBuffer(reference)) {
validateBuffer(reference, 'reference');
} else {
validateString(reference, 'reference');
}
}

return permission.has(scope, reference);
return permission.has(scope, normalizeReference(scope, reference, 'reference'));
},
drop(scope, reference) {
validateString(scope, 'scope');
if (reference != null) {
if (isBuffer(reference)) {
validateBuffer(reference, 'reference');
} else {
validateString(reference, 'reference');
}
}

permission.drop(scope, reference);
permission.drop(scope, normalizeReference(scope, reference, 'reference'));
},
availableFlags() {
if (_ffi === undefined) {
Expand Down
36 changes: 24 additions & 12 deletions src/permission/permission.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,9 +90,12 @@ static void Drop(const FunctionCallbackInfo<Value>& args) {
}

if (args.Length() > 1 && !args[1]->IsUndefined()) {
Utf8Value utf8_arg(env->isolate(), args[1]);
if (utf8_arg.length() > 0) {
env->permission()->Drop(env, scope, utf8_arg.ToStringView());
// BufferValue copies raw bytes out of a Buffer/TypedArray as-is instead
// of forcing a (potentially lossy) UTF-8 string conversion, since paths
// are not guaranteed to be valid UTF-8.
BufferValue resource(env->isolate(), args[1]);
if (resource.length() > 0) {
env->permission()->Drop(env, scope, resource.ToStringView());
return;
}
}
Expand All@@ -113,13 +116,16 @@ static void Has(const FunctionCallbackInfo<Value>& args) {
}

if (args.Length() > 1 && !args[1]->IsUndefined()) {
Utf8Value utf8_arg(env->isolate(), args[1]);
if (utf8_arg.length() == 0) {
// BufferValue copies raw bytes out of a Buffer/TypedArray as-is instead
// of forcing a (potentially lossy) UTF-8 string conversion, since paths
// are not guaranteed to be valid UTF-8.
BufferValue resource(env->isolate(), args[1]);
if (resource.length() == 0) {
args.GetReturnValue().Set(false);
return;
}
return args.GetReturnValue().Set(
env->permission()->is_granted(env, scope, utf8_arg.ToStringView()));
env->permission()->is_granted(env, scope, resource.ToStringView()));
}

return args.GetReturnValue().Set(env->permission()->is_granted(env, scope));
Expand DownExpand Up@@ -174,16 +180,22 @@ static bool FastHasResource(
return false;
}

Local<String> res_str;
if (!resource_arg->ToString(context).ToLocal(&res_str)) {
return false;
// The JS wrapper always calls this with 2 arguments, passing undefined
// when no resource was given, so this path (unlike Has()) has to check
// for that explicitly and fall back to the scope-only check.
if (resource_arg->IsUndefined()) {
return env->permission()->is_granted(env, scope);
}
Utf8Value utf8_res(isolate, res_str);
if (utf8_res.length() == 0) {

// BufferValue is constructed directly from resource_arg (not from a
// pre-converted String) so that a Buffer/TypedArray's raw bytes are
// copied as-is instead of going through a lossy UTF-8 string conversion.
BufferValue resource(isolate, resource_arg);
if (resource.length() == 0) {
return false;
}

return env->permission()->is_granted(env, scope, utf8_res.ToStringView());
return env->permission()->is_granted(env, scope, resource.ToStringView());
}

static CFunction fast_has_methods_[] = {CFunction::Make(FastHas),
Expand Down
41 changes: 41 additions & 0 deletions test/fixtures/permission/has-reference-types.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
'use strict';

const assert = require('assert');
const { pathToFileURL } = require('url');

const allowedDir = process.env.ALLOWED_DIR;
const allowedFile = process.env.ALLOWED_FILE;
const deniedFile = process.env.DENIED_FILE;

// file: URL
{
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(allowedFile)), true);
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(deniedFile)), false);
assert.throws(() => {
process.permission.has('fs.read', new URL('https://example.com'));
}, { code: 'ERR_INVALID_URL_SCHEME' });
}

// Non-fs scopes like net ignore the reference, so a non-file: URL must not be rejected here.
{
assert.strictEqual(process.permission.has('net', new URL('https://example.com')), false);
}

// Uint8Array
{
const allowedBytes = new Uint8Array(Buffer.from(allowedFile));
const deniedBytes = new Uint8Array(Buffer.from(deniedFile));
assert.strictEqual(process.permission.has('fs.read', allowedBytes), true);
assert.strictEqual(process.permission.has('fs.read', deniedBytes), false);

// Must respect byteOffset/byteLength, not read from the start of the buffer.
const padded = Buffer.concat([Buffer.from('padding-'), Buffer.from(allowedFile)]);
const view = new Uint8Array(padded.buffer, padded.byteOffset + 8, Buffer.byteLength(allowedFile));
assert.strictEqual(process.permission.has('fs.read', view), true);
}

// drop() only matches the exact granted path (the directory), not a file inside it.
{
process.permission.drop('fs.read', pathToFileURL(allowedDir));
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(allowedFile)), false);
}
48 changes: 48 additions & 0 deletions test/parallel/test-permission-has-reference-types.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
'use strict';

// Test that process.permission.has()/drop() accept a URL or Uint8Array reference.

require('../common');
const { spawnSync } = require('child_process');
const assert = require('assert');
const { isMainThread } = require('worker_threads');

if (!isMainThread) {
process.exit(0);
}

const tmpdir = require('../common/tmpdir');
const fixtures = require('../common/fixtures');
const fs = require('fs');
const path = require('path');

tmpdir.refresh();

const allowedDir = path.join(tmpdir.path, 'allowed');
const deniedDir = path.join(tmpdir.path, 'denied');
fs.mkdirSync(allowedDir);
fs.mkdirSync(deniedDir);

const allowedFile = path.join(allowedDir, 'a.txt');
const deniedFile = path.join(deniedDir, 'b.txt');
fs.writeFileSync(allowedFile, 'allowed');
fs.writeFileSync(deniedFile, 'denied');

const { status, stderr } = spawnSync(
process.execPath,
[
'--permission',
`--allow-fs-read=${allowedDir}`,
fixtures.path('permission', 'has-reference-types.js'),
],
{
env: {
...process.env,
ALLOWED_DIR: allowedDir,
ALLOWED_FILE: allowedFile,
DENIED_FILE: deniedFile,
},
},
);

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 32 additions & 22 deletions lib/internal/process/permission.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,44 @@
const {
ArrayPrototypePush,
ObjectFreeze,
StringPrototypeStartsWith,
} = primordials;

const permission = internalBinding('permission');
const { validateString, validateBuffer } = require('internal/validators');
const { Buffer } = require('buffer');
const { isBuffer } = Buffer;
const { validateString } = require('internal/validators');
const { isUint8Array } = require('internal/util/types');
const { isURL, fileURLToPath } = require('internal/url');

let _permission;
let _audit;
let _ffi;

function normalizeReference(scope, reference, name) {
if (reference == null) {
return reference;
}

if (isURL(reference)) {
// Reference is only meaningful for fs.* scopes (FSPermission does
// per-path checks); every other scope ignores it (BooleanPermission),
// so only fs.* scopes require a file: URL.
if (StringPrototypeStartsWith(scope, 'fs')) {
return fileURLToPath(reference);
}
return reference.href;
}

if (isUint8Array(reference)) {
// Passed through as-is: the native binding copies the raw bytes
// directly instead of forcing a (potentially lossy) UTF-8 string
// conversion, since paths are not guaranteed to be valid UTF-8.
return reference;
}

validateString(reference, name);
return reference;
}

module.exports = ObjectFreeze({
__proto__: null,
isEnabled() {
Expand All@@ -32,28 +59,11 @@ module.exports = ObjectFreeze({
},
has(scope, reference) {
validateString(scope, 'scope');
if (reference != null) {
// TODO: add support for WHATWG URLs and Uint8Arrays.
if (isBuffer(reference)) {
validateBuffer(reference, 'reference');
} else {
validateString(reference, 'reference');
}
}

return permission.has(scope, reference);
return permission.has(scope, normalizeReference(scope, reference, 'reference'));
},
drop(scope, reference) {
validateString(scope, 'scope');
if (reference != null) {
if (isBuffer(reference)) {
validateBuffer(reference, 'reference');
} else {
validateString(reference, 'reference');
}
}

permission.drop(scope, reference);
permission.drop(scope, normalizeReference(scope, reference, 'reference'));
},
availableFlags() {
if (_ffi === undefined) {
Expand Down
36 changes: 24 additions & 12 deletions src/permission/permission.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,9 +90,12 @@ static void Drop(const FunctionCallbackInfo<Value>& args) {
}

if (args.Length() > 1 && !args[1]->IsUndefined()) {
Utf8Value utf8_arg(env->isolate(), args[1]);
if (utf8_arg.length() > 0) {
env->permission()->Drop(env, scope, utf8_arg.ToStringView());
// BufferValue copies raw bytes out of a Buffer/TypedArray as-is instead
// of forcing a (potentially lossy) UTF-8 string conversion, since paths
// are not guaranteed to be valid UTF-8.
BufferValue resource(env->isolate(), args[1]);
if (resource.length() > 0) {
env->permission()->Drop(env, scope, resource.ToStringView());
return;
}
}
Expand All@@ -113,13 +116,16 @@ static void Has(const FunctionCallbackInfo<Value>& args) {
}

if (args.Length() > 1 && !args[1]->IsUndefined()) {
Utf8Value utf8_arg(env->isolate(), args[1]);
if (utf8_arg.length() == 0) {
// BufferValue copies raw bytes out of a Buffer/TypedArray as-is instead
// of forcing a (potentially lossy) UTF-8 string conversion, since paths
// are not guaranteed to be valid UTF-8.
BufferValue resource(env->isolate(), args[1]);
if (resource.length() == 0) {
args.GetReturnValue().Set(false);
return;
}
return args.GetReturnValue().Set(
env->permission()->is_granted(env, scope, utf8_arg.ToStringView()));
env->permission()->is_granted(env, scope, resource.ToStringView()));
}

return args.GetReturnValue().Set(env->permission()->is_granted(env, scope));
Expand DownExpand Up@@ -174,16 +180,22 @@ static bool FastHasResource(
return false;
}

Local<String> res_str;
if (!resource_arg->ToString(context).ToLocal(&res_str)) {
return false;
// The JS wrapper always calls this with 2 arguments, passing undefined
// when no resource was given, so this path (unlike Has()) has to check
// for that explicitly and fall back to the scope-only check.
if (resource_arg->IsUndefined()) {
return env->permission()->is_granted(env, scope);
}
Utf8Value utf8_res(isolate, res_str);
if (utf8_res.length() == 0) {

// BufferValue is constructed directly from resource_arg (not from a
// pre-converted String) so that a Buffer/TypedArray's raw bytes are
// copied as-is instead of going through a lossy UTF-8 string conversion.
BufferValue resource(isolate, resource_arg);
if (resource.length() == 0) {
return false;
}

return env->permission()->is_granted(env, scope, utf8_res.ToStringView());
return env->permission()->is_granted(env, scope, resource.ToStringView());
}

static CFunction fast_has_methods_[] = {CFunction::Make(FastHas),
Expand Down
41 changes: 41 additions & 0 deletions test/fixtures/permission/has-reference-types.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
'use strict';

const assert = require('assert');
const { pathToFileURL } = require('url');

const allowedDir = process.env.ALLOWED_DIR;
const allowedFile = process.env.ALLOWED_FILE;
const deniedFile = process.env.DENIED_FILE;

// file: URL
{
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(allowedFile)), true);
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(deniedFile)), false);
assert.throws(() => {
process.permission.has('fs.read', new URL('https://example.com'));
}, { code: 'ERR_INVALID_URL_SCHEME' });
}

// Non-fs scopes like net ignore the reference, so a non-file: URL must not be rejected here.
{
assert.strictEqual(process.permission.has('net', new URL('https://example.com')), false);
}

// Uint8Array
{
const allowedBytes = new Uint8Array(Buffer.from(allowedFile));
const deniedBytes = new Uint8Array(Buffer.from(deniedFile));
assert.strictEqual(process.permission.has('fs.read', allowedBytes), true);
assert.strictEqual(process.permission.has('fs.read', deniedBytes), false);

// Must respect byteOffset/byteLength, not read from the start of the buffer.
const padded = Buffer.concat([Buffer.from('padding-'), Buffer.from(allowedFile)]);
const view = new Uint8Array(padded.buffer, padded.byteOffset + 8, Buffer.byteLength(allowedFile));
assert.strictEqual(process.permission.has('fs.read', view), true);
}

// drop() only matches the exact granted path (the directory), not a file inside it.
{
process.permission.drop('fs.read', pathToFileURL(allowedDir));
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(allowedFile)), false);
}
48 changes: 48 additions & 0 deletions test/parallel/test-permission-has-reference-types.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
'use strict';

// Test that process.permission.has()/drop() accept a URL or Uint8Array reference.

require('../common');
const { spawnSync } = require('child_process');
const assert = require('assert');
const { isMainThread } = require('worker_threads');

if (!isMainThread) {
process.exit(0);
}

const tmpdir = require('../common/tmpdir');
const fixtures = require('../common/fixtures');
const fs = require('fs');
const path = require('path');

tmpdir.refresh();

const allowedDir = path.join(tmpdir.path, 'allowed');
const deniedDir = path.join(tmpdir.path, 'denied');
fs.mkdirSync(allowedDir);
fs.mkdirSync(deniedDir);

const allowedFile = path.join(allowedDir, 'a.txt');
const deniedFile = path.join(deniedDir, 'b.txt');
fs.writeFileSync(allowedFile, 'allowed');
fs.writeFileSync(deniedFile, 'denied');

const { status, stderr } = spawnSync(
process.execPath,
[
'--permission',
`--allow-fs-read=${allowedDir}`,
fixtures.path('permission', 'has-reference-types.js'),
],
{
env: {
...process.env,
ALLOWED_DIR: allowedDir,
ALLOWED_FILE: allowedFile,
DENIED_FILE: deniedFile,
},
},
);

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 32 additions & 22 deletions lib/internal/process/permission.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,44 @@
const {
ArrayPrototypePush,
ObjectFreeze,
StringPrototypeStartsWith,
} = primordials;

const permission = internalBinding('permission');
const { validateString, validateBuffer } = require('internal/validators');
const { Buffer } = require('buffer');
const { isBuffer } = Buffer;
const { validateString } = require('internal/validators');
const { isUint8Array } = require('internal/util/types');
const { isURL, fileURLToPath } = require('internal/url');

let _permission;
let _audit;
let _ffi;

function normalizeReference(scope, reference, name) {
if (reference == null) {
return reference;
}

if (isURL(reference)) {
// Reference is only meaningful for fs.* scopes (FSPermission does
// per-path checks); every other scope ignores it (BooleanPermission),
// so only fs.* scopes require a file: URL.
if (StringPrototypeStartsWith(scope, 'fs')) {
return fileURLToPath(reference);
}
return reference.href;
}

if (isUint8Array(reference)) {
// Passed through as-is: the native binding copies the raw bytes
// directly instead of forcing a (potentially lossy) UTF-8 string
// conversion, since paths are not guaranteed to be valid UTF-8.
return reference;
}

validateString(reference, name);
return reference;
}

module.exports = ObjectFreeze({
__proto__: null,
isEnabled() {
Expand All@@ -32,28 +59,11 @@ module.exports = ObjectFreeze({
},
has(scope, reference) {
validateString(scope, 'scope');
if (reference != null) {
// TODO: add support for WHATWG URLs and Uint8Arrays.
if (isBuffer(reference)) {
validateBuffer(reference, 'reference');
} else {
validateString(reference, 'reference');
}
}

return permission.has(scope, reference);
return permission.has(scope, normalizeReference(scope, reference, 'reference'));
},
drop(scope, reference) {
validateString(scope, 'scope');
if (reference != null) {
if (isBuffer(reference)) {
validateBuffer(reference, 'reference');
} else {
validateString(reference, 'reference');
}
}

permission.drop(scope, reference);
permission.drop(scope, normalizeReference(scope, reference, 'reference'));
},
availableFlags() {
if (_ffi === undefined) {
Expand Down
36 changes: 24 additions & 12 deletions src/permission/permission.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,9 +90,12 @@ static void Drop(const FunctionCallbackInfo<Value>& args) {
}

if (args.Length() > 1 && !args[1]->IsUndefined()) {
Utf8Value utf8_arg(env->isolate(), args[1]);
if (utf8_arg.length() > 0) {
env->permission()->Drop(env, scope, utf8_arg.ToStringView());
// BufferValue copies raw bytes out of a Buffer/TypedArray as-is instead
// of forcing a (potentially lossy) UTF-8 string conversion, since paths
// are not guaranteed to be valid UTF-8.
BufferValue resource(env->isolate(), args[1]);
if (resource.length() > 0) {
env->permission()->Drop(env, scope, resource.ToStringView());
return;
}
}
Expand All@@ -113,13 +116,16 @@ static void Has(const FunctionCallbackInfo<Value>& args) {
}

if (args.Length() > 1 && !args[1]->IsUndefined()) {
Utf8Value utf8_arg(env->isolate(), args[1]);
if (utf8_arg.length() == 0) {
// BufferValue copies raw bytes out of a Buffer/TypedArray as-is instead
// of forcing a (potentially lossy) UTF-8 string conversion, since paths
// are not guaranteed to be valid UTF-8.
BufferValue resource(env->isolate(), args[1]);
if (resource.length() == 0) {
args.GetReturnValue().Set(false);
return;
}
return args.GetReturnValue().Set(
env->permission()->is_granted(env, scope, utf8_arg.ToStringView()));
env->permission()->is_granted(env, scope, resource.ToStringView()));
}

return args.GetReturnValue().Set(env->permission()->is_granted(env, scope));
Expand DownExpand Up@@ -174,16 +180,22 @@ static bool FastHasResource(
return false;
}

Local<String> res_str;
if (!resource_arg->ToString(context).ToLocal(&res_str)) {
return false;
// The JS wrapper always calls this with 2 arguments, passing undefined
// when no resource was given, so this path (unlike Has()) has to check
// for that explicitly and fall back to the scope-only check.
if (resource_arg->IsUndefined()) {
return env->permission()->is_granted(env, scope);
}
Utf8Value utf8_res(isolate, res_str);
if (utf8_res.length() == 0) {

// BufferValue is constructed directly from resource_arg (not from a
// pre-converted String) so that a Buffer/TypedArray's raw bytes are
// copied as-is instead of going through a lossy UTF-8 string conversion.
BufferValue resource(isolate, resource_arg);
if (resource.length() == 0) {
return false;
}

return env->permission()->is_granted(env, scope, utf8_res.ToStringView());
return env->permission()->is_granted(env, scope, resource.ToStringView());
}

static CFunction fast_has_methods_[] = {CFunction::Make(FastHas),
Expand Down
41 changes: 41 additions & 0 deletions test/fixtures/permission/has-reference-types.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
'use strict';

const assert = require('assert');
const { pathToFileURL } = require('url');

const allowedDir = process.env.ALLOWED_DIR;
const allowedFile = process.env.ALLOWED_FILE;
const deniedFile = process.env.DENIED_FILE;

// file: URL
{
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(allowedFile)), true);
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(deniedFile)), false);
assert.throws(() => {
process.permission.has('fs.read', new URL('https://example.com'));
}, { code: 'ERR_INVALID_URL_SCHEME' });
}

// Non-fs scopes like net ignore the reference, so a non-file: URL must not be rejected here.
{
assert.strictEqual(process.permission.has('net', new URL('https://example.com')), false);
}

// Uint8Array
{
const allowedBytes = new Uint8Array(Buffer.from(allowedFile));
const deniedBytes = new Uint8Array(Buffer.from(deniedFile));
assert.strictEqual(process.permission.has('fs.read', allowedBytes), true);
assert.strictEqual(process.permission.has('fs.read', deniedBytes), false);

// Must respect byteOffset/byteLength, not read from the start of the buffer.
const padded = Buffer.concat([Buffer.from('padding-'), Buffer.from(allowedFile)]);
const view = new Uint8Array(padded.buffer, padded.byteOffset + 8, Buffer.byteLength(allowedFile));
assert.strictEqual(process.permission.has('fs.read', view), true);
}

// drop() only matches the exact granted path (the directory), not a file inside it.
{
process.permission.drop('fs.read', pathToFileURL(allowedDir));
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(allowedFile)), false);
}
48 changes: 48 additions & 0 deletions test/parallel/test-permission-has-reference-types.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
'use strict';

// Test that process.permission.has()/drop() accept a URL or Uint8Array reference.

require('../common');
const { spawnSync } = require('child_process');
const assert = require('assert');
const { isMainThread } = require('worker_threads');

if (!isMainThread) {
process.exit(0);
}

const tmpdir = require('../common/tmpdir');
const fixtures = require('../common/fixtures');
const fs = require('fs');
const path = require('path');

tmpdir.refresh();

const allowedDir = path.join(tmpdir.path, 'allowed');
const deniedDir = path.join(tmpdir.path, 'denied');
fs.mkdirSync(allowedDir);
fs.mkdirSync(deniedDir);

const allowedFile = path.join(allowedDir, 'a.txt');
const deniedFile = path.join(deniedDir, 'b.txt');
fs.writeFileSync(allowedFile, 'allowed');
fs.writeFileSync(deniedFile, 'denied');

const { status, stderr } = spawnSync(
process.execPath,
[
'--permission',
`--allow-fs-read=${allowedDir}`,
fixtures.path('permission', 'has-reference-types.js'),
],
{
env: {
...process.env,
ALLOWED_DIR: allowedDir,
ALLOWED_FILE: allowedFile,
DENIED_FILE: deniedFile,
},
},
);

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 32 additions & 22 deletions lib/internal/process/permission.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,44 @@
const {
ArrayPrototypePush,
ObjectFreeze,
StringPrototypeStartsWith,
} = primordials;

const permission = internalBinding('permission');
const { validateString, validateBuffer } = require('internal/validators');
const { Buffer } = require('buffer');
const { isBuffer } = Buffer;
const { validateString } = require('internal/validators');
const { isUint8Array } = require('internal/util/types');
const { isURL, fileURLToPath } = require('internal/url');

let _permission;
let _audit;
let _ffi;

function normalizeReference(scope, reference, name) {
if (reference == null) {
return reference;
}

if (isURL(reference)) {
// Reference is only meaningful for fs.* scopes (FSPermission does
// per-path checks); every other scope ignores it (BooleanPermission),
// so only fs.* scopes require a file: URL.
if (StringPrototypeStartsWith(scope, 'fs')) {
return fileURLToPath(reference);
}
return reference.href;
}

if (isUint8Array(reference)) {
// Passed through as-is: the native binding copies the raw bytes
// directly instead of forcing a (potentially lossy) UTF-8 string
// conversion, since paths are not guaranteed to be valid UTF-8.
return reference;
}

validateString(reference, name);
return reference;
}

module.exports = ObjectFreeze({
__proto__: null,
isEnabled() {
Expand All@@ -32,28 +59,11 @@ module.exports = ObjectFreeze({
},
has(scope, reference) {
validateString(scope, 'scope');
if (reference != null) {
// TODO: add support for WHATWG URLs and Uint8Arrays.
if (isBuffer(reference)) {
validateBuffer(reference, 'reference');
} else {
validateString(reference, 'reference');
}
}

return permission.has(scope, reference);
return permission.has(scope, normalizeReference(scope, reference, 'reference'));
},
drop(scope, reference) {
validateString(scope, 'scope');
if (reference != null) {
if (isBuffer(reference)) {
validateBuffer(reference, 'reference');
} else {
validateString(reference, 'reference');
}
}

permission.drop(scope, reference);
permission.drop(scope, normalizeReference(scope, reference, 'reference'));
},
availableFlags() {
if (_ffi === undefined) {
Expand Down
36 changes: 24 additions & 12 deletions src/permission/permission.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,9 +90,12 @@ static void Drop(const FunctionCallbackInfo<Value>& args) {
}

if (args.Length() > 1 && !args[1]->IsUndefined()) {
Utf8Value utf8_arg(env->isolate(), args[1]);
if (utf8_arg.length() > 0) {
env->permission()->Drop(env, scope, utf8_arg.ToStringView());
// BufferValue copies raw bytes out of a Buffer/TypedArray as-is instead
// of forcing a (potentially lossy) UTF-8 string conversion, since paths
// are not guaranteed to be valid UTF-8.
BufferValue resource(env->isolate(), args[1]);
if (resource.length() > 0) {
env->permission()->Drop(env, scope, resource.ToStringView());
return;
}
}
Expand All@@ -113,13 +116,16 @@ static void Has(const FunctionCallbackInfo<Value>& args) {
}

if (args.Length() > 1 && !args[1]->IsUndefined()) {
Utf8Value utf8_arg(env->isolate(), args[1]);
if (utf8_arg.length() == 0) {
// BufferValue copies raw bytes out of a Buffer/TypedArray as-is instead
// of forcing a (potentially lossy) UTF-8 string conversion, since paths
// are not guaranteed to be valid UTF-8.
BufferValue resource(env->isolate(), args[1]);
if (resource.length() == 0) {
args.GetReturnValue().Set(false);
return;
}
return args.GetReturnValue().Set(
env->permission()->is_granted(env, scope, utf8_arg.ToStringView()));
env->permission()->is_granted(env, scope, resource.ToStringView()));
}

return args.GetReturnValue().Set(env->permission()->is_granted(env, scope));
Expand DownExpand Up@@ -174,16 +180,22 @@ static bool FastHasResource(
return false;
}

Local<String> res_str;
if (!resource_arg->ToString(context).ToLocal(&res_str)) {
return false;
// The JS wrapper always calls this with 2 arguments, passing undefined
// when no resource was given, so this path (unlike Has()) has to check
// for that explicitly and fall back to the scope-only check.
if (resource_arg->IsUndefined()) {
return env->permission()->is_granted(env, scope);
}
Utf8Value utf8_res(isolate, res_str);
if (utf8_res.length() == 0) {

// BufferValue is constructed directly from resource_arg (not from a
// pre-converted String) so that a Buffer/TypedArray's raw bytes are
// copied as-is instead of going through a lossy UTF-8 string conversion.
BufferValue resource(isolate, resource_arg);
if (resource.length() == 0) {
return false;
}

return env->permission()->is_granted(env, scope, utf8_res.ToStringView());
return env->permission()->is_granted(env, scope, resource.ToStringView());
}

static CFunction fast_has_methods_[] = {CFunction::Make(FastHas),
Expand Down
41 changes: 41 additions & 0 deletions test/fixtures/permission/has-reference-types.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
'use strict';

const assert = require('assert');
const { pathToFileURL } = require('url');

const allowedDir = process.env.ALLOWED_DIR;
const allowedFile = process.env.ALLOWED_FILE;
const deniedFile = process.env.DENIED_FILE;

// file: URL
{
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(allowedFile)), true);
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(deniedFile)), false);
assert.throws(() => {
process.permission.has('fs.read', new URL('https://example.com'));
}, { code: 'ERR_INVALID_URL_SCHEME' });
}

// Non-fs scopes like net ignore the reference, so a non-file: URL must not be rejected here.
{
assert.strictEqual(process.permission.has('net', new URL('https://example.com')), false);
}

// Uint8Array
{
const allowedBytes = new Uint8Array(Buffer.from(allowedFile));
const deniedBytes = new Uint8Array(Buffer.from(deniedFile));
assert.strictEqual(process.permission.has('fs.read', allowedBytes), true);
assert.strictEqual(process.permission.has('fs.read', deniedBytes), false);

// Must respect byteOffset/byteLength, not read from the start of the buffer.
const padded = Buffer.concat([Buffer.from('padding-'), Buffer.from(allowedFile)]);
const view = new Uint8Array(padded.buffer, padded.byteOffset + 8, Buffer.byteLength(allowedFile));
assert.strictEqual(process.permission.has('fs.read', view), true);
}

// drop() only matches the exact granted path (the directory), not a file inside it.
{
process.permission.drop('fs.read', pathToFileURL(allowedDir));
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(allowedFile)), false);
}
48 changes: 48 additions & 0 deletions test/parallel/test-permission-has-reference-types.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
'use strict';

// Test that process.permission.has()/drop() accept a URL or Uint8Array reference.

require('../common');
const { spawnSync } = require('child_process');
const assert = require('assert');
const { isMainThread } = require('worker_threads');

if (!isMainThread) {
process.exit(0);
}

const tmpdir = require('../common/tmpdir');
const fixtures = require('../common/fixtures');
const fs = require('fs');
const path = require('path');

tmpdir.refresh();

const allowedDir = path.join(tmpdir.path, 'allowed');
const deniedDir = path.join(tmpdir.path, 'denied');
fs.mkdirSync(allowedDir);
fs.mkdirSync(deniedDir);

const allowedFile = path.join(allowedDir, 'a.txt');
const deniedFile = path.join(deniedDir, 'b.txt');
fs.writeFileSync(allowedFile, 'allowed');
fs.writeFileSync(deniedFile, 'denied');

const { status, stderr } = spawnSync(
process.execPath,
[
'--permission',
`--allow-fs-read=${allowedDir}`,
fixtures.path('permission', 'has-reference-types.js'),
],
{
env: {
...process.env,
ALLOWED_DIR: allowedDir,
ALLOWED_FILE: allowedFile,
DENIED_FILE: deniedFile,
},
},
);

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 32 additions & 22 deletions lib/internal/process/permission.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,44 @@
const {
ArrayPrototypePush,
ObjectFreeze,
StringPrototypeStartsWith,
} = primordials;

const permission = internalBinding('permission');
const { validateString, validateBuffer } = require('internal/validators');
const { Buffer } = require('buffer');
const { isBuffer } = Buffer;
const { validateString } = require('internal/validators');
const { isUint8Array } = require('internal/util/types');
const { isURL, fileURLToPath } = require('internal/url');

let _permission;
let _audit;
let _ffi;

function normalizeReference(scope, reference, name) {
if (reference == null) {
return reference;
}

if (isURL(reference)) {
// Reference is only meaningful for fs.* scopes (FSPermission does
// per-path checks); every other scope ignores it (BooleanPermission),
// so only fs.* scopes require a file: URL.
if (StringPrototypeStartsWith(scope, 'fs')) {
return fileURLToPath(reference);
}
return reference.href;
}

if (isUint8Array(reference)) {
// Passed through as-is: the native binding copies the raw bytes
// directly instead of forcing a (potentially lossy) UTF-8 string
// conversion, since paths are not guaranteed to be valid UTF-8.
return reference;
}

validateString(reference, name);
return reference;
}

module.exports = ObjectFreeze({
__proto__: null,
isEnabled() {
Expand All@@ -32,28 +59,11 @@ module.exports = ObjectFreeze({
},
has(scope, reference) {
validateString(scope, 'scope');
if (reference != null) {
// TODO: add support for WHATWG URLs and Uint8Arrays.
if (isBuffer(reference)) {
validateBuffer(reference, 'reference');
} else {
validateString(reference, 'reference');
}
}

return permission.has(scope, reference);
return permission.has(scope, normalizeReference(scope, reference, 'reference'));
},
drop(scope, reference) {
validateString(scope, 'scope');
if (reference != null) {
if (isBuffer(reference)) {
validateBuffer(reference, 'reference');
} else {
validateString(reference, 'reference');
}
}

permission.drop(scope, reference);
permission.drop(scope, normalizeReference(scope, reference, 'reference'));
},
availableFlags() {
if (_ffi === undefined) {
Expand Down
36 changes: 24 additions & 12 deletions src/permission/permission.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,9 +90,12 @@ static void Drop(const FunctionCallbackInfo<Value>& args) {
}

if (args.Length() > 1 && !args[1]->IsUndefined()) {
Utf8Value utf8_arg(env->isolate(), args[1]);
if (utf8_arg.length() > 0) {
env->permission()->Drop(env, scope, utf8_arg.ToStringView());
// BufferValue copies raw bytes out of a Buffer/TypedArray as-is instead
// of forcing a (potentially lossy) UTF-8 string conversion, since paths
// are not guaranteed to be valid UTF-8.
BufferValue resource(env->isolate(), args[1]);
if (resource.length() > 0) {
env->permission()->Drop(env, scope, resource.ToStringView());
return;
}
}
Expand All@@ -113,13 +116,16 @@ static void Has(const FunctionCallbackInfo<Value>& args) {
}

if (args.Length() > 1 && !args[1]->IsUndefined()) {
Utf8Value utf8_arg(env->isolate(), args[1]);
if (utf8_arg.length() == 0) {
// BufferValue copies raw bytes out of a Buffer/TypedArray as-is instead
// of forcing a (potentially lossy) UTF-8 string conversion, since paths
// are not guaranteed to be valid UTF-8.
BufferValue resource(env->isolate(), args[1]);
if (resource.length() == 0) {
args.GetReturnValue().Set(false);
return;
}
return args.GetReturnValue().Set(
env->permission()->is_granted(env, scope, utf8_arg.ToStringView()));
env->permission()->is_granted(env, scope, resource.ToStringView()));
}

return args.GetReturnValue().Set(env->permission()->is_granted(env, scope));
Expand DownExpand Up@@ -174,16 +180,22 @@ static bool FastHasResource(
return false;
}

Local<String> res_str;
if (!resource_arg->ToString(context).ToLocal(&res_str)) {
return false;
// The JS wrapper always calls this with 2 arguments, passing undefined
// when no resource was given, so this path (unlike Has()) has to check
// for that explicitly and fall back to the scope-only check.
if (resource_arg->IsUndefined()) {
return env->permission()->is_granted(env, scope);
}
Utf8Value utf8_res(isolate, res_str);
if (utf8_res.length() == 0) {

// BufferValue is constructed directly from resource_arg (not from a
// pre-converted String) so that a Buffer/TypedArray's raw bytes are
// copied as-is instead of going through a lossy UTF-8 string conversion.
BufferValue resource(isolate, resource_arg);
if (resource.length() == 0) {
return false;
}

return env->permission()->is_granted(env, scope, utf8_res.ToStringView());
return env->permission()->is_granted(env, scope, resource.ToStringView());
}

static CFunction fast_has_methods_[] = {CFunction::Make(FastHas),
Expand Down
41 changes: 41 additions & 0 deletions test/fixtures/permission/has-reference-types.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
'use strict';

const assert = require('assert');
const { pathToFileURL } = require('url');

const allowedDir = process.env.ALLOWED_DIR;
const allowedFile = process.env.ALLOWED_FILE;
const deniedFile = process.env.DENIED_FILE;

// file: URL
{
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(allowedFile)), true);
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(deniedFile)), false);
assert.throws(() => {
process.permission.has('fs.read', new URL('https://example.com'));
}, { code: 'ERR_INVALID_URL_SCHEME' });
}

// Non-fs scopes like net ignore the reference, so a non-file: URL must not be rejected here.
{
assert.strictEqual(process.permission.has('net', new URL('https://example.com')), false);
}

// Uint8Array
{
const allowedBytes = new Uint8Array(Buffer.from(allowedFile));
const deniedBytes = new Uint8Array(Buffer.from(deniedFile));
assert.strictEqual(process.permission.has('fs.read', allowedBytes), true);
assert.strictEqual(process.permission.has('fs.read', deniedBytes), false);

// Must respect byteOffset/byteLength, not read from the start of the buffer.
const padded = Buffer.concat([Buffer.from('padding-'), Buffer.from(allowedFile)]);
const view = new Uint8Array(padded.buffer, padded.byteOffset + 8, Buffer.byteLength(allowedFile));
assert.strictEqual(process.permission.has('fs.read', view), true);
}

// drop() only matches the exact granted path (the directory), not a file inside it.
{
process.permission.drop('fs.read', pathToFileURL(allowedDir));
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(allowedFile)), false);
}
48 changes: 48 additions & 0 deletions test/parallel/test-permission-has-reference-types.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
'use strict';

// Test that process.permission.has()/drop() accept a URL or Uint8Array reference.

require('../common');
const { spawnSync } = require('child_process');
const assert = require('assert');
const { isMainThread } = require('worker_threads');

if (!isMainThread) {
process.exit(0);
}

const tmpdir = require('../common/tmpdir');
const fixtures = require('../common/fixtures');
const fs = require('fs');
const path = require('path');

tmpdir.refresh();

const allowedDir = path.join(tmpdir.path, 'allowed');
const deniedDir = path.join(tmpdir.path, 'denied');
fs.mkdirSync(allowedDir);
fs.mkdirSync(deniedDir);

const allowedFile = path.join(allowedDir, 'a.txt');
const deniedFile = path.join(deniedDir, 'b.txt');
fs.writeFileSync(allowedFile, 'allowed');
fs.writeFileSync(deniedFile, 'denied');

const { status, stderr } = spawnSync(
process.execPath,
[
'--permission',
`--allow-fs-read=${allowedDir}`,
fixtures.path('permission', 'has-reference-types.js'),
],
{
env: {
...process.env,
ALLOWED_DIR: allowedDir,
ALLOWED_FILE: allowedFile,
DENIED_FILE: deniedFile,
},
},
);

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 32 additions & 22 deletions lib/internal/process/permission.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,44 @@
const {
ArrayPrototypePush,
ObjectFreeze,
StringPrototypeStartsWith,
} = primordials;

const permission = internalBinding('permission');
const { validateString, validateBuffer } = require('internal/validators');
const { Buffer } = require('buffer');
const { isBuffer } = Buffer;
const { validateString } = require('internal/validators');
const { isUint8Array } = require('internal/util/types');
const { isURL, fileURLToPath } = require('internal/url');

let _permission;
let _audit;
let _ffi;

function normalizeReference(scope, reference, name) {
if (reference == null) {
return reference;
}

if (isURL(reference)) {
// Reference is only meaningful for fs.* scopes (FSPermission does
// per-path checks); every other scope ignores it (BooleanPermission),
// so only fs.* scopes require a file: URL.
if (StringPrototypeStartsWith(scope, 'fs')) {
return fileURLToPath(reference);
}
return reference.href;
}

if (isUint8Array(reference)) {
// Passed through as-is: the native binding copies the raw bytes
// directly instead of forcing a (potentially lossy) UTF-8 string
// conversion, since paths are not guaranteed to be valid UTF-8.
return reference;
}

validateString(reference, name);
return reference;
}

module.exports = ObjectFreeze({
__proto__: null,
isEnabled() {
Expand All@@ -32,28 +59,11 @@ module.exports = ObjectFreeze({
},
has(scope, reference) {
validateString(scope, 'scope');
if (reference != null) {
// TODO: add support for WHATWG URLs and Uint8Arrays.
if (isBuffer(reference)) {
validateBuffer(reference, 'reference');
} else {
validateString(reference, 'reference');
}
}

return permission.has(scope, reference);
return permission.has(scope, normalizeReference(scope, reference, 'reference'));
},
drop(scope, reference) {
validateString(scope, 'scope');
if (reference != null) {
if (isBuffer(reference)) {
validateBuffer(reference, 'reference');
} else {
validateString(reference, 'reference');
}
}

permission.drop(scope, reference);
permission.drop(scope, normalizeReference(scope, reference, 'reference'));
},
availableFlags() {
if (_ffi === undefined) {
Expand Down
36 changes: 24 additions & 12 deletions src/permission/permission.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,9 +90,12 @@ static void Drop(const FunctionCallbackInfo<Value>& args) {
}

if (args.Length() > 1 && !args[1]->IsUndefined()) {
Utf8Value utf8_arg(env->isolate(), args[1]);
if (utf8_arg.length() > 0) {
env->permission()->Drop(env, scope, utf8_arg.ToStringView());
// BufferValue copies raw bytes out of a Buffer/TypedArray as-is instead
// of forcing a (potentially lossy) UTF-8 string conversion, since paths
// are not guaranteed to be valid UTF-8.
BufferValue resource(env->isolate(), args[1]);
if (resource.length() > 0) {
env->permission()->Drop(env, scope, resource.ToStringView());
return;
}
}
Expand All@@ -113,13 +116,16 @@ static void Has(const FunctionCallbackInfo<Value>& args) {
}

if (args.Length() > 1 && !args[1]->IsUndefined()) {
Utf8Value utf8_arg(env->isolate(), args[1]);
if (utf8_arg.length() == 0) {
// BufferValue copies raw bytes out of a Buffer/TypedArray as-is instead
// of forcing a (potentially lossy) UTF-8 string conversion, since paths
// are not guaranteed to be valid UTF-8.
BufferValue resource(env->isolate(), args[1]);
if (resource.length() == 0) {
args.GetReturnValue().Set(false);
return;
}
return args.GetReturnValue().Set(
env->permission()->is_granted(env, scope, utf8_arg.ToStringView()));
env->permission()->is_granted(env, scope, resource.ToStringView()));
}

return args.GetReturnValue().Set(env->permission()->is_granted(env, scope));
Expand DownExpand Up@@ -174,16 +180,22 @@ static bool FastHasResource(
return false;
}

Local<String> res_str;
if (!resource_arg->ToString(context).ToLocal(&res_str)) {
return false;
// The JS wrapper always calls this with 2 arguments, passing undefined
// when no resource was given, so this path (unlike Has()) has to check
// for that explicitly and fall back to the scope-only check.
if (resource_arg->IsUndefined()) {
return env->permission()->is_granted(env, scope);
}
Utf8Value utf8_res(isolate, res_str);
if (utf8_res.length() == 0) {

// BufferValue is constructed directly from resource_arg (not from a
// pre-converted String) so that a Buffer/TypedArray's raw bytes are
// copied as-is instead of going through a lossy UTF-8 string conversion.
BufferValue resource(isolate, resource_arg);
if (resource.length() == 0) {
return false;
}

return env->permission()->is_granted(env, scope, utf8_res.ToStringView());
return env->permission()->is_granted(env, scope, resource.ToStringView());
}

static CFunction fast_has_methods_[] = {CFunction::Make(FastHas),
Expand Down
41 changes: 41 additions & 0 deletions test/fixtures/permission/has-reference-types.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
'use strict';

const assert = require('assert');
const { pathToFileURL } = require('url');

const allowedDir = process.env.ALLOWED_DIR;
const allowedFile = process.env.ALLOWED_FILE;
const deniedFile = process.env.DENIED_FILE;

// file: URL
{
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(allowedFile)), true);
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(deniedFile)), false);
assert.throws(() => {
process.permission.has('fs.read', new URL('https://example.com'));
}, { code: 'ERR_INVALID_URL_SCHEME' });
}

// Non-fs scopes like net ignore the reference, so a non-file: URL must not be rejected here.
{
assert.strictEqual(process.permission.has('net', new URL('https://example.com')), false);
}

// Uint8Array
{
const allowedBytes = new Uint8Array(Buffer.from(allowedFile));
const deniedBytes = new Uint8Array(Buffer.from(deniedFile));
assert.strictEqual(process.permission.has('fs.read', allowedBytes), true);
assert.strictEqual(process.permission.has('fs.read', deniedBytes), false);

// Must respect byteOffset/byteLength, not read from the start of the buffer.
const padded = Buffer.concat([Buffer.from('padding-'), Buffer.from(allowedFile)]);
const view = new Uint8Array(padded.buffer, padded.byteOffset + 8, Buffer.byteLength(allowedFile));
assert.strictEqual(process.permission.has('fs.read', view), true);
}

// drop() only matches the exact granted path (the directory), not a file inside it.
{
process.permission.drop('fs.read', pathToFileURL(allowedDir));
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(allowedFile)), false);
}
48 changes: 48 additions & 0 deletions test/parallel/test-permission-has-reference-types.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
'use strict';

// Test that process.permission.has()/drop() accept a URL or Uint8Array reference.

require('../common');
const { spawnSync } = require('child_process');
const assert = require('assert');
const { isMainThread } = require('worker_threads');

if (!isMainThread) {
process.exit(0);
}

const tmpdir = require('../common/tmpdir');
const fixtures = require('../common/fixtures');
const fs = require('fs');
const path = require('path');

tmpdir.refresh();

const allowedDir = path.join(tmpdir.path, 'allowed');
const deniedDir = path.join(tmpdir.path, 'denied');
fs.mkdirSync(allowedDir);
fs.mkdirSync(deniedDir);

const allowedFile = path.join(allowedDir, 'a.txt');
const deniedFile = path.join(deniedDir, 'b.txt');
fs.writeFileSync(allowedFile, 'allowed');
fs.writeFileSync(deniedFile, 'denied');

const { status, stderr } = spawnSync(
process.execPath,
[
'--permission',
`--allow-fs-read=${allowedDir}`,
fixtures.path('permission', 'has-reference-types.js'),
],
{
env: {
...process.env,
ALLOWED_DIR: allowedDir,
ALLOWED_FILE: allowedFile,
DENIED_FILE: deniedFile,
},
},
);

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 32 additions & 22 deletions lib/internal/process/permission.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,44 @@
const {
ArrayPrototypePush,
ObjectFreeze,
StringPrototypeStartsWith,
} = primordials;

const permission = internalBinding('permission');
const { validateString, validateBuffer } = require('internal/validators');
const { Buffer } = require('buffer');
const { isBuffer } = Buffer;
const { validateString } = require('internal/validators');
const { isUint8Array } = require('internal/util/types');
const { isURL, fileURLToPath } = require('internal/url');

let _permission;
let _audit;
let _ffi;

function normalizeReference(scope, reference, name) {
if (reference == null) {
return reference;
}

if (isURL(reference)) {
// Reference is only meaningful for fs.* scopes (FSPermission does
// per-path checks); every other scope ignores it (BooleanPermission),
// so only fs.* scopes require a file: URL.
if (StringPrototypeStartsWith(scope, 'fs')) {
return fileURLToPath(reference);
}
return reference.href;
}

if (isUint8Array(reference)) {
// Passed through as-is: the native binding copies the raw bytes
// directly instead of forcing a (potentially lossy) UTF-8 string
// conversion, since paths are not guaranteed to be valid UTF-8.
return reference;
}

validateString(reference, name);
return reference;
}

module.exports = ObjectFreeze({
__proto__: null,
isEnabled() {
Expand All@@ -32,28 +59,11 @@ module.exports = ObjectFreeze({
},
has(scope, reference) {
validateString(scope, 'scope');
if (reference != null) {
// TODO: add support for WHATWG URLs and Uint8Arrays.
if (isBuffer(reference)) {
validateBuffer(reference, 'reference');
} else {
validateString(reference, 'reference');
}
}

return permission.has(scope, reference);
return permission.has(scope, normalizeReference(scope, reference, 'reference'));
},
drop(scope, reference) {
validateString(scope, 'scope');
if (reference != null) {
if (isBuffer(reference)) {
validateBuffer(reference, 'reference');
} else {
validateString(reference, 'reference');
}
}

permission.drop(scope, reference);
permission.drop(scope, normalizeReference(scope, reference, 'reference'));
},
availableFlags() {
if (_ffi === undefined) {
Expand Down
36 changes: 24 additions & 12 deletions src/permission/permission.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,9 +90,12 @@ static void Drop(const FunctionCallbackInfo<Value>& args) {
}

if (args.Length() > 1 && !args[1]->IsUndefined()) {
Utf8Value utf8_arg(env->isolate(), args[1]);
if (utf8_arg.length() > 0) {
env->permission()->Drop(env, scope, utf8_arg.ToStringView());
// BufferValue copies raw bytes out of a Buffer/TypedArray as-is instead
// of forcing a (potentially lossy) UTF-8 string conversion, since paths
// are not guaranteed to be valid UTF-8.
BufferValue resource(env->isolate(), args[1]);
if (resource.length() > 0) {
env->permission()->Drop(env, scope, resource.ToStringView());
return;
}
}
Expand All@@ -113,13 +116,16 @@ static void Has(const FunctionCallbackInfo<Value>& args) {
}

if (args.Length() > 1 && !args[1]->IsUndefined()) {
Utf8Value utf8_arg(env->isolate(), args[1]);
if (utf8_arg.length() == 0) {
// BufferValue copies raw bytes out of a Buffer/TypedArray as-is instead
// of forcing a (potentially lossy) UTF-8 string conversion, since paths
// are not guaranteed to be valid UTF-8.
BufferValue resource(env->isolate(), args[1]);
if (resource.length() == 0) {
args.GetReturnValue().Set(false);
return;
}
return args.GetReturnValue().Set(
env->permission()->is_granted(env, scope, utf8_arg.ToStringView()));
env->permission()->is_granted(env, scope, resource.ToStringView()));
}

return args.GetReturnValue().Set(env->permission()->is_granted(env, scope));
Expand DownExpand Up@@ -174,16 +180,22 @@ static bool FastHasResource(
return false;
}

Local<String> res_str;
if (!resource_arg->ToString(context).ToLocal(&res_str)) {
return false;
// The JS wrapper always calls this with 2 arguments, passing undefined
// when no resource was given, so this path (unlike Has()) has to check
// for that explicitly and fall back to the scope-only check.
if (resource_arg->IsUndefined()) {
return env->permission()->is_granted(env, scope);
}
Utf8Value utf8_res(isolate, res_str);
if (utf8_res.length() == 0) {

// BufferValue is constructed directly from resource_arg (not from a
// pre-converted String) so that a Buffer/TypedArray's raw bytes are
// copied as-is instead of going through a lossy UTF-8 string conversion.
BufferValue resource(isolate, resource_arg);
if (resource.length() == 0) {
return false;
}

return env->permission()->is_granted(env, scope, utf8_res.ToStringView());
return env->permission()->is_granted(env, scope, resource.ToStringView());
}

static CFunction fast_has_methods_[] = {CFunction::Make(FastHas),
Expand Down
41 changes: 41 additions & 0 deletions test/fixtures/permission/has-reference-types.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
'use strict';

const assert = require('assert');
const { pathToFileURL } = require('url');

const allowedDir = process.env.ALLOWED_DIR;
const allowedFile = process.env.ALLOWED_FILE;
const deniedFile = process.env.DENIED_FILE;

// file: URL
{
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(allowedFile)), true);
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(deniedFile)), false);
assert.throws(() => {
process.permission.has('fs.read', new URL('https://example.com'));
}, { code: 'ERR_INVALID_URL_SCHEME' });
}

// Non-fs scopes like net ignore the reference, so a non-file: URL must not be rejected here.
{
assert.strictEqual(process.permission.has('net', new URL('https://example.com')), false);
}

// Uint8Array
{
const allowedBytes = new Uint8Array(Buffer.from(allowedFile));
const deniedBytes = new Uint8Array(Buffer.from(deniedFile));
assert.strictEqual(process.permission.has('fs.read', allowedBytes), true);
assert.strictEqual(process.permission.has('fs.read', deniedBytes), false);

// Must respect byteOffset/byteLength, not read from the start of the buffer.
const padded = Buffer.concat([Buffer.from('padding-'), Buffer.from(allowedFile)]);
const view = new Uint8Array(padded.buffer, padded.byteOffset + 8, Buffer.byteLength(allowedFile));
assert.strictEqual(process.permission.has('fs.read', view), true);
}

// drop() only matches the exact granted path (the directory), not a file inside it.
{
process.permission.drop('fs.read', pathToFileURL(allowedDir));
assert.strictEqual(process.permission.has('fs.read', pathToFileURL(allowedFile)), false);
}
48 changes: 48 additions & 0 deletions test/parallel/test-permission-has-reference-types.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
'use strict';

// Test that process.permission.has()/drop() accept a URL or Uint8Array reference.

require('../common');
const { spawnSync } = require('child_process');
const assert = require('assert');
const { isMainThread } = require('worker_threads');

if (!isMainThread) {
process.exit(0);
}

const tmpdir = require('../common/tmpdir');
const fixtures = require('../common/fixtures');
const fs = require('fs');
const path = require('path');

tmpdir.refresh();

const allowedDir = path.join(tmpdir.path, 'allowed');
const deniedDir = path.join(tmpdir.path, 'denied');
fs.mkdirSync(allowedDir);
fs.mkdirSync(deniedDir);

const allowedFile = path.join(allowedDir, 'a.txt');
const deniedFile = path.join(deniedDir, 'b.txt');
fs.writeFileSync(allowedFile, 'allowed');
fs.writeFileSync(deniedFile, 'denied');

const { status, stderr } = spawnSync(
process.execPath,
[
'--permission',
`--allow-fs-read=${allowedDir}`,
fixtures.path('permission', 'has-reference-types.js'),
],
{
env: {
...process.env,
ALLOWED_DIR: allowedDir,
ALLOWED_FILE: allowedFile,
DENIED_FILE: deniedFile,
},
},
);

assert.strictEqual(status, 0, stderr.toString());
Loading