src: bring permissions macros in line with general C/C++ standards

addaleax · RafaelGSS · commit 6417dc879e19 · 2025-10-06T22:41:24.000-03:00
Specifically, avoid the hazard of unintentionally evaluating an argument multiple times during macro expansion, and do not assume the available of particular namespaces in the current scope. PR-URL: #60053 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
diff --git a/src/node_report.cc b/src/node_report.cc
@@ -859,7 +859,7 @@ std::string TriggerNodeReport(Isolate* isolate,
       THROW_IF_INSUFFICIENT_PERMISSIONS(
           env,
           permission::PermissionScope::kFileSystemWrite,
-          std::string_view(Environment::GetCwd(env->exec_path())),
+          Environment::GetCwd(env->exec_path()),
           filename);
     }
   }
diff --git a/src/permission/permission.h b/src/permission/permission.h
@@ -27,25 +27,63 @@ class FSReqBase;
 
 namespace permission {
 
-#define THROW_IF_INSUFFICIENT_PERMISSIONS(env, perm_, resource_, ...)          \
+#define THROW_IF_INSUFFICIENT_PERMISSIONS(env, perm, resource, ...)            \
   do {                                                                         \
-    if (!env->permission()->is_granted(env, perm_, resource_)) [[unlikely]] {  \
+    node::Environment* env__ = (env);                                          \
+    const node::permission::PermissionScope perm__ = (perm);                   \
+    const auto resource__ = (resource);                                        \
+    if (!env__->permission()->is_granted(env__, perm__, resource__))           \
+        [[unlikely]] {                                                         \
       node::permission::Permission::ThrowAccessDenied(                         \
-          (env), perm_, resource_);                                            \
+          env__, perm__, resource__);                                          \
       return __VA_ARGS__;                                                      \
     }                                                                          \
   } while (0)
 
 #define ASYNC_THROW_IF_INSUFFICIENT_PERMISSIONS(                               \
-    env, wrap, perm_, resource_, ...)                                          \
+    env, wrap, perm, resource, ...)                                            \
   do {                                                                         \
-    if (!env->permission()->is_granted(env, perm_, resource_)) [[unlikely]] {  \
+    node::Environment* env__ = (env);                                          \
+    const node::permission::PermissionScope perm__ = (perm);                   \
+    const auto resource__ = (resource);                                        \
+    if (!env__->permission()->is_granted(env__, perm__, resource__))           \
+        [[unlikely]] {                                                         \
       node::permission::Permission::AsyncThrowAccessDenied(                    \
-          (env), wrap, perm_, resource_);                                      \
+          env__, (wrap), perm__, resource__);                                  \
       return __VA_ARGS__;                                                      \
     }                                                                          \
   } while (0)
 
+#define ERR_ACCESS_DENIED_IF_INSUFFICIENT_PERMISSIONS(                         \
+    env, perm, resource, args, ...)                                            \
+  do {                                                                         \
+    node::Environment* env__ = (env);                                          \
+    const node::permission::PermissionScope perm__ = (perm);                   \
+    const auto resource__ = (resource);                                        \
+    if (!env__->permission()->is_granted(env__, perm__, resource__))           \
+        [[unlikely]] {                                                         \
+      Local<Value> err_access;                                                 \
+      if (node::permission::CreateAccessDeniedError(env__, perm__, resource__) \
+              .ToLocal(&err_access)) {                                         \
+        args.GetReturnValue().Set(err_access);                                 \
+      } else {                                                                 \
+        args.GetReturnValue().Set(UV_EACCES);                                  \
+      }                                                                        \
+      return __VA_ARGS__;                                                      \
+    }                                                                          \
+  } while (0)
+
+#define SET_INSUFFICIENT_PERMISSION_ERROR_CALLBACK(scope)                      \
+  void InsufficientPermissionError(std::string_view resource) {                \
+    v8::HandleScope handle_scope(env()->isolate());                            \
+    v8::Context::Scope context_scope(env()->context());                        \
+    v8::Local<v8::Value> arg;                                                  \
+    if (!permission::CreateAccessDeniedError(env(), (scope), resource)         \
+             .ToLocal(&arg)) {                                                 \
+    }                                                                          \
+    MakeCallback(env()->oncomplete_string(), 1, &arg);                         \
+  }
+
 class Permission {
  public:
   Permission();

Original file line number	Diff line number	Diff line change
`@@ -859,7 +859,7 @@ std::string TriggerNodeReport(Isolate* isolate,`
`859`	`859`	`THROW_IF_INSUFFICIENT_PERMISSIONS(`
`860`	`860`	`env,`
`861`	`861`	`permission::PermissionScope::kFileSystemWrite,`
`862`		`- std::string_view(Environment::GetCwd(env->exec_path())),`
	`862`	`+ Environment::GetCwd(env->exec_path()),`
`863`	`863`	`filename);`
`864`	`864`	`}`
`865`	`865`	`}`