warp-tech/warpgate
1
1
Fork 0
mirror of https://github.com/warp-tech/warpgate.git synced 2025-09-21 14:04:28 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix port in external host causing url parse fail

Browse source
This commit is contained in:
Skyler Mansfield 2023-11-14 14:14:22 +00:00 • committed by Eugene
parent d9af7470a4
commit b982abb5fd
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
warpgate-common/src/config/mod.rs
View file

@ -303,7 +303,11 @@ impl WarpgateConfig {
// if trust x-forwarded, get x-forwarded-proto, then try request scheme, then fallback https
// if trust x-forwarded, get x-forwarded-port, then try request port, then fallback http listen port
let trust_forwarded_headers = self.store.http.trust_x_forwarded_headers;
let (scheme, host, port) = ("https".to_string(), self.store.external_host.clone(), self.store.http.listen.port());
let url = self.store.external_host.as_ref().map(|x| Url::parse(&format!("https://{}/", x))).and_then(|x| x.ok());
let (scheme, host, port) = url
.map_or(
("https".to_string(), self.store.external_host.clone(), self.store.http.listen.port()), |
x| (x.scheme().to_string(), x.host().map(|x| x.to_string()).or(self.store.external_host.clone()), x.port().unwrap_or(self.store.http.listen.port())));
let (scheme, host, port) = match for_request {
Some(req) => {