Handle REST IP addresses better

Author: junderw

src/rest.rs

@@ -552,15 +552,23 @@ fn prepare_txs(
         .collect()
 }
 
+// Get the first valid IP address in the X-Forwarded-For header
+// Supports multiple headers.
 fn get_client_ip(headers: &HeaderMap<HeaderValue>) -> Option<SocketAddr> {
     headers
         .get_all("X-Forwarded-For")
         .iter()
         .filter_map(|v| v.to_str().ok())
         .join(",")
         .split(',')
+        .filter_map(|ip| ip.trim().parse::<SocketAddr>().ok())
         .next()
-        .and_then(|ip| ip.trim().parse::<SocketAddr>().ok())
+}
+
+fn get_client_ip_str() -> String {
+    get_rest_addr()
+        .map(|a| a.to_string())
+        .unwrap_or_else(|| String::from("Unknown IP"))
 }
 
 #[tokio::main]
@@ -591,7 +599,7 @@ async fn run_server(config: Arc<Config>, query: Arc<Query>, rx: oneshot::Receive
 
                     let mut resp = handle_request(method, uri, body, &query, &config)
                         .unwrap_or_else(|err| {
-                            warn!("[client_ip: {:?}] {:?}", get_rest_addr(), err);
+                            warn!("[{}] {:?}", get_client_ip_str(), err);
                             Response::builder()
                                 .status(err.0)
                                 .header("Content-Type", "text/plain")
@@ -688,12 +696,7 @@ fn handle_request(
         None => HashMap::new(),
     };
 
-    info!(
-        "[client_ip: {:?}] handle {:?} {:?}",
-        get_rest_addr(),
-        method,
-        uri
-    );
+    info!("[{}] handle {:?} {:?}", get_client_ip_str(), method, uri);
     match (
         &method,
         path.first(),