Skip to content

Fix parsing authentication header #495

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

Merged
merged 1 commit into from
Nov 20, 2024
Merged

Fix parsing authentication header #495

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion tests/unit/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,13 +543,14 @@ def test_oauth2_authentication_missing_headers(header, error):
'Bearer x_redirect_server="{redirect_server}", x_token_server="{token_server}", Basic realm="Trino"',
'Basic realm="Trino", Bearer realm="Trino", token_type="JWT", Bearer x_redirect_server="{redirect_server}", '
'x_token_server="{token_server}"'
'Bearer x_redirect_server="{redirect_server}",x_token_server="{token_server}",additional_challenge',
])
@httprettified
def test_oauth2_header_parsing(header, sample_post_response_data):
token = str(uuid.uuid4())
challenge_id = str(uuid.uuid4())

redirect_server = f"{REDIRECT_RESOURCE}/{challenge_id}"
redirect_server = f"{REDIRECT_RESOURCE}/{challenge_id}?role=test"
token_server = f"{TOKEN_RESOURCE}/{challenge_id}"

# noinspection PyUnusedLocal
Expand Down
18 changes: 9 additions & 9 deletions trino/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,17 +546,17 @@ def _construct_cache_key(host: Optional[str], user: Optional[str]) -> Optional[s

@staticmethod
def _parse_authenticate_header(header: str) -> Dict[str, str]:
split_challenge = header.split(" ", 1)
trimmed_challenge = split_challenge[1] if len(split_challenge) > 1 else ""
logger.debug(f"Authentication header: {header}")
components = header.split(",")
auth_info_headers = {}

for item in trimmed_challenge.split(","):
comps = item.split("=")
if len(comps) == 2:
key = comps[0].strip(' "')
value = comps[1].strip(' "')
if key:
auth_info_headers[key.lower()] = value
for component in components:
component = component.strip()
if "=" in component:
key, value = component.split("=", 1)
if value[0] == '"' and value[-1] == '"':
value = value[1:-1]
auth_info_headers[key.lower()] = value
return auth_info_headers


Expand Down