mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-24 11:16:04 +00:00
Merge remote-tracking branch 'origin/release-v0.33.3' into develop
This commit is contained in:
commit
0d568ff403
1
changelog.d/3732.bugfix
Normal file
1
changelog.d/3732.bugfix
Normal file
@ -0,0 +1 @@
|
|||||||
|
Fix bug introduced in v0.33.3rc1 which made the ToS give a 500 error
|
@ -140,7 +140,7 @@ class ConsentResource(Resource):
|
|||||||
version = parse_string(request, "v",
|
version = parse_string(request, "v",
|
||||||
default=self._default_consent_version)
|
default=self._default_consent_version)
|
||||||
username = parse_string(request, "u", required=True)
|
username = parse_string(request, "u", required=True)
|
||||||
userhmac = parse_string(request, "h", required=True)
|
userhmac = parse_string(request, "h", required=True, encoding=None)
|
||||||
|
|
||||||
self._check_hash(username, userhmac)
|
self._check_hash(username, userhmac)
|
||||||
|
|
||||||
@ -175,7 +175,7 @@ class ConsentResource(Resource):
|
|||||||
"""
|
"""
|
||||||
version = parse_string(request, "v", required=True)
|
version = parse_string(request, "v", required=True)
|
||||||
username = parse_string(request, "u", required=True)
|
username = parse_string(request, "u", required=True)
|
||||||
userhmac = parse_string(request, "h", required=True)
|
userhmac = parse_string(request, "h", required=True, encoding=None)
|
||||||
|
|
||||||
self._check_hash(username, userhmac)
|
self._check_hash(username, userhmac)
|
||||||
|
|
||||||
@ -210,9 +210,18 @@ class ConsentResource(Resource):
|
|||||||
finish_request(request)
|
finish_request(request)
|
||||||
|
|
||||||
def _check_hash(self, userid, userhmac):
|
def _check_hash(self, userid, userhmac):
|
||||||
|
"""
|
||||||
|
Args:
|
||||||
|
userid (unicode):
|
||||||
|
userhmac (bytes):
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
SynapseError if the hash doesn't match
|
||||||
|
|
||||||
|
"""
|
||||||
want_mac = hmac.new(
|
want_mac = hmac.new(
|
||||||
key=self._hmac_secret,
|
key=self._hmac_secret,
|
||||||
msg=userid,
|
msg=userid.encode('utf-8'),
|
||||||
digestmod=sha256,
|
digestmod=sha256,
|
||||||
).hexdigest()
|
).hexdigest()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user