Fix kicking guest users in worker mode

When guest_access changes from allowed to forbidden all local guest
users should be kicked from the room. This did not happen when
revocation was received from federation on a worker.

Presumably broken in #4141
pull/14/head
Erik Johnston 6 years ago
parent 4151111d95
commit 32e54b472a
  1. 2
      synapse/app/federation_reader.py
  2. 2
      synapse/handlers/_base.py

@ -40,6 +40,7 @@ from synapse.replication.slave.storage.profile import SlavedProfileStore
from synapse.replication.slave.storage.push_rule import SlavedPushRuleStore from synapse.replication.slave.storage.push_rule import SlavedPushRuleStore
from synapse.replication.slave.storage.pushers import SlavedPusherStore from synapse.replication.slave.storage.pushers import SlavedPusherStore
from synapse.replication.slave.storage.receipts import SlavedReceiptsStore from synapse.replication.slave.storage.receipts import SlavedReceiptsStore
from synapse.replication.slave.storage.registration import SlavedRegistrationStore
from synapse.replication.slave.storage.room import RoomStore from synapse.replication.slave.storage.room import RoomStore
from synapse.replication.slave.storage.transactions import SlavedTransactionStore from synapse.replication.slave.storage.transactions import SlavedTransactionStore
from synapse.replication.tcp.client import ReplicationClientHandler from synapse.replication.tcp.client import ReplicationClientHandler
@ -62,6 +63,7 @@ class FederationReaderSlavedStore(
SlavedReceiptsStore, SlavedReceiptsStore,
SlavedEventStore, SlavedEventStore,
SlavedKeyStore, SlavedKeyStore,
SlavedRegistrationStore,
RoomStore, RoomStore,
DirectoryStore, DirectoryStore,
SlavedTransactionStore, SlavedTransactionStore,

@ -167,4 +167,4 @@ class BaseHandler(object):
ratelimit=False, ratelimit=False,
) )
except Exception as e: except Exception as e:
logger.warn("Error kicking guest user: %s" % (e,)) logger.exception("Error kicking guest user: %s" % (e,))

Loading…
Cancel
Save