dolysis/conduwuit
3
0
Fork 0
mirror of https://github.com/girlbossceo/conduwuit.git synced 2024-11-28 05:45:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(fed): dont reject /state_ids/ on world readable rooms

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-06-07 01:48:05 -04:00
parent 10dfbf6420
commit a04ff7d4af
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/api/server/state_ids.rs
View file

@ -6,13 +6,23 @@ use crate::{services, Error, Result, Ruma};
/// # `GET /_matrix/federation/v1/state_ids/{roomId}` /// # `GET /_matrix/federation/v1/state_ids/{roomId}`
/// ///
/// Retrieves the current state of the room. /// Retrieves a snapshot of a room's state at a given event, in the form of
/// event IDs.
pub(crate) async fn get_room_state_ids_route( pub(crate) async fn get_room_state_ids_route(
body: Ruma<get_room_state_ids::v1::Request>, body: Ruma<get_room_state_ids::v1::Request>,
) -> Result<get_room_state_ids::v1::Response> { ) -> Result<get_room_state_ids::v1::Response> {
let origin = body.origin.as_ref().expect("server is authenticated"); let origin = body.origin.as_ref().expect("server is authenticated");
services()
.rooms
.event_handler
.acl_check(origin, &body.room_id)?;
if !services() if !services()
.rooms
.state_accessor
.is_world_readable(&body.room_id)?
&& !services()
.rooms .rooms
.state_cache .state_cache
.server_in_room(origin, &body.room_id)? .server_in_room(origin, &body.room_id)?
@ -20,11 +30,6 @@ pub(crate) async fn get_room_state_ids_route(
return Err(Error::BadRequest(ErrorKind::forbidden(), "Server is not in room.")); return Err(Error::BadRequest(ErrorKind::forbidden(), "Server is not in room."));
} }
services()
.rooms
.event_handler
.acl_check(origin, &body.room_id)?;
let shortstatehash = services() let shortstatehash = services()
.rooms .rooms
.state_accessor .state_accessor