Emi/kochab
Emi
/
kochab
1
1
Fork 0
Code Issues Pull Requests Releases Activity

Add tolerance for REMOTE_ADDR without a port

This commit is contained in:
Emi Tatsuo 2020-12-03 08:32:06 -05:00
parent fb357b59eb
commit d8d15d8f72
Signed by: Emi
GPG Key ID: 68FAB2E2E6DFC98B
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib.rs
View File

@ -238,13 +238,14 @@ impl ServerInner {
.ip() .ip()
} }
#[cfg(feature = "scgi_srv")] { #[cfg(feature = "scgi_srv")] {
SocketAddr::from_str( let remote = request.headers()
request.headers() .get("REMOTE_ADDR")
.get("REMOTE_ADDR") .ok_or(ParseError::Malformed("REMOTE_ADDR header not received"))?
.ok_or(ParseError::Malformed("REMOTE_ADDR header not received"))? .as_str();
.as_str() SocketAddr::from_str(remote)
).context("Received malformed IP address from upstream")? .map(|a| a.ip())
.ip() .or_else(|_| std::net::IpAddr::from_str(remote))
.context("Received malformed IP address from upstream")?
} }
}; };