Skip to content

Commit 2dae42c

Browse files
committed
fixup! src,permission: resolve path on fs_permission
1 parent 5f430a1 commit 2dae42c

10 files changed

+22
-32
lines changed

src/permission/child_process_permission.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ void ChildProcessPermission::Apply(Environment* env,
1515
deny_all_ = true;
1616
}
1717

18-
bool ChildProcessPermission::is_granted(
19-
Environment* env,
20-
PermissionScope perm,
18+
bool ChildProcessPermission::is_granted(Environment* env,
19+
PermissionScope perm,
2120
const std::string_view& param) const {
2221
return deny_all_ == false;
2322
}

src/permission/child_process_permission.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ class ChildProcessPermission final : public PermissionBase {
1515
void Apply(Environment* env,
1616
const std::vector<std::string>& allow,
1717
PermissionScope scope) override;
18-
bool is_granted(
19-
Environment* env,
20-
PermissionScope perm,
18+
bool is_granted(Environment* env,
19+
PermissionScope perm,
2120
const std::string_view& param = "") const override;
2221

2322
private:

src/permission/fs_permission.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,8 @@ void FSPermission::GrantAccess(PermissionScope perm, const std::string& res) {
149149
}
150150
}
151151

152-
bool FSPermission::is_granted(
153-
Environment* env,
154-
PermissionScope perm,
152+
bool FSPermission::is_granted(Environment* env,
153+
PermissionScope perm,
155154
const std::string_view& param = "") const {
156155
switch (perm) {
157156
case PermissionScope::kFileSystem:

src/permission/fs_permission.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ class FSPermission final : public PermissionBase {
1818
void Apply(Environment* env,
1919
const std::vector<std::string>& allow,
2020
PermissionScope scope) override;
21-
bool is_granted(
22-
Environment* env,
23-
PermissionScope perm,
21+
bool is_granted(Environment* env,
22+
PermissionScope perm,
2423
const std::string_view& param) const override;
2524

2625
struct RadixTree {

src/permission/inspector_permission.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ void InspectorPermission::Apply(Environment* env,
1414
deny_all_ = true;
1515
}
1616

17-
bool InspectorPermission::is_granted(
18-
Environment* env,
19-
PermissionScope perm,
17+
bool InspectorPermission::is_granted(Environment* env,
18+
PermissionScope perm,
2019
const std::string_view& param) const {
2120
return deny_all_ == false;
2221
}

src/permission/inspector_permission.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ class InspectorPermission final : public PermissionBase {
1515
void Apply(Environment* env,
1616
const std::vector<std::string>& allow,
1717
PermissionScope scope) override;
18-
bool is_granted(
19-
Environment* env,
20-
PermissionScope perm,
18+
bool is_granted(Environment* env,
19+
PermissionScope perm,
2120
const std::string_view& param = "") const override;
2221

2322
private:

src/permission/permission.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace permission {
2727

2828
#define THROW_IF_INSUFFICIENT_PERMISSIONS(env, perm_, resource_, ...) \
2929
do { \
30-
if (UNLIKELY(!(env)->permission()->is_granted(env, perm_, resource_))) { \
30+
if (UNLIKELY(!(env)->permission()->is_granted(env, perm_, resource_))) { \
3131
node::permission::Permission::ThrowAccessDenied( \
3232
(env), perm_, resource_); \
3333
return __VA_ARGS__; \
@@ -37,7 +37,7 @@ namespace permission {
3737
#define ASYNC_THROW_IF_INSUFFICIENT_PERMISSIONS( \
3838
env, wrap, perm_, resource_, ...) \
3939
do { \
40-
if (UNLIKELY(!(env)->permission()->is_granted(env, perm_, resource_))) { \
40+
if (UNLIKELY(!(env)->permission()->is_granted(env, perm_, resource_))) { \
4141
node::permission::Permission::AsyncThrowAccessDenied( \
4242
(env), wrap, perm_, resource_); \
4343
return __VA_ARGS__; \
@@ -74,9 +74,8 @@ class Permission {
7474
void EnablePermissions();
7575

7676
private:
77-
COLD_NOINLINE bool is_scope_granted(
78-
Environment* env,
79-
const PermissionScope permission,
77+
COLD_NOINLINE bool is_scope_granted(Environment* env,
78+
const PermissionScope permission,
8079
const std::string_view& res = "") const {
8180
auto perm_node = nodes_.find(permission);
8281
if (perm_node != nodes_.end()) {

src/permission/permission_base.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@ class PermissionBase {
4444
virtual void Apply(Environment* env,
4545
const std::vector<std::string>& allow,
4646
PermissionScope scope) = 0;
47-
virtual bool is_granted(
48-
Environment* env,
49-
PermissionScope perm,
47+
virtual bool is_granted(Environment* env,
48+
PermissionScope perm,
5049
const std::string_view& param = "") const = 0;
5150
};
5251

src/permission/worker_permission.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ void WorkerPermission::Apply(Environment* env,
1515
deny_all_ = true;
1616
}
1717

18-
bool WorkerPermission::is_granted(
19-
Environment* env,
20-
PermissionScope perm,
18+
bool WorkerPermission::is_granted(Environment* env,
19+
PermissionScope perm,
2120
const std::string_view& param) const {
2221
return deny_all_ == false;
2322
}

src/permission/worker_permission.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ class WorkerPermission final : public PermissionBase {
1515
void Apply(Environment* env,
1616
const std::vector<std::string>& allow,
1717
PermissionScope scope) override;
18-
bool is_granted(
19-
Environment* env,
20-
PermissionScope perm,
18+
bool is_granted(Environment* env,
19+
PermissionScope perm,
2120
const std::string_view& param = "") const override;
2221

2322
private:

0 commit comments

Comments
 (0)