Skip to content

Commit 43160dc

Browse files
tniessenUlisesGascon
authored andcommitted
permission: mark const functions as such
Otherwise, non-mutating functions such as is_tree_granted unnecessarily require pointers to mutable data structures. PR-URL: #50705 Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Vinícius Lourenço Claro Cardoso <contact@viniciusl.com.br>
1 parent a645d5a commit 43160dc

9 files changed

+18
-16
lines changed

src/permission/child_process_permission.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void ChildProcessPermission::Apply(const std::vector<std::string>& allow,
1515
}
1616

1717
bool ChildProcessPermission::is_granted(PermissionScope perm,
18-
const std::string_view& param) {
18+
const std::string_view& param) const {
1919
return deny_all_ == false;
2020
}
2121

src/permission/child_process_permission.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class ChildProcessPermission final : public PermissionBase {
1515
void Apply(const std::vector<std::string>& allow,
1616
PermissionScope scope) override;
1717
bool is_granted(PermissionScope perm,
18-
const std::string_view& param = "") override;
18+
const std::string_view& param = "") const override;
1919

2020
private:
2121
bool deny_all_;

src/permission/fs_permission.cc

+5-4
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ void FreeRecursivelyNode(
5050
delete node;
5151
}
5252

53-
bool is_tree_granted(node::permission::FSPermission::RadixTree* granted_tree,
54-
const std::string_view& param) {
53+
bool is_tree_granted(
54+
const node::permission::FSPermission::RadixTree* granted_tree,
55+
const std::string_view& param) {
5556
#ifdef _WIN32
5657
// is UNC file path
5758
if (param.rfind("\\\\", 0) == 0) {
@@ -147,7 +148,7 @@ void FSPermission::GrantAccess(PermissionScope perm, const std::string& res) {
147148
}
148149

149150
bool FSPermission::is_granted(PermissionScope perm,
150-
const std::string_view& param = "") {
151+
const std::string_view& param = "") const {
151152
switch (perm) {
152153
case PermissionScope::kFileSystem:
153154
return allow_all_in_ && allow_all_out_;
@@ -171,7 +172,7 @@ FSPermission::RadixTree::~RadixTree() {
171172
}
172173

173174
bool FSPermission::RadixTree::Lookup(const std::string_view& s,
174-
bool when_empty_return = false) {
175+
bool when_empty_return = false) const {
175176
FSPermission::RadixTree::Node* current_node = root_node_;
176177
if (current_node->children.size() == 0) {
177178
return when_empty_return;

src/permission/fs_permission.h

+6-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ class FSPermission final : public PermissionBase {
1717
public:
1818
void Apply(const std::vector<std::string>& allow,
1919
PermissionScope scope) override;
20-
bool is_granted(PermissionScope perm, const std::string_view& param) override;
20+
bool is_granted(PermissionScope perm,
21+
const std::string_view& param) const override;
2122

2223
struct RadixTree {
2324
struct Node {
@@ -72,7 +73,7 @@ class FSPermission final : public PermissionBase {
7273
return wildcard_child;
7374
}
7475

75-
Node* NextNode(const std::string& path, size_t idx) {
76+
Node* NextNode(const std::string& path, size_t idx) const {
7677
if (idx >= path.length()) {
7778
return nullptr;
7879
}
@@ -115,7 +116,7 @@ class FSPermission final : public PermissionBase {
115116
// ---> '\000' ASCII (0) || \0
116117
// ---> er
117118
// ---> n
118-
bool IsEndNode() {
119+
bool IsEndNode() const {
119120
if (children.size() == 0) {
120121
return true;
121122
}
@@ -126,8 +127,8 @@ class FSPermission final : public PermissionBase {
126127
RadixTree();
127128
~RadixTree();
128129
void Insert(const std::string& s);
129-
bool Lookup(const std::string_view& s) { return Lookup(s, false); }
130-
bool Lookup(const std::string_view& s, bool when_empty_return);
130+
bool Lookup(const std::string_view& s) const { return Lookup(s, false); }
131+
bool Lookup(const std::string_view& s, bool when_empty_return) const;
131132

132133
private:
133134
Node* root_node_;

src/permission/inspector_permission.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ void InspectorPermission::Apply(const std::vector<std::string>& allow,
1414
}
1515

1616
bool InspectorPermission::is_granted(PermissionScope perm,
17-
const std::string_view& param) {
17+
const std::string_view& param) const {
1818
return deny_all_ == false;
1919
}
2020

src/permission/inspector_permission.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class InspectorPermission final : public PermissionBase {
1515
void Apply(const std::vector<std::string>& allow,
1616
PermissionScope scope) override;
1717
bool is_granted(PermissionScope perm,
18-
const std::string_view& param = "") override;
18+
const std::string_view& param = "") const override;
1919

2020
private:
2121
bool deny_all_;

src/permission/permission_base.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class PermissionBase {
4242
virtual void Apply(const std::vector<std::string>& allow,
4343
PermissionScope scope) = 0;
4444
virtual bool is_granted(PermissionScope perm,
45-
const std::string_view& param = "") = 0;
45+
const std::string_view& param = "") const = 0;
4646
};
4747

4848
} // namespace permission

src/permission/worker_permission.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void WorkerPermission::Apply(const std::vector<std::string>& allow,
1515
}
1616

1717
bool WorkerPermission::is_granted(PermissionScope perm,
18-
const std::string_view& param) {
18+
const std::string_view& param) const {
1919
return deny_all_ == false;
2020
}
2121

src/permission/worker_permission.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class WorkerPermission final : public PermissionBase {
1515
void Apply(const std::vector<std::string>& allow,
1616
PermissionScope scope) override;
1717
bool is_granted(PermissionScope perm,
18-
const std::string_view& param = "") override;
18+
const std::string_view& param = "") const override;
1919

2020
private:
2121
bool deny_all_;

0 commit comments

Comments
 (0)