warp-tech/warpgate
1
1
Fork 0
mirror of https://github.com/warp-tech/warpgate.git synced 2024-09-20 06:46:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix redirection with a relative location

Browse source
This commit is contained in:
Nicolas SEYS 2023-09-26 11:33:42 +02:00 committed by Eugene
parent 4ecc6b653f
commit dec0b97a0d
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
warpgate-protocol-http/Cargo.toml
View file

@ -39,3 +39,4 @@ warpgate-sso = { version = "*", path = "../warpgate-sso" }
percent-encoding = "2.1"
uuid = { version = "1.2", features = ["v4"] }
regex = "1.6"
url = "2.4.1"

15
warpgate-protocol-http/src/proxy.rs
View file

@ -14,6 +14,7 @@ use poem::web::websocket::{Message, WebSocket};
use poem::{Body, IntoResponse, Request, Response};
use tokio_tungstenite::{connect_async_with_config, tungstenite};
use tracing::*;
use url::Url;
use warpgate_common::{try_block, TargetHTTPOptions, TlsMode, WarpgateError};
use warpgate_web::lookup_built_file;
@ -149,12 +150,18 @@ fn rewrite_request<B: SomeRequestBuilder>(mut req: B, options: &TargetHTTPOption
Ok(req)
}
fn rewrite_response(resp: &mut Response, options: &TargetHTTPOptions) -> Result<()> {
fn rewrite_response(
resp: &mut Response,
options: &TargetHTTPOptions,
source_uri: &Uri,
) -> Result<()> {
let target_uri = Uri::try_from(options.url.clone())?;
let headers = resp.headers_mut();
if let Some(value) = headers.get_mut(http::header::LOCATION) {
let redirect_uri = Uri::try_from(value.as_bytes())?;
let location = Url::parse(&source_uri.to_string())?.join(value.to_str()?)?;
let redirect_uri = Uri::try_from(location.to_string())?;
if redirect_uri.authority() == target_uri.authority() {
let old_value = value.clone();
*value = Uri::builder()
@ -285,7 +292,7 @@ pub async fn proxy_normal_request(
log_request_result(req.method(), req.original_uri(), &status);
rewrite_response(&mut response, options)?;
rewrite_response(&mut response, options, &uri)?;
Ok(response)
}
@ -470,6 +477,6 @@ async fn proxy_ws_inner(
.into_response();
copy_client_response(&client_response, &mut response);
rewrite_response(&mut response, options)?;
rewrite_response(&mut response, options, &uri)?;
Ok(response)
}