Skip to content

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

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+24 −12
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/node_report.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,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);
}
}
Expand Down
34 changes: 23 additions & 11 deletions src/permission/permission.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,43 @@ 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, ...) \
env, perm, resource, args, ...) \
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]] { \
Local<Value> err_access; \
if (permission::CreateAccessDeniedError(env, perm_, resource_) \
if (node::permission::CreateAccessDeniedError(env__, perm__, resource__) \
.ToLocal(&err_access)) { \
args.GetReturnValue().Set(err_access); \
} else { \
Expand All @@ -63,11 +75,11 @@ namespace permission {
} while (0)

#define SET_INSUFFICIENT_PERMISSION_ERROR_CALLBACK(scope) \
void InsufficientPermissionError(const std::string resource) { \
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) \
if (!permission::CreateAccessDeniedError(env(), (scope), resource) \
.ToLocal(&arg)) { \
} \
MakeCallback(env()->oncomplete_string(), 1, &arg); \
Expand Down
Loading