summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2017-09-19 08:52:52 +0100
committerGitHub <noreply@github.com>2017-09-19 08:52:52 +0100
commit3f405b34e9976df2f93b9ef75ae00c634976e3a3 (patch)
tree3f623e315c4d3dd5efaa2957c318b93b34416e44
parentClean up and document handling of logcontexts in Keyring (#2452) (diff)
downloadsynapse-3f405b34e9976df2f93b9ef75ae00c634976e3a3.tar.xz
Fix overzealous kicking of guest users (#2453)
We should only kick guest users if the guest access event is authorised.
Diffstat (limited to '')
-rw-r--r--synapse/handlers/federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index b790a7c2ef..4669199b2d 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1606,7 +1606,7 @@ class FederationHandler(BaseHandler):
 
             context.rejected = RejectedReason.AUTH_ERROR
 
-        if event.type == EventTypes.GuestAccess:
+        if event.type == EventTypes.GuestAccess and not context.rejected:
             yield self.maybe_kick_guest_users(event)
 
         defer.returnValue(context)