Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion otterwiki/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,11 @@ def __init__(

@staticmethod
def _parse_roles(roles_str):
return {r.strip().upper() for r in roles_str.split(',') if r.strip()}
return {
r.strip().upper()
for r in re.split(r'[,\s]+', roles_str)
if r.strip()
}

def _map_roles_to_permissions(self, header_roles):
header_roles = set(header_roles)
Expand Down
3 changes: 3 additions & 0 deletions tests/test_auth_proxy_header.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,9 @@ def test_parse_roles(create_app):
ProxyHeaderAuth._parse_roles # pyright: ignore[reportPrivateUsage]
)
assert parse_roles("moderator, admin") == {"MODERATOR", "ADMIN"}
assert parse_roles("moderator ,admin") == {"MODERATOR", "ADMIN"}
assert parse_roles("moderator admin") == {"MODERATOR", "ADMIN"}
assert parse_roles("moderator admin") == {"MODERATOR", "ADMIN"}
assert parse_roles(" admin ") == {"ADMIN"}
assert parse_roles("a,,b, ,c") == {"A", "B", "C"}
assert parse_roles("") == set()
Expand Down