Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fallback for compare_digest for py < 2.7.7

This commit is contained in:
Bruno Windels 2018-09-18 16:04:57 +02:00
parent 286d6930b7
commit b6498e323c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/rest/client/v1/admin.py
View File

@ -37,6 +37,12 @@ from .base import ClientV1RestServlet, client_path_patterns
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# use hmac.compare_digest if we have it (python 2.7.7), else just use equality
if hasattr(hmac, "compare_digest"):
compare_digest = hmac.compare_digest
else:
def compare_digest(a, b):
return a == b
class UsersRestServlet(ClientV1RestServlet): class UsersRestServlet(ClientV1RestServlet):
PATTERNS = client_path_patterns("/admin/users/(?P<user_id>[^/]*)") PATTERNS = client_path_patterns("/admin/users/(?P<user_id>[^/]*)")
@ -173,7 +179,7 @@ class UserRegisterServlet(ClientV1RestServlet):
want_mac.update(b"admin" if admin else b"notadmin") want_mac.update(b"admin" if admin else b"notadmin")
want_mac = want_mac.hexdigest() want_mac = want_mac.hexdigest()
if not hmac.compare_digest( if not compare_digest(
want_mac.encode('ascii'), want_mac.encode('ascii'),
got_mac.encode('ascii') got_mac.encode('ascii')
): ):