fixup! lib,permission: add permission.drop

Author: RafaelGSS

doc/api/process.md

@@ -4660,7 +4660,6 @@ cases:
 [`ChildProcess.disconnect()`]: child_process.md#subprocessdisconnect
 [`ChildProcess.send()`]: child_process.md#subprocesssendmessage-sendhandle-options-callback
 [`ChildProcess`]: child_process.md#class-childprocess
-[`ERR_ACCESS_DENIED`]: errors.md#err_access_denied
 [`Error`]: errors.md#class-error
 [`EventEmitter`]: events.md#class-eventemitter
 [`NODE_OPTIONS`]: cli.md#node_optionsoptions

src/permission/addon_permission.cc

@@ -15,8 +15,8 @@ void AddonPermission::Apply(Environment* env,
 }
 
 void AddonPermission::Drop(Environment* env,
-                            PermissionScope scope,
-                            const std::string_view& param) {
+                           PermissionScope scope,
+                           const std::string_view& param) {
   deny_all_ = true;
 }
 

src/permission/child_process_permission.cc

@@ -16,8 +16,8 @@ void ChildProcessPermission::Apply(Environment* env,
 }
 
 void ChildProcessPermission::Drop(Environment* env,
-                                   PermissionScope scope,
-                                   const std::string_view& param) {
+                                  PermissionScope scope,
+                                  const std::string_view& param) {
   deny_all_ = true;
 }
 

src/permission/fs_permission.cc

@@ -155,8 +155,8 @@ void FSPermission::Apply(Environment* env,
 }
 
 void FSPermission::Drop(Environment* env,
-                         PermissionScope scope,
-                         const std::string_view& param) {
+                        PermissionScope scope,
+                        const std::string_view& param) {
   if (param.empty()) {
     // Drop all access for this scope
     if (scope == PermissionScope::kFileSystemRead ||
@@ -192,19 +192,18 @@ void FSPermission::Drop(Environment* env,
   }
 }
 
-void FSPermission::RevokeAccess(PermissionScope perm,
-                                 const std::string& res) {
+void FSPermission::RevokeAccess(PermissionScope perm, const std::string& res) {
   const std::string path = WildcardIfDir(res);
   if (perm == PermissionScope::kFileSystemRead) {
-    auto it = std::find(granted_paths_in_.begin(),
-                        granted_paths_in_.end(), path);
+    auto it =
+        std::find(granted_paths_in_.begin(), granted_paths_in_.end(), path);
     if (it != granted_paths_in_.end()) {
       granted_paths_in_.erase(it);
       RebuildTree(PermissionScope::kFileSystemRead);
     }
   } else if (perm == PermissionScope::kFileSystemWrite) {
-    auto it = std::find(granted_paths_out_.begin(),
-                        granted_paths_out_.end(), path);
+    auto it =
+        std::find(granted_paths_out_.begin(), granted_paths_out_.end(), path);
     if (it != granted_paths_out_.end()) {
       granted_paths_out_.erase(it);
       RebuildTree(PermissionScope::kFileSystemWrite);

src/permission/inspector_permission.cc

@@ -15,8 +15,8 @@ void InspectorPermission::Apply(Environment* env,
 }
 
 void InspectorPermission::Drop(Environment* env,
-                                PermissionScope scope,
-                                const std::string_view& param) {
+                               PermissionScope scope,
+                               const std::string_view& param) {
   deny_all_ = true;
 }
 

src/permission/net_permission.cc

@@ -14,8 +14,8 @@ void NetPermission::Apply(Environment* env,
 }
 
 void NetPermission::Drop(Environment* env,
-                          PermissionScope scope,
-                          const std::string_view& param) {
+                         PermissionScope scope,
+                         const std::string_view& param) {
   allow_net_ = false;
 }
 

src/permission/permission.cc

@@ -300,8 +300,8 @@ void Permission::Apply(Environment* env,
 }
 
 void Permission::Drop(Environment* env,
-                       PermissionScope scope,
-                       const std::string_view& param) {
+                      PermissionScope scope,
+                      const std::string_view& param) {
   auto permission = nodes_.find(scope);
   if (permission != nodes_.end()) {
     permission->second->Drop(env, scope, param);

src/permission/wasi_permission.cc

@@ -16,8 +16,8 @@ void WASIPermission::Apply(Environment* env,
 }
 
 void WASIPermission::Drop(Environment* env,
-                           PermissionScope scope,
-                           const std::string_view& param) {
+                          PermissionScope scope,
+                          const std::string_view& param) {
   deny_all_ = true;
 }
 

src/permission/worker_permission.cc

@@ -16,8 +16,8 @@ void WorkerPermission::Apply(Environment* env,
 }
 
 void WorkerPermission::Drop(Environment* env,
-                             PermissionScope scope,
-                             const std::string_view& param) {
+                            PermissionScope scope,
+                            const std::string_view& param) {
   deny_all_ = true;
 }
 

test/parallel/test-permission-drop-fs-granted-path.js

@@ -1,6 +1,6 @@
 'use strict';
 
-// Tests that drop() only revokes the exact resource that was explicitly granted.
+require('../common');
 
 const { spawnSync } = require('child_process');
 const assert = require('assert');
@@ -9,8 +9,6 @@ const { isMainThread } = require('worker_threads');
 if (!isMainThread) {
   process.exit(0);
 }
-
-require('../common');
 const tmpdir = require('../common/tmpdir');
 const fs = require('fs');
 const path = require('path');
@@ -45,7 +43,7 @@ fs.writeFileSync(path.join(dir, 'item2.txt'), 'bbb');
   if (child.status !== 0) {
     console.error('Case 1 stderr:', child.stderr?.toString());
   }
-  assert.strictEqual(child.status, 0, 'Case 1 failed');
+  assert.strictEqual(child.status, 0);
 }
 
 // Grant a directory, drop the same directory - should revoke all access
@@ -69,7 +67,7 @@ fs.writeFileSync(path.join(dir, 'item2.txt'), 'bbb');
   if (child.status !== 0) {
     console.error('Case 2 stderr:', child.stderr?.toString());
   }
-  assert.strictEqual(child.status, 0, 'Case 2 failed');
+  assert.strictEqual(child.status, 0);
 }
 
 // Grant two directories, drop one - the other remains accessible
@@ -105,7 +103,7 @@ fs.writeFileSync(path.join(dir, 'item2.txt'), 'bbb');
   if (child.status !== 0) {
     console.error('Case 3 stderr:', child.stderr?.toString());
   }
-  assert.strictEqual(child.status, 0, 'Case 3 failed');
+  assert.strictEqual(child.status, 0);
 }
 
 // Grant a directory and a file inside it separately, drop the file
@@ -132,7 +130,7 @@ fs.writeFileSync(path.join(dir, 'item2.txt'), 'bbb');
   if (child.status !== 0) {
     console.error('Case 4 stderr:', child.stderr?.toString());
   }
-  assert.strictEqual(child.status, 0, 'Case 4 failed');
+  assert.strictEqual(child.status, 0);
 }
 
 // Drop entire scope without reference - revokes everything
@@ -156,5 +154,5 @@ fs.writeFileSync(path.join(dir, 'item2.txt'), 'bbb');
   if (child.status !== 0) {
     console.error('Case 5 stderr:', child.stderr?.toString());
   }
-  assert.strictEqual(child.status, 0, 'Case 5 failed');
+  assert.strictEqual(child.status, 0);
 }