aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/api/generic_server.rs21
1 files changed, 20 insertions, 1 deletions
diff --git a/src/api/generic_server.rs b/src/api/generic_server.rs
index 62fe4e5a..aa90868a 100644
--- a/src/api/generic_server.rs
+++ b/src/api/generic_server.rs
@@ -125,7 +125,26 @@ impl<A: ApiHandler> ApiServer<A> {
addr: SocketAddr,
) -> Result<Response<Body>, GarageError> {
let uri = req.uri().clone();
- info!("{} {} {}", addr, req.method(), uri);
+
+ let has_forwarded_for_header = req.headers().contains_key("x-forwarded-for");
+ if has_forwarded_for_header {
+ let forwarded_for_ip_addr = &req
+ .headers()
+ .get("x-forwarded-for")
+ .expect("Could not parse X-Forwarded-For header")
+ .to_str()
+ .unwrap_or_default();
+
+ info!(
+ "{} (via {}) {} {}",
+ forwarded_for_ip_addr,
+ addr,
+ req.method(),
+ uri
+ );
+ } else {
+ info!("{} {} {}", addr, req.method(), uri);
+ }
debug!("{:?}", req);
let tracer = opentelemetry::global::tracer("garage");