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

cleartext backend request will be http1.1

Browse source
This commit is contained in:
Jun Kurihara 2022-08-02 22:35:07 +09:00
commit e76ac95062
No known key found for this signature in database
GPG key ID: 48ADFD173ED22B03
5 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config-example.toml
View file

@ -51,7 +51,7 @@ upstream = [
{ location = 'www.yahoo.com', tls = true },
{ location = 'www.yahoo.co.jp', tls = true },
]
upstream_options = ["override_host", "convert_to_http2"]
upstream_options = ["override_host", "convert_https_to_2"]
# Non-default destination in "localhost" app, which is routed by "path"
[[apps.localhost.reverse_proxy]]
@ -69,7 +69,7 @@ upstream = [
upstream_options = [
"override_host",
"upgrade_insecure_requests",
"convert_to_http11",
"convert_https_to_11",
]
######################################################################

8
src/backend/upstream_opts.rs
View file

@ -4,8 +4,8 @@ use crate::error::*;
pub enum UpstreamOption {
OverrideHost,
UpgradeInsecureRequests,
ConvertToHttp11,
ConvertToHttp2,
ConvertHttpsTo11,
ConvertHttpsTo2,
// TODO: Adds more options for heder override
}
impl TryFrom<&str> for UpstreamOption {
@ -14,8 +14,8 @@ impl TryFrom<&str> for UpstreamOption {
match val {
"override_host" => Ok(Self::OverrideHost),
"upgrade_insecure_requests" => Ok(Self::UpgradeInsecureRequests),
"convert_to_http11" => Ok(Self::ConvertToHttp11),
"convert_to_http2" => Ok(Self::ConvertToHttp2),
"convert_https_to_11" => Ok(Self::ConvertHttpsTo11),
"convert_https_to_2" => Ok(Self::ConvertHttpsTo2),
_ => Err(RpxyError::Other(anyhow!("Unsupported header option"))),
}
}

4
src/config/parse.rs
View file

@ -227,8 +227,8 @@ fn get_reverse_proxy(rp_settings: &[ReverseProxyOption]) -> std::result::Result<
ensure!(
upstream
.iter()
.all(|(_, elem)| !(elem.opts.contains(&UpstreamOption::ConvertToHttp11)
&& elem.opts.contains(&UpstreamOption::ConvertToHttp2))),
.all(|(_, elem)| !(elem.opts.contains(&UpstreamOption::ConvertHttpsTo11)
&& elem.opts.contains(&UpstreamOption::ConvertHttpsTo2))),
"either one of force_http11 or force_http2 can be enabled"
);

9
src/handler/handler_main.rs
View file

@ -4,6 +4,7 @@ use crate::{backend::UpstreamGroup, error::*, globals::Globals, log::*, utils::S
use hyper::{
client::connect::Connect,
header::{self, HeaderValue},
http::uri::Scheme,
Body, Client, Request, Response, StatusCode, Uri, Version,
};
use std::{env, net::SocketAddr, sync::Arc};
@ -289,10 +290,12 @@ where
.insert(header::CONNECTION, HeaderValue::from_str("upgrade")?);
}
// If not specified (force_httpXX_upstream) and https, version is preserved except for http/3
apply_upstream_options_to_request_line(req, upstream_group)?;
// if not specified (force_httpXX_upstream), version is preserved except for http/3
if req.version() == Version::HTTP_3 {
// Maybe workaround: Change version to http/1.1 when destination scheme is http
if req.version() != Version::HTTP_11 && upstream_chosen.uri.scheme() == Some(&Scheme::HTTP) {
*req.version_mut() = Version::HTTP_11;
} else if req.version() == Version::HTTP_3 {
debug!("HTTP/3 is currently unsupported for request to upstream. Use HTTP/2.");
*req.version_mut() = Version::HTTP_2;
}

4
src/handler/utils_request.rs
View file

@ -10,8 +10,8 @@ use hyper::{header, Request};
pub(super) fn apply_upstream_options_to_request_line<B>(req: &mut Request<B>, upstream: &UpstreamGroup) -> Result<()> {
for opt in upstream.opts.iter() {
match opt {
UpstreamOption::ConvertToHttp11 => *req.version_mut() = hyper::Version::HTTP_11,
UpstreamOption::ConvertToHttp2 => *req.version_mut() = hyper::Version::HTTP_2,
UpstreamOption::ConvertHttpsTo11 => *req.version_mut() = hyper::Version::HTTP_11,
UpstreamOption::ConvertHttpsTo2 => *req.version_mut() = hyper::Version::HTTP_2,
_ => (),
}
}