tuxmain/rust-rpxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: change set-upstream-host as a default option

Browse source
This commit is contained in:
Jun Kurihara 2024-01-10 14:44:51 +09:00
commit 3fcea9a28c
No known key found for this signature in database
GPG key ID: 6D3FEE70E498C15B
5 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
rpxy-lib/src/message_handler/utils_headers.rs
View file

@ -86,8 +86,8 @@ pub(super) fn set_sticky_cookie_lb_context(
Ok(())
}
/// default: overwrite HOST value with upstream hostname (like 192.168.xx.x seen from rpxy)
pub(super) fn override_host_header(headers: &mut HeaderMap, upstream_base_uri: &Uri) -> Result<()> {
/// overwrite HOST value with upstream hostname (like 192.168.xx.x seen from rpxy)
fn override_host_header(headers: &mut HeaderMap, upstream_base_uri: &Uri) -> Result<()> {
let mut upstream_host = upstream_base_uri
.host()
.ok_or_else(|| anyhow!("No hostname is given"))?
@ -105,18 +105,18 @@ pub(super) fn override_host_header(headers: &mut HeaderMap, upstream_base_uri: &
/// Apply options to request header, which are specified in the configuration
pub(super) fn apply_upstream_options_to_header(
headers: &mut HeaderMap,
original_host_header: &HeaderValue,
upstream_base_uri: &Uri,
// _client_addr: &SocketAddr,
upstream: &UpstreamCandidates,
// _upstream_base_uri: &Uri,
) -> Result<()> {
for opt in upstream.options.iter() {
match opt {
UpstreamOption::KeepOriginalHost => {
// revert hostname
headers
.insert(header::HOST, original_host_header.to_owned())
.ok_or_else(|| anyhow!("Failed to revert host header in keep_original_host option"))?;
UpstreamOption::SetUpstreamHost => {
// prioritize KeepOriginalHost
if !upstream.options.contains(&UpstreamOption::KeepOriginalHost) {
// overwrite host header, this removes all the HOST header values
override_host_header(headers, upstream_base_uri)?;
}
}
UpstreamOption::UpgradeInsecureRequests => {
// add upgrade-insecure-requests in request header if not exist