oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-09-05 18:41:00 +00:00
Code Wiki Activity

Merge branch 'grant-creators-max-power-when-downgrading' into 'next'

Browse source 
fix: set previous creators to max power level if "upgraded" room doesn't support creator power level

See merge request famedly/conduit!776
This commit is contained in:
Matthias Ahouansou 2025-09-02 03:24:44 +00:00
commit d0eba48b46
1 changed files with 47 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/api/client_server/room.rs
View file

@ -23,13 +23,15 @@ use ruma::{
}, },
int, int,
serde::JsonObject, serde::JsonObject,
CanonicalJsonObject, CanonicalJsonValue, OwnedRoomAliasId, OwnedUserId, RoomAliasId, CanonicalJsonObject, CanonicalJsonValue, Int, OwnedRoomAliasId, OwnedUserId, RoomAliasId,
RoomVersionId,
}; };
use serde::Deserialize; use serde::Deserialize;
use serde_json::{json, value::to_raw_value}; use serde_json::{json, value::to_raw_value};
use std::{ use std::{
cmp::max, cmp::max,
collections::{BTreeMap, HashSet}, collections::{BTreeMap, HashSet},
str::FromStr,
sync::Arc, sync::Arc,
}; };
use tracing::{error, info, warn}; use tracing::{error, info, warn};
@ -600,16 +602,29 @@ pub async fn upgrade_room_route(
.authorization; .authorization;
// Get the old room creation event // Get the old room creation event
let mut create_event_content = serde_json::from_str::<CanonicalJsonObject>( let create_event = services()
services() .rooms
.rooms .state_accessor
.state_accessor .room_state_get(&body.room_id, &StateEventType::RoomCreate, "")?
.room_state_get(&body.room_id, &StateEventType::RoomCreate, "")? .ok_or_else(|| Error::bad_database("Found room without m.room.create event."))?;
.ok_or_else(|| Error::bad_database("Found room without m.room.create event."))?
.content let mut create_event_content =
.get(), serde_json::from_str::<CanonicalJsonObject>(create_event.content.get())
) .map_err(|_| Error::bad_database("Invalid room event in database."))?;
.map_err(|_| Error::bad_database("Invalid room event in database."))?;
let old_rules = if let Some(CanonicalJsonValue::String(old_version)) =
create_event_content.get("room_version")
{
RoomVersionId::from_str(old_version)
.map_err(|_| Error::BadDatabase("Create event must be a valid room version ID"))?
.rules()
.expect("Supported room version must have rules")
.authorization
} else {
return Err(Error::BadDatabase(
"Room create event does not have content",
));
};
// Use the m.room.tombstone event as the predecessor // Use the m.room.tombstone event as the predecessor
let predecessor = Some(ruma::events::room::create::PreviousRoom::new( let predecessor = Some(ruma::events::room::create::PreviousRoom::new(
@ -772,8 +787,7 @@ pub async fn upgrade_room_route(
None => continue, // Skipping missing events. None => continue, // Skipping missing events.
}; };
if event_type == StateEventType::RoomPowerLevels && rules.explicitly_privilege_room_creators if event_type == StateEventType::RoomPowerLevels {
{
let mut pl_event_content: CanonicalJsonObject = let mut pl_event_content: CanonicalJsonObject =
serde_json::from_str(event_content.get()).map_err(|e| { serde_json::from_str(event_content.get()).map_err(|e| {
error!( error!(
@ -784,11 +798,27 @@ pub async fn upgrade_room_route(
})?; })?;
if let Some(CanonicalJsonValue::Object(users)) = pl_event_content.get_mut("users") { if let Some(CanonicalJsonValue::Object(users)) = pl_event_content.get_mut("users") {
users.remove(sender_user.as_str()); if rules.explicitly_privilege_room_creators {
users.remove(sender_user.as_str());
if rules.additional_room_creators { if rules.additional_room_creators {
for user in &body.additional_creators { for user in &body.additional_creators {
users.remove(user.as_str()); users.remove(user.as_str());
}
}
} else if old_rules.explicitly_privilege_room_creators {
users.insert(create_event.sender.to_string(), Int::MAX.into());
if old_rules.additional_room_creators {
if let Some(CanonicalJsonValue::Array(creators)) =
create_event_content.get("additional_creators")
{
for creator in creators {
if let CanonicalJsonValue::String(creator) = creator {
users.insert(creator.to_owned(), Int::MAX.into());
}
}
}
} }
} }
} }