diff options
| author | Erik Johnston <erikj@jki.re> | 2018-10-03 14:47:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-03 14:47:41 +0100 |
| commit | 8935ec5a9302909f969a7b76260d95f4f1b78396 (patch) | |
| tree | eee02013a32b81b0b20ec2441a13a690cb69a3b8 /synapse | |
| parent | Merge pull request #3996 from matrix-org/erikj/fix_bg_iteration (diff) | |
| parent | Sanitise error messages when user doesn't have permission to invite (diff) | |
| download | synapse-8935ec5a9302909f969a7b76260d95f4f1b78396.tar.xz | |
Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetion
Fix handling of rejected threepid invites
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/event_auth.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/synapse/event_auth.py b/synapse/event_auth.py index 02fa46ef7f..af3eee95b9 100644 --- a/synapse/event_auth.py +++ b/synapse/event_auth.py @@ -155,10 +155,7 @@ def check(event, auth_events, do_sig_check=True, do_size_check=True): if user_level < invite_level: raise AuthError( - 403, ( - "You cannot issue a third party invite for %s." % - (event.content.display_name,) - ) + 403, "You don't have permission to invite users", ) else: logger.debug("Allowing! %s", event) @@ -305,7 +302,7 @@ def _is_membership_change_allowed(event, auth_events): if user_level < invite_level: raise AuthError( - 403, "You cannot invite user %s." % target_user_id + 403, "You don't have permission to invite users", ) elif Membership.JOIN == membership: # Joins are valid iff caller == target and they were: |