micropelago/hyper-reverse-proxy
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix websocket forwarding, the SocketAddr was not being properly parsed from forward_uri

Browse Source
This commit is contained in:
Brian Picciano 2024-03-05 21:40:28 +01:00
parent 224f7bef5a
commit 7adb97ceaa
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib.rs
View File

@ -279,7 +279,10 @@ fn create_proxied_request<B>(
Ok(request) Ok(request)
} }
fn get_upstream_addr(forward_uri: &hyper::Uri) -> Result<SocketAddr, ProxyError> { fn get_upstream_addr(forward_uri: &str) -> Result<SocketAddr, ProxyError> {
let forward_uri: hyper::Uri = forward_uri.parse().map_err(|e| {
ProxyError::UpstreamError(format!("parsing forward_uri as a Uri: {e}").to_string())
})?;
let host = forward_uri.host().ok_or(ProxyError::UpstreamError( let host = forward_uri.host().ok_or(ProxyError::UpstreamError(
"forward_uri has no host".to_string(), "forward_uri has no host".to_string(),
))?; ))?;
@ -296,7 +299,7 @@ type ResponseBody = http_body_util::combinators::UnsyncBoxBody<hyper::body::Byte
pub async fn call<'a, T: Connect + Clone + Send + Sync + 'static>( pub async fn call<'a, T: Connect + Clone + Send + Sync + 'static>(
client_ip: IpAddr, client_ip: IpAddr,
forward_uri: &str, forward_uri: &str,
mut request: Request<Incoming>, request: Request<Incoming>,
client: &'a Client<T, Incoming>, client: &'a Client<T, Incoming>,
) -> Result<Response<ResponseBody>, ProxyError> { ) -> Result<Response<ResponseBody>, ProxyError> {
debug!( debug!(
@ -308,12 +311,12 @@ pub async fn call<'a, T: Connect + Clone + Send + Sync + 'static>(
let request_upgrade_type = get_upgrade_type(request.headers()); let request_upgrade_type = get_upgrade_type(request.headers());
let request_uri: hyper::Uri = create_forward_uri(forward_uri, &request).parse()?; let mut request = create_proxied_request(client_ip, request, request_upgrade_type.as_ref())?;
*request.uri_mut() = request_uri.clone();
let request = create_proxied_request(client_ip, request, request_upgrade_type.as_ref())?;
if request_upgrade_type.is_none() { if request_upgrade_type.is_none() {
let request_uri: hyper::Uri = create_forward_uri(forward_uri, &request).parse()?;
*request.uri_mut() = request_uri.clone();
let response = client.request(request).await?; let response = client.request(request).await?;
debug!("Responding to call with response"); debug!("Responding to call with response");
@ -322,13 +325,13 @@ pub async fn call<'a, T: Connect + Clone + Send + Sync + 'static>(
)); ));
} }
let upstream_addr = get_upstream_addr(forward_uri)?;
let (request_parts, request_body) = request.into_parts(); let (request_parts, request_body) = request.into_parts();
let upstream_request = let upstream_request =
Request::from_parts(request_parts.clone(), Empty::<hyper::body::Bytes>::new()); Request::from_parts(request_parts.clone(), Empty::<hyper::body::Bytes>::new());
let mut downstream_request = Request::from_parts(request_parts, request_body); let mut downstream_request = Request::from_parts(request_parts, request_body);
let (mut upstream_conn, downstream_response) = { let (mut upstream_conn, downstream_response) = {
let upstream_addr = get_upstream_addr(&request_uri)?;
let conn = TokioIo::new( let conn = TokioIo::new(
tokio::net::TcpStream::connect(upstream_addr) tokio::net::TcpStream::connect(upstream_addr)
.await .await