mirror of
https://github.com/warp-tech/warpgate.git
synced 2024-09-20 06:46:17 +08:00
fixed #941 - unnecessary port in external URLs
This commit is contained in:
parent
af65d5a1aa
commit
c328127493
|
@ -339,32 +339,33 @@ pub struct WarpgateConfig {
|
|||
}
|
||||
|
||||
impl WarpgateConfig {
|
||||
pub fn construct_external_url(
|
||||
&self,
|
||||
for_request: Option<&poem::Request>,
|
||||
) -> Result<Url, WarpgateError> {
|
||||
let trust_forwarded_headers = self.store.http.trust_x_forwarded_headers;
|
||||
pub fn _external_host_from_config(&self) -> Option<(Scheme, String, Option<u16>)> {
|
||||
if let Some(external_host) = self.store.external_host.as_ref() {
|
||||
#[allow(clippy::unwrap_used)]
|
||||
let external_host = external_host.split(":").next().unwrap();
|
||||
|
||||
// 1: external_host is not a valid `host[:port]`
|
||||
let (mut scheme, mut host, mut port) = (
|
||||
Some((
|
||||
Scheme::HTTPS,
|
||||
self.store.external_host.clone(),
|
||||
Some(self.store.http.listen.port()),
|
||||
);
|
||||
|
||||
// 2: external_host is a valid `host[:port]`
|
||||
if let Some(external_url) = self
|
||||
.store
|
||||
.external_host
|
||||
.as_ref()
|
||||
.and_then(|x| Url::parse(&format!("https://{x}/")).ok())
|
||||
{
|
||||
host = external_url.host_str().map(Into::into).or(host);
|
||||
port = external_url.port();
|
||||
external_host.to_owned(),
|
||||
self.store
|
||||
.http
|
||||
.external_port
|
||||
.or(Some(self.store.http.listen.port())),
|
||||
))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(request) = for_request {
|
||||
// 3: Host header in the request
|
||||
// Extract external host:port from request headers
|
||||
pub fn _external_host_from_request(
|
||||
&self,
|
||||
request: &poem::Request,
|
||||
) -> Option<(Scheme, String, Option<u16>)> {
|
||||
let (mut scheme, mut host, mut port) = (Scheme::HTTPS, None, None);
|
||||
let trust_forwarded_headers = self.store.http.trust_x_forwarded_headers;
|
||||
|
||||
// Try the Host header first
|
||||
scheme = request.uri().scheme().cloned().unwrap_or(scheme);
|
||||
|
||||
if let Some(host_header) = request.header(http::header::HOST).map(|x| x.to_string()) {
|
||||
|
@ -374,7 +375,7 @@ impl WarpgateConfig {
|
|||
}
|
||||
}
|
||||
|
||||
// 4: X-Forwarded-* headers in the request
|
||||
// But prefer X-Forwarded-* headers if enabled
|
||||
if trust_forwarded_headers {
|
||||
scheme = request
|
||||
.header("x-forwarded-proto")
|
||||
|
@ -393,15 +394,27 @@ impl WarpgateConfig {
|
|||
.and_then(|x| x.parse::<u16>().ok())
|
||||
.or(port);
|
||||
}
|
||||
|
||||
host.map(|host| (scheme, host, port))
|
||||
}
|
||||
|
||||
let Some(host) = host else {
|
||||
pub fn construct_external_url(
|
||||
&self,
|
||||
for_request: Option<&poem::Request>,
|
||||
) -> Result<Url, WarpgateError> {
|
||||
let Some((scheme, host, port)) = self
|
||||
._external_host_from_config()
|
||||
.or(for_request.and_then(|r| self._external_host_from_request(r)))
|
||||
else {
|
||||
return Err(WarpgateError::ExternalHostNotSet);
|
||||
};
|
||||
|
||||
let mut url = format!("{scheme}://{host}");
|
||||
if let Some(port) = port {
|
||||
// can't `match` `Scheme`
|
||||
if scheme == Scheme::HTTP && port != 80 || scheme == Scheme::HTTPS && port != 443 {
|
||||
url = format!("{url}:{port}");
|
||||
}
|
||||
};
|
||||
Url::parse(&url).map_err(WarpgateError::UrlParse)
|
||||
}
|
||||
|
|
|
@ -192,7 +192,9 @@ impl russh::server::Handler for ServerHandler {
|
|||
tx,
|
||||
))?;
|
||||
|
||||
Ok(rx.await.unwrap_or(Auth::Reject { proceed_with_methods: None }))
|
||||
Ok(rx.await.unwrap_or(Auth::Reject {
|
||||
proceed_with_methods: None,
|
||||
}))
|
||||
}
|
||||
|
||||
async fn auth_publickey(
|
||||
|
|
Loading…
Reference in a new issue