magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style(db/rooms): refactor admin room pdu validating

Browse source
This commit is contained in:
AndSDev 2022-08-31 08:22:45 +00:00
parent da2dbd2877
commit 912491cb28
1 changed files with 39 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/service/rooms/timeline/mod.rs
View file

@ -691,14 +691,15 @@ impl Service {
.expect("#admins:server_name is a valid room alias"), .expect("#admins:server_name is a valid room alias"),
)?; )?;
if admin_room.filter(|v| v == room_id).is_some() { if admin_room.filter(|v| v == room_id).is_some() {
if pdu.event_type() == &RoomEventType::RoomEncryption { match pdu.event_type() {
RoomEventType::RoomEncryption => {
warn!("Encryption is not allowed in the admins room"); warn!("Encryption is not allowed in the admins room");
return Err(Error::BadRequest( return Err(Error::BadRequest(
ErrorKind::Forbidden, ErrorKind::Forbidden,
"Encryption is not allowed in the admins room.", "Encryption is not allowed in the admins room.",
)); ));
} }
if pdu.event_type() == &RoomEventType::RoomMember { RoomEventType::RoomMember => {
#[derive(Deserialize)] #[derive(Deserialize)]
struct ExtractMembership { struct ExtractMembership {
membership: MembershipState, membership: MembershipState,
@ -733,6 +734,8 @@ impl Service {
} }
} }
} }
_ => {}
}
} }
// We append to state before appending the pdu, so we don't have a moment in time with the // We append to state before appending the pdu, so we don't have a moment in time with the