Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Treat malformed policy config events as missing

Browse Source
This commit is contained in:
timedout
2026-05-21 18:03:01 +01:00
parent c8e0f7ebd3
commit 367c42ad28
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/service/rooms/event_handler/policy_server.rs
+20 -22
View File
@@ -90,29 +90,27 @@ pub async fn policy_server_allows_event(
room_version_rules: &RoomVersionRules,
incoming: bool,
) -> Result<()> {
let ps = match pdu.event_type().with_state_key("").0 {
| StateEventType::RoomPolicy => return Ok(()),
| _ =>
self.services
.state_accessor
.room_state_get_content::<RoomPolicyEventContent>(
room_id,
&StateEventType::RoomPolicy,
"",
)
.await,
};
let ps: RoomPolicyEventContent = match ps {
| Ok(ps) => ps,
| Err(e) => {
if e.is_not_found() {
trace!("no policy server configured");
if pdu.event_type().with_state_key("") == (StateEventType::RoomPolicy, "".into()) {
return Ok(());
}
let ps = match self
.services
.state_accessor
.room_state_get_content::<RoomPolicyEventContent>(
room_id,
&StateEventType::RoomPolicy,
"",
)
.await
{
| Ok(s) => s,
| Err(e) =>
return if e.is_not_found() || e.kind() == ErrorKind::BadJson {
debug!(%e, "no policy server configured");
Ok(())
} else {
error!("failed to load policy server event: {e}");
// TODO: Should this fail closed?
}
return Ok(());
},
Err!("failed to load m.room.policy state event: {e}")
},
};
let Some(ps_key) = ps.public_keys.get(&SigningKeyAlgorithm::Ed25519) else {