INBUXA_HTTP_USE_FORWARDED: read the forwarding header without a store setting #467
@@ -545,6 +545,27 @@ impl Http {
|
||||
Err(_) => ForwardedHeader::XForwardedFor,
|
||||
};
|
||||
|
||||
// inbuxa: whether to read the forwarding header at all. The store's
|
||||
// setting, unless INBUXA_HTTP_USE_FORWARDED says otherwise: a
|
||||
// deployment that only ever reaches the server through its own
|
||||
// proxies (Kubernetes, behind an ingress) sets it, so the limits and
|
||||
// bans for failed sign-ins count each client, not the proxy.
|
||||
let use_forwarded = match types::branding::env_var("HTTP_USE_FORWARDED") {
|
||||
Ok(value) => match parse_env_bool(&value) {
|
||||
Some(value) => value,
|
||||
None => {
|
||||
bp.build_warning(
|
||||
ObjectType::Http.singleton(),
|
||||
format!(
|
||||
"INBUXA_HTTP_USE_FORWARDED is {value:?}; expected true or false. The setting in the store applies."
|
||||
),
|
||||
);
|
||||
http.use_x_forwarded
|
||||
}
|
||||
},
|
||||
Err(_) => http.use_x_forwarded,
|
||||
};
|
||||
|
||||
if use_permissive_cors {
|
||||
http_headers.push((
|
||||
hyper::header::ACCESS_CONTROL_ALLOW_ORIGIN,
|
||||
@@ -602,7 +623,7 @@ impl Http {
|
||||
},
|
||||
response_headers: http_headers,
|
||||
cors_origins,
|
||||
use_forwarded: http.use_x_forwarded,
|
||||
use_forwarded,
|
||||
trusted_proxies,
|
||||
forwarded_header,
|
||||
redirect_root: http.redirect_root,
|
||||
@@ -621,6 +642,15 @@ pub enum ForwardedHeader {
|
||||
Forwarded,
|
||||
}
|
||||
|
||||
// inbuxa: true/1/yes/on or false/0/no/off, any case; None for anything else.
|
||||
fn parse_env_bool(value: &str) -> Option<bool> {
|
||||
match value.trim().to_ascii_lowercase().as_str() {
|
||||
"true" | "1" | "yes" | "on" => Some(true),
|
||||
"false" | "0" | "no" | "off" => Some(false),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
// inbuxa: loopback and the private ranges, where a reverse proxy on the same
|
||||
// host, container network or LAN connects from.
|
||||
fn default_trusted_proxies() -> Vec<IpAddrOrMask> {
|
||||
@@ -727,3 +757,21 @@ impl Default for ClusterRoles {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::parse_env_bool;
|
||||
|
||||
#[test]
|
||||
fn env_bool() {
|
||||
for yes in ["true", "TRUE", " 1 ", "yes", "On"] {
|
||||
assert_eq!(parse_env_bool(yes), Some(true), "{yes}");
|
||||
}
|
||||
for no in ["false", "0", "no", "OFF"] {
|
||||
assert_eq!(parse_env_bool(no), Some(false), "{no}");
|
||||
}
|
||||
for neither in ["", "2", "enabled", "y"] {
|
||||
assert_eq!(parse_env_bool(neither), None, "{neither:?}");
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user