Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 08:56:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Don't check whether the user's account is expired on /send_mail requests

Browse source
This commit is contained in:
Brendan Abolivier 2019-06-05 16:35:05 +01:00
parent 2f62e1f6ff
commit fe13bd52ac
No known key found for this signature in database
GPG key ID: 1E015C145F1916CD
3 changed files with 44 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
synapse/api/auth.py
View file

@ -184,7 +184,13 @@ class Auth(object):
return event_auth.get_public_keys(invite_event)
@defer.inlineCallbacks
def get_user_by_req(self, request, allow_guest=False, rights="access"):
def get_user_by_req(
self,
request,
allow_guest=False,
rights="access",
allow_expired=False,
):
""" Get a registered user's ID.
Args:
@ -229,7 +235,7 @@ class Auth(object):
is_guest = user_info["is_guest"]
# Deny the request if the user account has expired.
if self._account_validity.enabled:
if self._account_validity.enabled and not allow_expired:
user_id = user.to_string()
expiration_ts = yield self.store.get_expiration_ts_for_user(user_id)
if expiration_ts is not None and self.clock.time_msec() >= expiration_ts: