Skip to content
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

Jump to bottom

Fix the OAuth HTTP header bug with mod_wsgi #126

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix the OAuth HTTP header bug with mod_wsgi #126

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
17 changes: 14 additions & 3 deletions oauth2/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,10 +519,16 @@ def from_request(cls, http_method, http_url, headers=None, parameters=None,
parameters = {}

# Headers
if headers and 'Authorization' in headers:
auth_header = headers['Authorization']
if headers:
auth_header = None
if 'Authorization' in headers:
auth_header = headers['Authorization']
elif 'HTTP_AUTHORIZATION' in headers:
# Land on HTTP_AUTHORIZATION header in case of mod_wsgi
auth_header = headers['HTTP_AUTHORIZATION']

# Check that the authorization header is OAuth.
if auth_header[:6] == 'OAuth ':
if auth_header and auth_header[:6] == 'OAuth ':
auth_header = auth_header[6:]
try:
# Get the parameters from the header.
Expand Down Expand Up @@ -751,6 +757,7 @@ def _get_verifier(self, request):
def _check_signature(self, request, consumer, token):
timestamp, nonce = request._get_timestamp_nonce()
self._check_timestamp(timestamp)
self._check_nonce(consumer, token, nonce)
signature_method = self._get_signature_method(request)

try:
Expand All @@ -776,6 +783,10 @@ def _check_timestamp(self, timestamp):
raise Error('Expired timestamp: given %d and now %s has a '
'greater difference than threshold %d' % (timestamp, now,
self.timestamp_threshold))

def _check_nonce(self, consumer, token, nonce):
# Always allow it. Subclass needs to override this method to check nonce
return True


class SignatureMethod(object):
Expand Down