This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Make room alias lists peekable #6949
Merged
Conversation
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
richvdh
force-pushed
the
rav/list_room_aliases_peekable
branch
from
e0ba252 to
bdeb189
Compare
richvdh
commented
Feb 18, 2020
| @@ -433,25 +433,3 @@ def snapshot_all_rooms( | |||
| ret["membership"] = membership | |||
|
|
|||
| return ret | |||
|
|
|||
| async def _check_in_room_or_world_readable(self, room_id, user_id): | |||
There was a problem hiding this comment.
this was an exact cut-and-paste of Auth.check_in_room_or_world_readable; removed for sanity.
richvdh
force-pushed
the
rav/list_room_aliases_peekable
branch
from
bdeb189 to
f7c6bec
Compare
richvdh
commented
Feb 18, 2020
| @@ -662,7 +664,9 @@ def check_in_room_or_world_readable(self, room_id, user_id): | |||
| ): | |||
| return Membership.JOIN, None | |||
| raise AuthError( | |||
| 403, "Guest access not allowed", errcode=Codes.GUEST_ACCESS_FORBIDDEN | |||
There was a problem hiding this comment.
this was never anything to do with guest access, so the error message was wrong and confusing; I've fixed it up while I'm here.
richvdh
commented
Feb 18, 2020
| @@ -633,10 +625,18 @@ def get_access_token_from_request(request): | |||
| return query_params[0].decode("ascii") | |||
|
|
|||
| @defer.inlineCallbacks | |||
| def check_in_room_or_world_readable(self, room_id, user_id): | |||
| def check_user_in_room_or_world_readable( | |||
| self, room_id: str, user_id: str, allow_departed_users: bool = False | |||
There was a problem hiding this comment.
this defaults to False for consistency with check_user_in_room, and for safety (if you forget to set it, it's safer if we deny access to users that should have it than grant access to users that should).
these were getting a bit unwieldy, so let's combine `check_joined_room` and `check_user_was_in_room` into a single `check_user_in_room`.
richvdh
force-pushed
the
rav/list_room_aliases_peekable
branch
from
f7c6bec to
31e9e9e
Compare
... and set it everywhere it's called. while we're here, rename it for consistency with `check_user_in_room` (and to help check that I haven't missed any instances)
As per matrix-org/matrix-spec-proposals#2432 (review), make room alias lists accessible to users outside world_readable rooms.
richvdh
force-pushed
the
rav/list_room_aliases_peekable
branch
from
31e9e9e to
603618c
Compare
erikjohnston
approved these changes
Feb 19, 2020
babolivier
pushed a commit
that referenced
this pull request
Sep 1, 2021
* commit '2fb7794e6': changelog Make room alias lists peekable Add `allow_departed_users` param to `check_in_room_or_world_readable` Refactor the membership check methods in Auth
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
As per matrix-org/matrix-spec-proposals#2432 (review), make room alias lists accessible to users outside world_readable rooms.
This also involves a bit of a refactor in
Auth, in particular trying to avoid yet another method for checking user room membership, by combiningcheck_joined_roomandcheck_user_was_in_room. The commits should stand alone and be independently reviewable.