summary refs log tree commit diff
path: root/synapse/notifier.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-12-23 14:10:09 +0000
committerMark Haines <mjark@negativecurvature.net>2015-12-23 14:10:09 +0000
commitba39d3d5d754c6d26259e4e30c52dfd883022cad (patch)
tree9ebec84158dbec50f72ce7219de60617d3499645 /synapse/notifier.py
parentMerge pull request #455 from matrix-org/markjh/guest_access (diff)
parentMissing yield on guest access auth check (diff)
downloadsynapse-ba39d3d5d754c6d26259e4e30c52dfd883022cad.tar.xz
Merge pull request #458 from matrix-org/markjh/guest_auth
Missing yield on guest access auth check

Needs matrix-org/sytest#125 to land first
Diffstat (limited to 'synapse/notifier.py')
-rw-r--r--synapse/notifier.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py
index e3b42e2331..fd52578325 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -349,7 +349,7 @@ class Notifier(object):
         room_ids = []
         if is_guest:
             if guest_room_id:
-                if not self._is_world_readable(guest_room_id):
+                if not (yield self._is_world_readable(guest_room_id)):
                     raise AuthError(403, "Guest access not allowed")
                 room_ids = [guest_room_id]
         else: