summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-06-19 16:20:55 +0100
committerGitHub <noreply@github.com>2017-06-19 16:20:55 +0100
commitb5f665de3209aa77ac9f692a515e4f96444b9003 (patch)
treedfa58ac75e65b503472bc603a9601bc0295a02b7 /synapse/handlers/federation.py
parentadd missing boolean to synapse_port_db (diff)
parentHandle all cases of sending membership events (diff)
downloadsynapse-b5f665de3209aa77ac9f692a515e4f96444b9003.tar.xz
Merge pull request #2291 from matrix-org/erikj/shutdown_room
Add shutdown room API
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 39d2bee8da..f7ae369a1d 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1068,6 +1068,10 @@ class FederationHandler(BaseHandler):
         """
         event = pdu
 
+        is_blocked = yield self.store.is_room_blocked(event.room_id)
+        if is_blocked:
+            raise SynapseError(403, "This room has been blocked on this server")
+
         event.internal_metadata.outlier = True
         event.internal_metadata.invite_from_remote = True