Infer client IP address from the peer address and the X-Forwarded-Proxy header

crates/axum-utils/src/error_wrapper.rs

@@ -0,0 +1,35 @@
+// Copyright 2023 The Matrix.org Foundation C.I.C.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use axum::response::{IntoResponse, Response};
+use http::StatusCode;
+
+/// A simple wrapper around an error that implements [`IntoResponse`].
+pub struct ErrorWrapper<T>(pub T);
+
+impl<T> From<T> for ErrorWrapper<T> {
+    fn from(input: T) -> Self {
+        Self(input)
+    }
+}
+
+impl<T> IntoResponse for ErrorWrapper<T>
+where
+    T: std::error::Error,
+{
+    fn into_response(self) -> Response {
+        // TODO: make this a bit more user friendly
+        (StatusCode::INTERNAL_SERVER_ERROR, self.0.to_string()).into_response()
+    }
+}

crates/axum-utils/src/lib.rs

@@ -25,6 +25,7 @@
 pub mod client_authorization;
 pub mod cookies;
 pub mod csrf;
+pub mod error_wrapper;
 pub mod fancy_error;
 pub mod http_client_factory;
 pub mod jwt;
@@ -35,6 +36,7 @@ pub mod user_authorization;
 pub use axum;
 
 pub use self::{
+    error_wrapper::ErrorWrapper,
     fancy_error::FancyError,
     session::{SessionInfo, SessionInfoExt},
 };