fix: preserve query params in OAuth authorization endpoint#2781
Closed
he-yufeng wants to merge 1 commit into
Closed
fix: preserve query params in OAuth authorization endpoint#2781he-yufeng wants to merge 1 commit into
he-yufeng wants to merge 1 commit into
Conversation
e617b1f to
c2c25d9
Compare
Author
|
Follow-up for the lowest-direct CI failure:
Re-verified: uv run --no-sync pytest tests\client\test_auth.py::TestAuthFlow::test_authorization_endpoint_preserves_existing_query_params tests\client\test_auth.py::TestAuthFlow::test_403_insufficient_scope_updates_scope_from_header -q --basetemp .tmp\pytest-2781-two -p no:cacheprovider
uv run --no-sync pytest tests\client\test_auth.py -q --basetemp .tmp\pytest-2781-auth2 -p no:cacheprovider
uv run --no-sync ruff check --no-cache src\mcp\client\auth\oauth2.py tests\client\test_auth.py
uv run --no-sync ruff format --check --no-cache src\mcp\client\auth\oauth2.py tests\client\test_auth.py
uv run --no-sync pyright src\mcp\client\auth\oauth2.py tests\client\test_auth.py
git diff --check |
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #2776.
Some OAuth authorization server metadata includes an
authorization_endpointthat already has query parameters. The client was building the redirect URL with a raw?{urlencode(...)}append, which turns endpoints like:https://test.salesforce.com/services/oauth2/authorize?prompt=select_accountinto a malformed URL with a second question mark before the OAuth request parameters.
This uses
httpx.URL.copy_merge_params()to add the OAuth request parameters through the URL parser instead of string concatenation, preserving existing endpoint query parameters.Verification