Skip to content

Commit 20ca9af

Browse files
committed
Format code
1 parent 9d21a68 commit 20ca9af

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

examples/signed_request.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env python
2-
import sys
32
import argparse
43
import messagebird
54

@@ -17,7 +16,7 @@
1716
else:
1817
print("The signed request cannot be verified.")
1918

20-
if signed_request.isRecent():
19+
if signed_request.is_recent():
2120
print("The signed request is recent.")
2221
else:
23-
print("The signed request is not recent.")
22+
print("The signed request is not recent.")

messagebird/signed_request.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@ def __init__(self, requestSignature, requestTimestamp, requestBody, requestParam
2020

2121
def verify(self, signing_key):
2222
payload = self._build_payload()
23-
expectedSignature = base64.b64decode(self._requestSignature)
24-
calculatedSignature = hmac.new(signing_key.encode('latin-1'), payload.encode('latin-1'), hashlib.sha256).digest()
25-
return expectedSignature == calculatedSignature
23+
expected_signature = base64.b64decode(self._requestSignature)
24+
calculated_signature = hmac.new(signing_key.encode('latin-1'), payload.encode('latin-1'),
25+
hashlib.sha256).digest()
26+
return expected_signature == calculated_signature
2627

27-
def isRecent(self, offset = 10):
28+
def is_recent(self, offset=10):
2829
return int(time.time()) - int(self._requestTimestamp) < offset
2930

30-
def _build_payload(self,):
31+
def _build_payload(self):
3132
checksum_body = hashlib.sha256(self._requestBody.encode('latin-1')).digest()
3233
str_checksum_body = checksum_body.decode('latin-1')
3334
parts = [self._requestTimestamp, urlencode(self._sort_dict(self._requestParameters), True), str_checksum_body]
@@ -39,4 +40,4 @@ def _sort_dict(self, dict):
3940
for key in sorted(dict):
4041
sorted_dict[key] = dict[key]
4142

42-
return sorted_dict
43+
return sorted_dict

tests/test_signed_request.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
# before.
1010
from mock import Mock
1111

12-
1312
SIGNING_KEY = 'PlLrKaqvZNRR5zAjm42ZT6q1SQxgbbGd'
1413

1514

@@ -76,7 +75,7 @@ def test_recent_signed_request(self):
7675
body = ''
7776

7877
signed_request = SignedRequest(signature, timestamp, body, query)
79-
self.assertTrue(signed_request.isRecent())
78+
self.assertTrue(signed_request.is_recent())
8079

8180
def test_not_recent_signed_request(self):
8281
query = {}
@@ -85,4 +84,4 @@ def test_not_recent_signed_request(self):
8584
body = ''
8685

8786
signed_request = SignedRequest(signature, timestamp, body, query)
88-
self.assertFalse(signed_request.isRecent())
87+
self.assertFalse(signed_request.is_recent())

0 commit comments

Comments
 (0)