Skip to content
Open
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions open_facebook/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -464,15 +464,15 @@ def parse_signed_data(cls, signed_request,
and
http://sunilarora.org/parsing-signedrequest-parameter-in-python-bas
'''
from open_facebook.utils import base64_url_decode_php_style
from open_facebook.utils import base64_url_decode_php_style, smart_str
l = signed_request.split('.', 2)
encoded_sig = l[0]
payload = l[1]
from open_facebook.utils import json
sig = base64_url_decode_php_style(encoded_sig)
import hmac
import hashlib
data = json.loads(base64_url_decode_php_style(payload))
data = json.loads(base64_url_decode_php_style(payload).decode('utf-8'))

algo = data.get('algorithm').upper()
if algo != 'HMAC-SHA256':
Expand All @@ -482,10 +482,12 @@ def parse_signed_data(cls, signed_request,
logger.error('Unknown algorithm')
return None
else:
expected_sig = hmac.new(secret, msg=payload,
expected_sig = hmac.new(smart_str(secret), msg=smart_str(payload),
digestmod=hashlib.sha256).digest()

if sig != expected_sig:
if (hasattr(hmac, 'compare_digest') and
not hmac.compare_digest(sig, expected_sig) or
sig != expected_sig):
error_format = 'Signature %s didnt match the expected signature %s'
error_message = error_format % (sig, expected_sig)
send_warning(error_message)
Expand Down