Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 15:49:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/release-v1.35'

Browse Source
This commit is contained in:
Tulir Asokan 2021-06-03 15:38:20 +03:00
commit 9de9e7454f
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGES.md
View File

@ -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) Synapse 1.35.0 (2021-06-01)
=========================== ===========================

6
debian/changelog vendored
View File

@ -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 matrix-synapse-py3 (1.35.0) stable; urgency=medium
* New synapse release 1.35.0. * New synapse release 1.35.0.

2
synapse/__init__.py
View File

@ -47,7 +47,7 @@ try:
except ImportError: except ImportError:
pass pass
__version__ = "1.35.0" __version__ = "1.35.1"
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): 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 # We import here so that we don't have to install a bunch of deps when

17
synapse/handlers/space_summary.py
View File

@ -26,7 +26,6 @@ from synapse.api.constants import (
HistoryVisibility, HistoryVisibility,
Membership, Membership,
) )
from synapse.api.errors import AuthError
from synapse.events import EventBase from synapse.events import EventBase
from synapse.events.utils import format_event_for_client_v2 from synapse.events.utils import format_event_for_client_v2
from synapse.types import JsonDict from synapse.types import JsonDict
@ -456,15 +455,15 @@ class SpaceSummaryHandler:
return True return True
# Otherwise, check if they should be allowed access via membership in a space. # Otherwise, check if they should be allowed access via membership in a space.
try: if self._event_auth_handler.has_restricted_join_rules(
await self._event_auth_handler.check_restricted_join_rules( state_ids, room_version
state_ids, room_version, requester, member_event ):
allowed_spaces = (
await self._event_auth_handler.get_spaces_that_allow_join(state_ids)
) )
except AuthError: if await self._event_auth_handler.is_user_in_rooms(
# The user doesn't have access due to spaces, but might have access allowed_spaces, requester
# another way. Keep trying. ):
pass
else:
return True return True
# If this is a request over federation, check if the host is in the room or # If this is a request over federation, check if the host is in the room or