diff --git a/CHANGES.md b/CHANGES.md
index f03a53affc..04d260f8e5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.35.1 (2021-06-03)
+===========================
+
+Bugfixes
+--------
+
+- Fix a bug introduced in v1.35.0 where invite-only rooms would be shown to all users in a space, regardless of if the user had access to it. ([\#10109](https://github.com/matrix-org/synapse/issues/10109))
+
+
Synapse 1.35.0 (2021-06-01)
===========================
diff --git a/debian/changelog b/debian/changelog
index d5efb8ccba..084e878def 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.35.1) stable; urgency=medium
+
+ * New synapse release 1.35.1.
+
+ -- Synapse Packaging team <packages@matrix.org> Thu, 03 Jun 2021 08:11:29 -0400
+
matrix-synapse-py3 (1.35.0) stable; urgency=medium
* New synapse release 1.35.0.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index d9843a1708..445e8a5cad 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
except ImportError:
pass
-__version__ = "1.35.0"
+__version__ = "1.35.1"
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
# We import here so that we don't have to install a bunch of deps when
diff --git a/synapse/handlers/space_summary.py b/synapse/handlers/space_summary.py
index abd9ddecca..046dba6fd8 100644
--- a/synapse/handlers/space_summary.py
+++ b/synapse/handlers/space_summary.py
@@ -26,7 +26,6 @@ from synapse.api.constants import (
HistoryVisibility,
Membership,
)
-from synapse.api.errors import AuthError
from synapse.events import EventBase
from synapse.events.utils import format_event_for_client_v2
from synapse.types import JsonDict
@@ -456,16 +455,16 @@ class SpaceSummaryHandler:
return True
# Otherwise, check if they should be allowed access via membership in a space.
- try:
- await self._event_auth_handler.check_restricted_join_rules(
- state_ids, room_version, requester, member_event
+ if self._event_auth_handler.has_restricted_join_rules(
+ state_ids, room_version
+ ):
+ allowed_spaces = (
+ await self._event_auth_handler.get_spaces_that_allow_join(state_ids)
)
- except AuthError:
- # The user doesn't have access due to spaces, but might have access
- # another way. Keep trying.
- pass
- else:
- return True
+ if await self._event_auth_handler.is_user_in_rooms(
+ allowed_spaces, requester
+ ):
+ return True
# If this is a request over federation, check if the host is in the room or
# is in one of the spaces specified via the join rules.
|
