summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorPeerD <github@spy.de>2020-02-06 15:15:29 +0100
committerGitHub <noreply@github.com>2020-02-06 14:15:29 +0000
commit99fcc96289f673f96f2d180a84df84f6b8a85521 (patch)
tree6c586db0d6e4c57497f9b43c0a23b501bcc82a29 /synapse
parentReduce amount of logging at INFO level. (#6862) (diff)
downloadsynapse-99fcc96289f673f96f2d180a84df84f6b8a85521.tar.xz
Third party event rules Update (#6781)
Diffstat (limited to 'synapse')
-rw-r--r--synapse/events/third_party_rules.py7
-rw-r--r--synapse/handlers/room.py6
2 files changed, 9 insertions, 4 deletions
diff --git a/synapse/events/third_party_rules.py b/synapse/events/third_party_rules.py
index 86f7e5f8aa..459132d388 100644
--- a/synapse/events/third_party_rules.py
+++ b/synapse/events/third_party_rules.py
@@ -74,15 +74,16 @@ class ThirdPartyEventRules(object):
             is_requester_admin (bool): If the requester is an admin
 
         Returns:
-            defer.Deferred
+            defer.Deferred[bool]: Whether room creation is allowed or denied.
         """
 
         if self.third_party_rules is None:
-            return
+            return True
 
-        yield self.third_party_rules.on_create_room(
+        ret = yield self.third_party_rules.on_create_room(
             requester, config, is_requester_admin
         )
+        return ret
 
     @defer.inlineCallbacks
     def check_threepid_can_be_invited(self, medium, address, room_id):
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 559e3399b8..ab07edd2fc 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -579,9 +579,13 @@ class RoomCreationHandler(BaseHandler):
 
         # Check whether the third party rules allows/changes the room create
         # request.
-        yield self.third_party_event_rules.on_create_room(
+        event_allowed = yield self.third_party_event_rules.on_create_room(
             requester, config, is_requester_admin=is_requester_admin
         )
+        if not event_allowed:
+            raise SynapseError(
+                403, "You are not permitted to create rooms", Codes.FORBIDDEN
+            )
 
         if not is_requester_admin and not self.spam_checker.user_may_create_room(
             user_id