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

added SHA-256 #244

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

added SHA-256 #244

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
37 changes: 30 additions & 7 deletions oauth2/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import base64
from hashlib import sha1
from hashlib import sha256
import time
import random
import hmac
Expand Down Expand Up @@ -353,7 +354,6 @@ def __init__(self, method=HTTP_METHOD, url=None, parameters=None,
for k, v in parameters.items():
k = to_unicode(k)
v = to_unicode_optional_iterator(v)

self[k] = v
self.body = body
self.is_form_encoded = is_form_encoded
Expand Down Expand Up @@ -491,9 +491,7 @@ def sign_request(self, signature_method, consumer, token):
# section 4.1.1 "OAuth Consumers MUST NOT include an
# oauth_body_hash parameter on requests with form-encoded
# request bodies."
if not self.body:
self.body = ''
self['oauth_body_hash'] = base64.b64encode(sha1(to_utf8(self.body)).digest())
self['oauth_body_hash'] = base64.b64encode(sha1(self.body).digest())

if 'oauth_consumer_key' not in self:
self['oauth_consumer_key'] = consumer.key
Expand Down Expand Up @@ -543,7 +541,6 @@ def from_request(cls, http_method, http_url, headers=None, parameters=None,
# GET or POST query string.
if query_string:
query_params = cls._split_url_string(query_string)

parameters.update(query_params)

# URL parameters.
Expand Down Expand Up @@ -761,8 +758,6 @@ def _check_signature(self, request, consumer, token):
signature = request.get('oauth_signature')
if signature is None:
raise MissingSignature('Missing oauth_signature.')
if isinstance(signature, str):
signature = signature.encode('ascii', 'ignore')

# Validate the signature.
valid = signature_method.check(request, consumer, token, signature)
Expand Down Expand Up @@ -848,6 +843,34 @@ def sign(self, request, consumer, token):
# Calculate the digest base 64.
return binascii.b2a_base64(hashed.digest())[:-1]

class SignatureMethod_HMAC_SHA256(SignatureMethod):
name = 'HMAC-SHA256'

def signing_base(self, request, consumer, token):
if (not hasattr(request, 'normalized_url') or request.normalized_url is None):
raise ValueError("Base URL for request is not set.")

sig = (
escape(request.method),
escape(request.normalized_url),
escape(request.get_normalized_parameters()),
)

key = '%s&' % escape(consumer.secret)
if token:
key += escape(token.secret)
raw = '&'.join(sig)
return key.encode('ascii'), raw.encode('ascii')

def sign(self, request, consumer, token):
"""Builds the base signature string."""
key, raw = self.signing_base(request, consumer, token)

hashed = hmac.new(key, raw, sha256)

# Calculate the digest base 64.
return binascii.b2a_base64(hashed.digest())[:-1]


class SignatureMethod_PLAINTEXT(SignatureMethod):

Expand Down