Skip to content
Merged
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
8 changes: 5 additions & 3 deletions social/backends/facebook.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def auth_html(self):
def load_signed_request(self, signed_request):
def base64_url_decode(data):
data = data.encode('ascii')
data += '=' * (4 - (len(data) % 4))
data += '='.encode('ascii') * (4 - (len(data) % 4))
return base64.urlsafe_b64decode(data)

key, secret = self.get_key_and_secret()
Expand All @@ -187,8 +187,10 @@ def base64_url_decode(data):
pass # ignore if can't split on dot
else:
sig = base64_url_decode(sig)
data = json.loads(base64_url_decode(payload))
expected_sig = hmac.new(secret, msg=payload,
payload_json_bytes = base64_url_decode(payload)
data = json.loads(payload_json_bytes.decode('utf-8', 'replace'))
expected_sig = hmac.new(secret.encode('ascii'),
msg=payload.encode('ascii'),
digestmod=hashlib.sha256).digest()
# allow the signed_request to function for upto 1 day
if constant_time_compare(sig, expected_sig) and \
Expand Down