-
Notifications
You must be signed in to change notification settings - Fork 809
Fixed Form UrlEncoded OAuth Lib Core #1382
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.
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
Draft
ferrants
wants to merge
6
commits into
django-oauth:master
Choose a base branch
from
ferrants:fix-296-form-encoded
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d62a087
Fixed Form UrlEncoded OAuth Lib Core
ferrants e06f8e4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 5b3f64f
Update oauth2_backends.py
ferrants c0cca8a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] b3b45fe
Update oauth2_backends.py
ferrants 27cd68f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
import base64 | ||
import json | ||
from urllib.parse import urlparse, urlunparse | ||
from urllib.parse import unquote, urlparse, urlunparse | ||
|
||
from oauthlib import oauth2 | ||
from oauthlib.common import Request as OauthlibRequest | ||
|
@@ -238,6 +239,22 @@ def extract_body(self, request): | |
return body | ||
|
||
|
||
class JSONAndFormUrlencodedOAuthLibCore(JSONOAuthLibCore): | ||
def extract_body(self, request): | ||
# fixes base64 encoded form-submission. you can't control what all oauth clients use. | ||
# if request.content_type in ['multipart/form-data', 'application/x-www-form-urlencoded']: | ||
if request.content_type in ["application/x-www-form-urlencoded"]: | ||
query_string = base64.b64decode(request.body).decode("utf-8") | ||
query_params = {p.split("=")[0]: p.split("=")[1] for p in query_string.split("&")} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There's a safer way to do this |
||
if "redirect_uri" in query_params: | ||
query_params["redirect_uri"] = unquote(query_params["redirect_uri"]) | ||
ferrants marked this conversation as resolved.
Show resolved
Hide resolved
|
||
res = query_params.items() | ||
|
||
return res | ||
|
||
return super(OAuthLibCoreFixed, self).extract_body(request) | ||
|
||
|
||
def get_oauthlib_core(): | ||
""" | ||
Utility function that returns an instance of | ||
|
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.
Uh oh!
There was an error while loading. Please reload this page.