mirror of
https://mau.dev/maunium/synapse.git
synced 2024-12-15 00:13:51 +01:00
Fix an internal server error when viewing the public privacy policy
This commit is contained in:
parent
0869566ad3
commit
83a5f459aa
1 changed files with 7 additions and 4 deletions
|
@ -143,9 +143,9 @@ class ConsentResource(Resource):
|
||||||
has_consented = False
|
has_consented = False
|
||||||
public_version = username == ""
|
public_version = username == ""
|
||||||
if not public_version or not self.hs.config.user_consent_at_registration:
|
if not public_version or not self.hs.config.user_consent_at_registration:
|
||||||
userhmac = parse_string(request, "h", required=True, encoding=None)
|
userhmac_bytes = parse_string(request, "h", required=True, encoding=None)
|
||||||
|
|
||||||
self._check_hash(username, userhmac)
|
self._check_hash(username, userhmac_bytes)
|
||||||
|
|
||||||
if username.startswith('@'):
|
if username.startswith('@'):
|
||||||
qualified_user_id = username
|
qualified_user_id = username
|
||||||
|
@ -155,15 +155,18 @@ class ConsentResource(Resource):
|
||||||
u = yield self.store.get_user_by_id(qualified_user_id)
|
u = yield self.store.get_user_by_id(qualified_user_id)
|
||||||
if u is None:
|
if u is None:
|
||||||
raise NotFoundError("Unknown user")
|
raise NotFoundError("Unknown user")
|
||||||
|
|
||||||
has_consented = u["consent_version"] == version
|
has_consented = u["consent_version"] == version
|
||||||
|
userhmac = userhmac_bytes.decode("ascii")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self._render_template(
|
self._render_template(
|
||||||
request, "%s.html" % (version,),
|
request, "%s.html" % (version,),
|
||||||
user=username,
|
user=username,
|
||||||
userhmac=userhmac.decode('ascii'),
|
userhmac=userhmac,
|
||||||
version=version,
|
version=version,
|
||||||
has_consented=has_consented, public_version=public_version,
|
has_consented=has_consented,
|
||||||
|
public_version=public_version,
|
||||||
)
|
)
|
||||||
except TemplateNotFound:
|
except TemplateNotFound:
|
||||||
raise NotFoundError("Unknown policy version")
|
raise NotFoundError("Unknown policy version")
|
||||||
|
|
Loading…
Reference in a new issue