Skip to content

fix: Regex extracting claims (addressing #420) #421

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
andrueastman merged 3 commits into from
Dec 5, 2024
Merged

fix: Regex extracting claims (addressing #420) #421

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
a950083
fix: Regex extracting claims (addressing #420)
Mrfence97 Dec 3, 2024
c8cdfbe
fix: bug in test_retries_on_cae_failure test
Mrfence97 Dec 4, 2024
9d6ea39
Merge branch 'main' into main
andrueastman Dec 5, 2024
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
4 changes: 2 additions & 2 deletions packages/http/httpx/kiota_http/httpx_request_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,10 +564,10 @@ async def retry_cae_response_if_required(
if auth_header_value.casefold().startswith(
self.BEARER_AUTHENTICATION_SCHEME.casefold()
):
claims_match = re.search('claims="(.+)"', auth_header_value)
claims_match = re.search('claims="([^"]+)"', auth_header_value)
if not claims_match:
raise ValueError("Unable to parse claims from response")
response_claims = claims_match.group().split('="')[1]
response_claims = claims_match.group(1)
parent_span.add_event(AUTHENTICATE_CHALLENGED_EVENT_KEY)
parent_span.set_attribute("http.retry_count", 1)
return await self.get_http_response_message(
Expand Down
2 changes: 1 addition & 1 deletion packages/http/httpx/tests/test_httpx_request_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ async def test_retries_on_cae_failure(
{
"claims": (
"eyJhY2Nlc3NfdG9rZW4iOnsibmJmIjp7ImVzc2VudGlhbCI6dHJ1ZSwgInZhbH"
"VlIjoiMTYwNDEwNjY1MSJ9fX0"
"VlIjoiMTYwNDEwNjY1MSJ9fX0="
)
},
),
Expand Down
Loading