From 11103a92ed98e89ae535af4ed185ebd570a2ce81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Fri, 11 Aug 2023 10:48:48 +0200
Subject: [PATCH] Do not show "Invalid room version" errors when server is not
 in room

---
 Cargo.lock                     |  2 +-
 Cargo.toml                     |  2 +-
 src/api/server_server.rs       | 19 ++++++++++++++++++-
 src/service/rooms/state/mod.rs | 15 ++++++---------
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 35a42085..26b72011 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -363,7 +363,7 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "conduit"
-version = "0.6.0"
+version = "0.7.0-alpha"
 dependencies = [
  "async-trait",
  "axum",
diff --git a/Cargo.toml b/Cargo.toml
index 15dc1da4..0138a2d5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["timokoesters <timo@koesters.xyz>"]
 homepage = "https://conduit.rs"
 repository = "https://gitlab.com/famedly/conduit"
 readme = "README.md"
-version = "0.6.0"
+version = "0.7.0-alpha"
 edition = "2021"
 
 # When changing this, make sure to update the `flake.lock` file by running
diff --git a/src/api/server_server.rs b/src/api/server_server.rs
index bb924058..9bc9687c 100644
--- a/src/api/server_server.rs
+++ b/src/api/server_server.rs
@@ -55,7 +55,7 @@ use std::{
     time::{Duration, Instant, SystemTime},
 };
 
-use tracing::{debug, error, warn};
+use tracing::{debug, error, trace, warn};
 
 /// Wraps either an literal IP address plus port, or a hostname plus complement
 /// (colon-plus-port if it was specified).
@@ -707,6 +707,23 @@ pub async fn send_transaction_message_route(
     // let mut auth_cache = EventMap::new();
 
     for pdu in &body.pdus {
+        let value: CanonicalJsonObject = serde_json::from_str(pdu.get()).map_err(|e| {
+            warn!("Error parsing incoming event {:?}: {:?}", pdu, e);
+            Error::BadServerResponse("Invalid PDU in server response")
+        })?;
+        let room_id: OwnedRoomId = value
+            .get("room_id")
+            .and_then(|id| RoomId::parse(id.as_str()?).ok())
+            .ok_or(Error::BadRequest(
+                ErrorKind::InvalidParam,
+                "Invalid room id in pdu",
+            ))?;
+
+        if services().rooms.state.get_room_version(&room_id).is_err() {
+            debug!("Server is not in room {room_id}");
+            continue;
+        }
+
         let r = parse_incoming_pdu(&pdu);
         let (event_id, value, room_id) = match r {
             Ok(t) => t,
diff --git a/src/service/rooms/state/mod.rs b/src/service/rooms/state/mod.rs
index 16e0a04d..48c60203 100644
--- a/src/service/rooms/state/mod.rs
+++ b/src/service/rooms/state/mod.rs
@@ -6,6 +6,7 @@ use std::{
 
 pub use data::Data;
 use ruma::{
+    api::client::error::ErrorKind,
     events::{
         room::{create::RoomCreateEventContent, member::MembershipState},
         AnyStrippedStateEvent, StateEventType, TimelineEventType,
@@ -331,7 +332,7 @@ impl Service {
             "",
         )?;
 
-        let create_event_content: Option<RoomCreateEventContent> = create_event
+        let create_event_content: RoomCreateEventContent = create_event
             .as_ref()
             .map(|create_event| {
                 serde_json::from_str(create_event.content.get()).map_err(|e| {
@@ -339,14 +340,10 @@ impl Service {
                     Error::bad_database("Invalid create event in db.")
                 })
             })
-            .transpose()?;
-        let room_version = create_event_content
-            .map(|create_event| create_event.room_version)
-            .ok_or_else(|| {
-                warn!("Invalid room version for room {room_id}");
-                Error::BadDatabase("Invalid room version")
-            })?;
-        Ok(room_version)
+            .transpose()?
+            .ok_or_else(|| Error::BadRequest(ErrorKind::InvalidParam, "No create event found"))?;
+
+        Ok(create_event_content.room_version)
     }
 
     pub fn get_room_shortstatehash(&self, room_id: &RoomId) -> Result<Option<u64>> {