Merge pull request #367 from matrix-org/daniel/readafterleave

Merge pull request #367 from matrix-org/daniel/readafterleave

Tweak guest access permissions

synapse/handlers/message.py

@@ -267,17 +267,18 @@ class MessageHandler(BaseHandler):
             member_event = yield self.auth.check_user_was_in_room(room_id, user_id)
             defer.returnValue((member_event.membership, member_event.event_id))
             return
-        except AuthError:
-            if not is_guest:
-                raise
-
+        except AuthError, auth_error:
             visibility = yield self.state_handler.get_current_state(
                 room_id, EventTypes.RoomHistoryVisibility, ""
             )
-        if visibility.content["history_visibility"] == "world_readable":
+            if (
+                visibility and
+                visibility.content["history_visibility"] == "world_readable"
+            ):
                 defer.returnValue((Membership.JOIN, None))
                 return
-        else:
+            if not is_guest:
+                raise auth_error
             raise AuthError(
                 403, "Guest access not allowed", errcode=Codes.GUEST_ACCESS_FORBIDDEN
             )