From 3a45628e1d0d8fe4b9b6227ba26e448879ce03f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Sat, 15 Oct 2022 00:28:43 +0200
Subject: [PATCH] fix: send unrecognized error on wrong http methods

---
 src/api/appservice_server.rs         |  4 +++-
 src/api/client_server/keys.rs        |  5 +++--
 src/api/client_server/read_marker.rs |  5 ++++-
 src/api/server_server.rs             |  7 +++++--
 src/database/key_value/sending.rs    |  2 +-
 src/main.rs                          | 25 +++++++++++++++++++++++--
 src/service/pusher/mod.rs            |  2 +-
 7 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/api/appservice_server.rs b/src/api/appservice_server.rs
index 339a0c22..dc319e2c 100644
--- a/src/api/appservice_server.rs
+++ b/src/api/appservice_server.rs
@@ -55,7 +55,9 @@ where
         Err(e) => {
             warn!(
                 "Could not send request to appservice {:?} at {}: {}",
-                registration.get("id"), destination, e
+                registration.get("id"),
+                destination,
+                e
             );
             return Err(e.into());
         }
diff --git a/src/api/client_server/keys.rs b/src/api/client_server/keys.rs
index 86cfaa49..b649166a 100644
--- a/src/api/client_server/keys.rs
+++ b/src/api/client_server/keys.rs
@@ -443,7 +443,7 @@ pub(crate) async fn claim_keys_helper(
     let mut futures: FuturesUnordered<_> = get_over_federation
         .into_iter()
         .map(|(server, vec)| async move {
-        let mut one_time_keys_input_fed = BTreeMap::new();
+            let mut one_time_keys_input_fed = BTreeMap::new();
             for (user_id, keys) in vec {
                 one_time_keys_input_fed.insert(user_id.clone(), keys.clone());
             }
@@ -459,7 +459,8 @@ pub(crate) async fn claim_keys_helper(
                     )
                     .await,
             )
-        }).collect();
+        })
+        .collect();
 
     while let Some((server, response)) = futures.next().await {
         match response {
diff --git a/src/api/client_server/read_marker.rs b/src/api/client_server/read_marker.rs
index 48520fc9..d529c6a8 100644
--- a/src/api/client_server/read_marker.rs
+++ b/src/api/client_server/read_marker.rs
@@ -1,7 +1,10 @@
 use crate::{services, Error, Result, Ruma};
 use ruma::{
     api::client::{error::ErrorKind, read_marker::set_read_marker, receipt::create_receipt},
-    events::{receipt::{ReceiptType, ReceiptThread}, RoomAccountDataEventType},
+    events::{
+        receipt::{ReceiptThread, ReceiptType},
+        RoomAccountDataEventType,
+    },
     MilliSecondsSinceUnixEpoch,
 };
 use std::collections::BTreeMap;
diff --git a/src/api/server_server.rs b/src/api/server_server.rs
index 0064a86f..320e396b 100644
--- a/src/api/server_server.rs
+++ b/src/api/server_server.rs
@@ -305,9 +305,12 @@ where
             }
         }
         Err(e) => {
-            warn!("Could not send request to {} at {}: {}", destination, actual_destination_str, e);
+            warn!(
+                "Could not send request to {} at {}: {}",
+                destination, actual_destination_str, e
+            );
             Err(e.into())
-        },
+        }
     }
 }
 
diff --git a/src/database/key_value/sending.rs b/src/database/key_value/sending.rs
index fcbe0f31..3fc3e042 100644
--- a/src/database/key_value/sending.rs
+++ b/src/database/key_value/sending.rs
@@ -6,7 +6,7 @@ use crate::{
         self,
         sending::{OutgoingKind, SendingEventType},
     },
-    utils, Error, Result, services,
+    services, utils, Error, Result,
 };
 
 impl service::sending::Data for KeyValueDatabase {
diff --git a/src/main.rs b/src/main.rs
index 78a38ad8..626de3ae 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -145,6 +145,7 @@ async fn run_server() -> io::Result<()> {
             }),
         )
         .compression()
+        .layer(axum::middleware::from_fn(unrecognized_method))
         .layer(
             CorsLayer::new()
                 .allow_origin(cors::Any)
@@ -187,6 +188,22 @@ async fn run_server() -> io::Result<()> {
     Ok(())
 }
 
+async fn unrecognized_method<B>(
+    req: axum::http::Request<B>,
+    next: axum::middleware::Next<B>,
+) -> std::result::Result<axum::response::Response, axum::http::StatusCode> {
+    let method = req.method().clone();
+    let uri = req.uri().clone();
+    let inner = next.run(req).await;
+    if inner.status() == axum::http::StatusCode::METHOD_NOT_ALLOWED {
+        warn!("Method not allowed: {method} {uri}");
+        return Ok(
+            Error::BadRequest(ErrorKind::Unrecognized, "Unrecognized request").into_response(),
+        );
+    }
+    Ok(inner)
+}
+
 fn routes() -> Router {
     Router::new()
         .ruma_route(client_server::get_supported_versions_route)
@@ -386,12 +403,16 @@ async fn shutdown_signal(handle: ServerHandle) {
     handle.graceful_shutdown(Some(Duration::from_secs(30)));
 }
 
-async fn not_found(_uri: Uri) -> impl IntoResponse {
+async fn not_found(uri: Uri) -> impl IntoResponse {
+    warn!("Not found: {uri}");
     Error::BadRequest(ErrorKind::Unrecognized, "Unrecognized request")
 }
 
 async fn initial_sync(_uri: Uri) -> impl IntoResponse {
-    Error::BadRequest(ErrorKind::GuestAccessForbidden, "Guest access not implemented")
+    Error::BadRequest(
+        ErrorKind::GuestAccessForbidden,
+        "Guest access not implemented",
+    )
 }
 
 trait RouterExt {
diff --git a/src/service/pusher/mod.rs b/src/service/pusher/mod.rs
index 767687d8..7fee276b 100644
--- a/src/service/pusher/mod.rs
+++ b/src/service/pusher/mod.rs
@@ -131,7 +131,7 @@ impl Service {
             Err(e) => {
                 warn!("Could not send request to pusher {}: {}", destination, e);
                 Err(e.into())
-            },
+            }
         }
     }