Skip to content
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

Jump to bottom

Update nginz and cannon ACLs to match api-versioned paths #2725

Merged
merged 3 commits into from
Sep 26, 2022
Merged

Update nginz and cannon ACLs to match api-versioned paths #2725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98699c9
Update nginz whitelists and blacklists
pcapriotti Sep 23, 2022
ec7ef15
Update cannon zauth.acl
smatting Sep 23, 2022
68c0f8b
Add changelog entry
smatting Sep 23, 2022
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
1 change: 1 addition & 0 deletions changelog.d/5-internal/pr-2725
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update nginz and cannon ACLs to match api-versioned paths
18 changes: 1 addition & 17 deletions charts/cannon/conf/static/zauth.acl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1 @@
a (blacklist (path "/provider")
(path "/provider/**")
(path "/bot")
(path "/bot/**")
(path "/i/**"))

b (whitelist (path "/bot")
(path "/bot/**"))

p (whitelist (path "/provider")
(path "/provider/**"))

# LegalHold Access Tokens
la (whitelist (path "/notifications")
(path "/assets/v3/**")
(path "/users")
(path "/users/**"))
a (whitelist (regex "/await"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since cannon only have the /await route there is no need to include other rules

23 changes: 9 additions & 14 deletions charts/nginz/static/conf/zauth.acl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
a (blacklist (path "/provider")
(path "/provider/**")
(path "/bot")
(path "/bot/**")
(path "/i/**"))
a (blacklist (regex "(/v[0-9]+)?/provider(/.*)?")
(regex "(/v[0-9]+)?/bot(/.*)?")
(regex "(/v[0-9]+)?/i/.*"))

b (whitelist (path "/bot")
(path "/bot/**"))
b (whitelist (regex "(/v[0-9]+)?/bot(/.*)?"))

p (whitelist (path "/provider")
(path "/provider/**"))
p (whitelist (regex "(/v[0-9]+)?/provider(/.*)?"))

# LegalHold Access Tokens
la (whitelist (path "/notifications")
(path "/assets/v3/**")
(path "/users")
(path "/users/**")
(path "/legalhold/conversations/*"))
la (whitelist (regex "(/v[0-9]+)?/notifications")
(regex "(/v[0-9]+)?/assets/v3/.*")
(regex "(/v[0-9]+)?/users(/.*)?")
(regex "(/v[0-9]+)?/legalhold/conversations/[^/]+"))