diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-08-14 12:37:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-14 12:37:59 -0400 |
| commit | ac77cdb64e50c9fdfc00cccbc7b96f42057aa741 (patch) | |
| tree | ac110f53cc585a558b91d834b59611eef54bde22 /synapse/api | |
| parent | Convert pusher databases to async/await. (#8075) (diff) | |
| download | synapse-ac77cdb64e50c9fdfc00cccbc7b96f42057aa741.tar.xz | |
Add a shadow-banned flag to users. (#8092)
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/auth.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index d8190f92ab..7aab764360 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -213,6 +213,7 @@ class Auth(object): user = user_info["user"] token_id = user_info["token_id"] is_guest = user_info["is_guest"] + shadow_banned = user_info["shadow_banned"] # Deny the request if the user account has expired. if self._account_validity.enabled and not allow_expired: @@ -252,7 +253,12 @@ class Auth(object): opentracing.set_tag("device_id", device_id) return synapse.types.create_requester( - user, token_id, is_guest, device_id, app_service=app_service + user, + token_id, + is_guest, + shadow_banned, + device_id, + app_service=app_service, ) except KeyError: raise MissingClientTokenError() @@ -297,6 +303,7 @@ class Auth(object): dict that includes: `user` (UserID) `is_guest` (bool) + `shadow_banned` (bool) `token_id` (int|None): access token id. May be None if guest `device_id` (str|None): device corresponding to access token Raises: @@ -356,6 +363,7 @@ class Auth(object): ret = { "user": user, "is_guest": True, + "shadow_banned": False, "token_id": None, # all guests get the same device id "device_id": GUEST_DEVICE_ID, @@ -365,6 +373,7 @@ class Auth(object): ret = { "user": user, "is_guest": False, + "shadow_banned": False, "token_id": None, "device_id": None, } @@ -488,6 +497,7 @@ class Auth(object): "user": UserID.from_string(ret.get("name")), "token_id": ret.get("token_id", None), "is_guest": False, + "shadow_banned": ret.get("shadow_banned"), "device_id": ret.get("device_id"), "valid_until_ms": ret.get("valid_until_ms"), } |