From 2b70d9604a2cb10830a6677c2380374836b4d990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Tue, 11 Oct 2022 22:37:14 +0200
Subject: [PATCH] fix: element gets stuck in /initialSync

---
 src/main.rs                            | 14 +++++++++++++-
 src/service/rooms/event_handler/mod.rs |  6 +++++-
 src/utils/error.rs                     |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index bdbeaa6a..08368415 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -342,6 +342,14 @@ fn routes() -> Router {
         .ruma_route(server_server::get_profile_information_route)
         .ruma_route(server_server::get_keys_route)
         .ruma_route(server_server::claim_keys_route)
+        .route(
+            "/_matrix/client/r0/rooms/:room_id/initialSync",
+            get(initial_sync),
+        )
+        .route(
+            "/_matrix/client/v3/rooms/:room_id/initialSync",
+            get(initial_sync),
+        )
         .fallback(not_found.into_service())
 }
 
@@ -375,7 +383,11 @@ async fn shutdown_signal(handle: ServerHandle) {
 }
 
 async fn not_found(_uri: Uri) -> impl IntoResponse {
-    Error::BadRequest(ErrorKind::NotFound, "Unknown or unimplemented route")
+    Error::BadRequest(ErrorKind::Unrecognized, "Unrecognized request")
+}
+
+async fn initial_sync(_uri: Uri) -> impl IntoResponse {
+    Error::BadRequest(ErrorKind::GuestAccessForbidden, "Guest access not implemented")
 }
 
 trait RouterExt {
diff --git a/src/service/rooms/event_handler/mod.rs b/src/service/rooms/event_handler/mod.rs
index cd270c7c..477a9719 100644
--- a/src/service/rooms/event_handler/mod.rs
+++ b/src/service/rooms/event_handler/mod.rs
@@ -44,6 +44,7 @@ impl Service {
     /// When receiving an event one needs to:
     /// 0. Check the server is in the room
     /// 1. Skip the PDU if we already know about it
+    /// 1.1. Remove unsigned field
     /// 2. Check signatures, otherwise drop
     /// 3. Check content hash, redact if doesn't match
     /// 4. Fetch any missing auth events doing all checks listed here starting at 1. These are not
@@ -260,10 +261,13 @@ impl Service {
         create_event: &'a PduEvent,
         event_id: &'a EventId,
         room_id: &'a RoomId,
-        value: BTreeMap<String, CanonicalJsonValue>,
+        mut value: BTreeMap<String, CanonicalJsonValue>,
         pub_key_map: &'a RwLock<BTreeMap<String, BTreeMap<String, Base64>>>,
     ) -> AsyncRecursiveType<'a, Result<(Arc<PduEvent>, BTreeMap<String, CanonicalJsonValue>)>> {
         Box::pin(async move {
+            // 1.1. Remove unsigned field
+            value.remove("unsigned");
+
             // TODO: For RoomVersion6 we must check that Raw<..> is canonical do we anywhere?: https://matrix.org/docs/spec/rooms/v6#canonical-json
 
             // We go through all the signatures we see on the value and fetch the corresponding signing
diff --git a/src/utils/error.rs b/src/utils/error.rs
index 8967acb7..9c8617f9 100644
--- a/src/utils/error.rs
+++ b/src/utils/error.rs
@@ -117,7 +117,7 @@ impl Error {
                         StatusCode::FORBIDDEN
                     }
                     Unauthorized | UnknownToken { .. } | MissingToken => StatusCode::UNAUTHORIZED,
-                    NotFound => StatusCode::NOT_FOUND,
+                    NotFound | Unrecognized => StatusCode::NOT_FOUND,
                     LimitExceeded { .. } => StatusCode::TOO_MANY_REQUESTS,
                     UserDeactivated => StatusCode::FORBIDDEN,
                     TooLarge => StatusCode::PAYLOAD_TOO_LARGE,