MyFavMirrors
/
vaultwarden
mirror of https://github.com/dani-garcia/vaultwarden.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

When receiving a comma separated list as IP, pick the first

This commit is contained in:
Daniel García 2019-12-28 15:08:17 +01:00
parent 5c6081c4e2
commit cb6f392774
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/auth.rs
View File

@ -429,9 +429,13 @@ impl<'a, 'r> FromRequest<'a, 'r> for ClientIp {
fn from_request(req: &'a Request<'r>) -> request::Outcome<Self, Self::Error> { fn from_request(req: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
let ip = if CONFIG._ip_header_enabled() { let ip = if CONFIG._ip_header_enabled() {
req.headers().get_one(&CONFIG.ip_header()).and_then(|ip| { req.headers().get_one(&CONFIG.ip_header()).and_then(|ip| {
ip.parse() match ip.find(',') {
.map_err(|_| warn_!("'{}' header is malformed: {}", CONFIG.ip_header(), ip)) Some(idx) => &ip[..idx],
.ok() None => ip,
}
.parse()
.map_err(|_| warn!("'{}' header is malformed: {}", CONFIG.ip_header(), ip))
.ok()
}) })
} else { } else {
None None