feat(addr): remove error when parsing ip from headers, as there can be bad values coming from clients

Author: joelwurtz

src/api/log.rs

@@ -106,9 +106,7 @@ impl Log {
                 for forwarded_ip in forwarded_ips {
                     match forwarded_ip.parse::<Addr>() {
                         Ok(addr) => ips.push(addr.addr),
-                        Err(()) => {
-                            log::error!("cannot parse ip address {}, skipping", forwarded_ip);
-                        }
+                        Err(()) => (),
                     }
                 }
             }
@@ -123,9 +121,7 @@ impl Log {
 
                         match ip.parse::<Addr>() {
                             Ok(ip) => ips.push(ip.addr),
-                            Err(()) => {
-                                log::error!("cannot parse ip address {}, skipping", ip);
-                            }
+                            Err(()) => (),
                         }
                     }
                 }

src/http/addr.rs

@@ -27,9 +27,11 @@ impl FromStr for Addr {
     type Err = ();
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        if let Ok(addr) = s.parse::<IpAddr>() {
+        let trimmed = s.trim_matches(|c| c == '\0' || c == '\n' || c == '\r' || c == '\t' || c == ' ');
+
+        if let Ok(addr) = trimmed.parse::<IpAddr>() {
             Ok(Self { addr, port: None })
-        } else if let Ok(sock) = s.parse::<SocketAddr>() {
+        } else if let Ok(sock) = trimmed.parse::<SocketAddr>() {
             Ok(Self {
                 addr: sock.ip(),
                 port: Some(sock.port()),
@@ -60,6 +62,15 @@ mod tests {
         assert_eq!(addr.addr.to_string(), "127.0.0.1");
     }
 
+    #[test]
+    fn test_ipv4_with_null() {
+        let addr = "127.0.0.1\0".parse::<Addr>().unwrap();
+
+        assert!(addr.addr.is_ipv4());
+        assert!(addr.port.is_none());
+        assert_eq!(addr.addr.to_string(), "127.0.0.1");
+    }
+
     #[test]
     fn test_ipv4_with_port() {
         let addr = "127.0.0.1:8080".parse::<Addr>().unwrap();

src/http/mod.rs

@@ -7,9 +7,9 @@ mod trusted_proxies;
 #[cfg(not(target_arch = "wasm32"))]
 pub mod ffi;
 
+pub use addr::Addr;
 pub use header::Header;
 pub use query::sanitize_url;
 pub use query::PathAndQueryWithSkipped;
 pub use request::Request;
 pub use trusted_proxies::TrustedProxies;
-pub use addr::Addr;

src/http/request.rs

@@ -277,9 +277,7 @@ impl Request {
 
                 match ip.parse::<Addr>() {
                     Ok(ip) => ips.push(ip.addr),
-                    Err(()) => {
-                        log::error!("-cannot parse ip address {}, skipping", ip);
-                    }
+                    Err(()) => (),
                 }
             }
         }
@@ -289,9 +287,7 @@ impl Request {
 
             match ip.parse::<Addr>() {
                 Ok(ip) => ips.push(ip.addr),
-                Err(()) => {
-                    log::error!("cannot parse ip address {}, skipping", ip);
-                }
+                Err(()) => (),
             }
         }