-
Notifications
You must be signed in to change notification settings - Fork 236
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix overly restrictive typeguards in get_rooms_that_allow_join #18066
Open
blackmad
wants to merge
6
commits into
element-hq:develop
Choose a base branch
from
blackmad:fix-hierarchy-bug
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+6
−3
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
8274732
Fix overly restrictive typeguards in get_rooms_that_allow_join
blackmad 94be005
add changelog
blackmad c3e6500
add a fix for via as well, which has the same bug
blackmad 4bc027f
Match order of types
MadLittleMods 9ef23cf
Merge branch 'develop' into fix-hierarchy-bug
MadLittleMods fc10b29
Merge branch 'develop' into fix-hierarchy-bug
MadLittleMods File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Fixed a bug that caused new space-visible rooms to be hidden from the space hierarchy when any server modules are loaded. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,6 +21,8 @@ | |
import logging | ||
from typing import TYPE_CHECKING, List, Mapping, Optional, Union | ||
|
||
from immutabledict import immutabledict | ||
|
||
from synapse import event_auth | ||
from synapse.api.constants import ( | ||
EventTypes, | ||
|
@@ -326,13 +328,13 @@ async def get_rooms_that_allow_join( | |
|
||
# If allowed is of the wrong form, then only allow invited users. | ||
allow_list = join_rules_event.content.get("allow", []) | ||
if not isinstance(allow_list, list): | ||
if not isinstance(allow_list, (list, tuple)): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @blackmad I've just had a thought on how we can fix all of the cases mentioned in #18117 without having to modify any of the downstream code, see #18103 (comment) Going to leave this PR until we figure out if that is a viable solution to all of this. |
||
return () | ||
|
||
# Pull out the other room IDs, invalid data gets filtered. | ||
result = [] | ||
for allow in allow_list: | ||
if not isinstance(allow, dict): | ||
if not isinstance(allow, (dict, immutabledict)): | ||
continue | ||
|
||
# If the type is unexpected, skip it. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great find @blackmad! I've created #18117 to track the rest of the instances of this happening in the Synapse codebase.