vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

refactor: hmac generation

Browse source 
Reduce code duplication
This commit is contained in:
Ankush Menat 2022-11-12 12:02:04 +05:30
parent ef758130d6
commit 6c01d1d417
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
frappe/tests/test_email.py
View file

@ -310,6 +310,20 @@ class TestEmail(FrappeTestCase):
email_account.enable_incoming = False
class TestVerifiedRequests(FrappeTestCase):
def test_round_trip(self):
from frappe.utils import set_request
from frappe.utils.verified_command import get_signed_params, verify_request
test_cases = [{"xyz": "abc"}, {"email": "a@b.com", "user": "xyz"}]
for params in test_cases:
signed_url = get_signed_params(params)
set_request(method="GET", path="?" + signed_url)
self.assertTrue(verify_request())
frappe.local.request = None
if __name__ == "__main__":
import unittest

17
frappe/utils/verified_command.py
View file

@ -16,9 +16,8 @@ def get_signed_params(params):
if not isinstance(params, str):
params = urlencode(params)
signature = hmac.new(params.encode(), digestmod=hashlib.sha512)
signature.update(get_secret().encode())
return params + "&_signature=" + signature.hexdigest()
signature = _sign_message(params)
return params + "&_signature=" + signature
def get_secret():
@ -35,12 +34,10 @@ def verify_request():
signature_string = "&_signature="
if signature_string in query_string:
params, signature = query_string.split(signature_string)
params, given_signature = query_string.split(signature_string)
given_signature = hmac.new(params.encode("utf-8"), digestmod=hashlib.sha512)
given_signature.update(get_secret().encode())
valid_signature = hmac.compare_digest(signature, given_signature.hexdigest())
computed_signature = _sign_message(params)
valid_signature = hmac.compare_digest(given_signature, computed_signature)
valid_method = frappe.request.method == "GET"
valid_request_data = not (frappe.request.form or frappe.request.data)
@ -55,6 +52,10 @@ def verify_request():
return False
def _sign_message(message: str) -> str:
return hmac.new(get_secret().encode(), message.encode(), digestmod=hashlib.sha512).hexdigest()
def get_url(cmd, params, nonce=None, secret=None):
if not nonce:
nonce = params