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

fix: remove format from uri building (#21)

Browse Source
This commit is contained in:
Christof Weickhardt 2022-04-03 19:19:39 +02:00 committed by GitHub
parent df087ff55e
commit 72faf73f4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/lib.rs
View File

@ -100,10 +100,9 @@ use hyper::client::{connect::dns::GaiResolver, HttpConnector};
use hyper::header::{HeaderMap, HeaderValue, HOST}; use hyper::header::{HeaderMap, HeaderValue, HOST};
use hyper::http::header::{InvalidHeaderValue, ToStrError}; use hyper::http::header::{InvalidHeaderValue, ToStrError};
use hyper::http::uri::InvalidUri; use hyper::http::uri::InvalidUri;
use hyper::{Body, Client, Error, Request, Response, Uri}; use hyper::{Body, Client, Error, Request, Response};
use lazy_static::lazy_static; use lazy_static::lazy_static;
use std::net::IpAddr; use std::net::IpAddr;
use std::str::FromStr;
#[derive(Debug)] #[derive(Debug)]
pub enum ProxyError { pub enum ProxyError {
@ -180,13 +179,25 @@ fn create_proxied_response<B>(mut response: Response<B>, host: HeaderValue) -> R
response response
} }
fn forward_uri<B>(forward_url: &str, req: &Request<B>) -> Result<Uri, InvalidUri> {
let forward_uri = match req.uri().query() {
Some(query) => format!("{}{}?{}", forward_url, req.uri().path(), query),
None => format!("{}{}", forward_url, req.uri().path()),
};
Uri::from_str(forward_uri.as_str()) fn forward_uri<B>(forward_url: &str, req: &Request<B>) -> String {
if let Some(query) = req.uri().query() {
let mut forwarding_uri = String::with_capacity(forward_url.len() + req.uri().path().len() + query.len() + 1);
forwarding_uri.push_str(forward_url);
forwarding_uri.push_str(req.uri().path());
forwarding_uri.push('?');
forwarding_uri.push_str(query);
forwarding_uri
} else {
let mut forwarding_uri = String::with_capacity(forward_url.len() + req.uri().path().len());
forwarding_uri.push_str(forward_url);
forwarding_uri.push_str(req.uri().path());
forwarding_uri
}
} }
fn create_proxied_request<B>( fn create_proxied_request<B>(
@ -194,10 +205,11 @@ fn create_proxied_request<B>(
forward_url: &str, forward_url: &str,
mut request: Request<B>, mut request: Request<B>,
) -> Result<Request<B>, ProxyError> { ) -> Result<Request<B>, ProxyError> {
let uri = forward_uri(forward_url, &request)?; let uri: hyper::Uri = forward_uri(forward_url, &request).parse()?;
let host = uri.host().map(|e|e.to_owned());
*request.headers_mut() = remove_hop_headers(request.headers()); *request.headers_mut() = remove_hop_headers(request.headers());
*request.uri_mut() = uri.to_owned(); *request.uri_mut() = uri;
let x_forwarded_for_header_name = "x-forwarded-for"; let x_forwarded_for_header_name = "x-forwarded-for";
@ -213,7 +225,7 @@ fn create_proxied_request<B>(
} }
} }
request.headers_mut().insert(HOST, uri.host().unwrap().parse()?); request.headers_mut().insert(HOST, host.unwrap().parse::<HeaderValue>()?);
Ok(request) Ok(request)
} }
@ -236,7 +248,7 @@ pub async fn call(
) -> Result<Response<Body>, ProxyError> { ) -> Result<Response<Body>, ProxyError> {
let host = request.headers().get(HOST).unwrap_or(&HeaderValue::from_str("").unwrap()).to_owned(); let host = request.headers().get(HOST).unwrap_or(&HeaderValue::from_str("").unwrap()).to_owned();
let proxied_request = create_proxied_request(client_ip, &forward_uri, request)?; let proxied_request = create_proxied_request(client_ip, forward_uri, request)?;
let client = build_client(); let client = build_client();
let response = client.request(proxied_request).await?; let response = client.request(proxied_request).await?;