fix: Treat malformed policy config events as missing

src/service/rooms/event_handler/policy_server.rs

@@ -90,28 +90,26 @@ pub async fn policy_server_allows_event(
 	room_version_rules: &RoomVersionRules,
 	incoming: bool,
 ) -> Result<()> {
-	let ps = match pdu.event_type().with_state_key("").0 {
+	if pdu.event_type().with_state_key("") == (StateEventType::RoomPolicy, "".into()) {
-		| StateEventType::RoomPolicy => return Ok(()),
+		return Ok(());
-		| _ =>
+	}
-			self.services
+	let ps = match self
+		.services
 		.state_accessor
 		.room_state_get_content::<RoomPolicyEventContent>(
 			room_id,
 			&StateEventType::RoomPolicy,
 			"",
 		)
-				.await,
+		.await
-	};
+	{
-	let ps: RoomPolicyEventContent = match ps {
+		| Ok(s) => s,
-		| Ok(ps) => ps,
+		| Err(e) =>
-		| Err(e) => {
+			return if e.is_not_found() || e.kind() == ErrorKind::BadJson {
-			if e.is_not_found() {
+				debug!(%e, "no policy server configured");
-				trace!("no policy server configured");
+				Ok(())
 			} else {
-				error!("failed to load policy server event: {e}");
+				Err!("failed to load m.room.policy state event: {e}")
-				// TODO: Should this fail closed?
-			}
-			return Ok(());
 			},
 	};