Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix PKCE credentials not being captured during authorize requests #707

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 2 commits into from
Apr 20, 2019
Merged

Fix PKCE credentials not being captured during authorize requests #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b12299f
fix pkce credentials not being passed by oauthlib
Maronato Apr 19, 2019
a18c456
support oauthlibs native implementation when added
Maronato Apr 19, 2019
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
15 changes: 13 additions & 2 deletions oauth2_provider/views/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class BaseAuthorizationView(LoginRequiredMixin, OAuthLibMixin, View):
* Implicit grant

"""

def dispatch(self, request, *args, **kwargs):
self.oauth2_data = {}
return super().dispatch(request, *args, **kwargs)
Expand Down Expand Up @@ -132,6 +133,16 @@ def form_valid(self, form):
def get(self, request, *args, **kwargs):
try:
scopes, credentials = self.validate_authorization_request(request)
# TODO: Remove the two following lines after oauthlib updates its implementation
# https://github.com/jazzband/django-oauth-toolkit/pull/707#issuecomment-485011945
credentials["code_challenge"] = credentials.get(
"code_challenge",
request.GET.get("code_challenge", None)
)
credentials["code_challenge_method"] = credentials.get(
"code_challenge_method",
request.GET.get("code_challenge_method", None)
)
except OAuthToolkitError as error:
# Application is not available at this time.
return self.error_response(error, application=None)
Expand All @@ -149,8 +160,8 @@ def get(self, request, *args, **kwargs):
kwargs["redirect_uri"] = credentials["redirect_uri"]
kwargs["response_type"] = credentials["response_type"]
kwargs["state"] = credentials["state"]
kwargs["code_challenge"] = credentials.get("code_challenge", None)
kwargs["code_challenge_method"] = credentials.get("code_challenge_method", None)
kwargs["code_challenge"] = credentials["code_challenge"]
kwargs["code_challenge_method"] = credentials["code_challenge_method"]

self.oauth2_data = kwargs
# following two loc are here only because of https://code.djangoproject.com/ticket/17795
Expand Down
4 changes: 0 additions & 4 deletions tests/test_authorization_code.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,9 +1072,6 @@ def test_public_pkce_plain_authorize_get(self):
url = "{url}?{qs}".format(url=reverse("oauth2_provider:authorize"), qs=query_string)

response = self.client.get(url)
print(code_challenge)
print(response.context_data)
print(url)
self.assertEqual(response.status_code, 200)
oauth2_settings.PKCE_REQUIRED = False

Expand Down Expand Up @@ -1130,7 +1127,6 @@ def test_public_pkce_plain(self):
}

response = self.client.post(reverse("oauth2_provider:token"), data=token_request_data)
print(response.content)
self.assertEqual(response.status_code, 200)

content = json.loads(response.content.decode("utf-8"))
Expand Down