Skip to content

Tighten tenant bypass for tenantless endpoints #6

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

Open
cyrossignol wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −10
Open

Tighten tenant bypass for tenantless endpoints #6

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
21 changes: 11 additions & 10 deletions api/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,13 @@ def get_workspace_repository(
"forwarded",
}

# Define paths that do not require X-Workspace header
AUTH_WHITELIST_PATTERNS = [
re.compile(p)
for p in [
# Creating/deleting workspaces and JOSM path rewriting:
r"^/api/0\.6/workspaces.*$",
# Provisioning users during authentication:
r"^/api/0\.6/user/.*$",
]
# Paths that do not require X-Workspace header, scoped by HTTP method. Each
# entry is a tuple of: (compiled regex, set of allowed methods).
TENANT_BYPASSES: list[tuple[re.Pattern[str], set[str]]] = [
# Creating/deleting a workspace (no tenant context applies):
(re.compile(r"^/api/0\.6/workspaces/\d+$"), {"PUT", "DELETE"}),
# Provisioning users during authentication:
(re.compile(r"^/api/0\.6/user/[^/]+$"), {"PUT"}),
]


Expand Down Expand Up @@ -225,7 +223,10 @@ async def catch_all(
detail="You do not have access to this workspace",
)
else:
if not any(p.fullmatch(request.url.path) for p in AUTH_WHITELIST_PATTERNS):
if not any(
p.fullmatch(request.url.path) and request.method in methods
for p, methods in TENANT_BYPASSES
):
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail="No X-Workspace header supplied",
Expand Down
Loading