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

Move requester check into assert_accepted_privacy_policy

This commit is contained in:
Erik Johnston 2019-03-20 17:08:36 +00:00
parent 30e69ff9b6
commit 7d47cc1305
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
synapse/handlers/message.py
View File

@ -316,12 +316,8 @@ class EventCreationHandler(object):
target, e target, e
) )
# Check if the user has accepted the privacy policy. We only do this if
# the requester has an associated access_token_id, which indicates that
# this action came from a user request rather than an automatice server
# or admin action.
is_exempt = yield self._is_exempt_from_privacy_policy(builder, requester) is_exempt = yield self._is_exempt_from_privacy_policy(builder, requester)
if requester.access_token_id and not is_exempt: if not is_exempt:
yield self.assert_accepted_privacy_policy(requester) yield self.assert_accepted_privacy_policy(requester)
if token_id is not None: if token_id is not None:
@ -396,6 +392,13 @@ class EventCreationHandler(object):
if requester.app_service is not None: if requester.app_service is not None:
return return
# Check if the user has accepted the privacy policy. We only do this if
# the requester has an associated access_token_id, which indicates that
# this action came from a user request rather than an automatice server
# or admin action.
if requester.access_token_id is None:
return
user_id = requester.user.to_string() user_id = requester.user.to_string()
# exempt the system notices user # exempt the system notices user