tuxmain/rust-rpxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some refactor

Browse source
This commit is contained in:
Jun Kurihara 2022-07-09 23:57:08 +09:00
commit 9335fc702e
No known key found for this signature in database
GPG key ID: 48ADFD173ED22B03
6 changed files with 146 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

87
src/proxy/utils_request.rs
View file

@ -1,5 +1,5 @@
use crate::{error::*, log::*, utils::*};
use hyper::{header, Request, Uri};
use hyper::{header, Request};
use std::fmt::Display;
////////////////////////////////////////////////////
@ -36,29 +36,70 @@ impl<B> MsgLog for &Request<B> {
}
}
pub(super) fn parse_host_port<B: core::fmt::Debug>(
req: &Request<B>,
) -> Result<(String, Option<u16>)> {
let headers_host = req.headers().get("host");
let uri_host = req.uri().host();
let uri_port = req.uri().port_u16();
pub trait ParseHost {
fn parse_host(&self) -> Result<&[u8]>;
}
impl<B> ParseHost for Request<B> {
fn parse_host(&self) -> Result<&[u8]> {
let headers_host = self.headers().get(header::HOST);
let uri_host = self.uri().host();
// let uri_port = self.uri().port_u16();
ensure!(
!(headers_host.is_none() && uri_host.is_none()),
"No host in request header"
);
ensure!(
!(headers_host.is_none() && uri_host.is_none()),
"No host in request header"
);
// prioritize server_name in uri
if let Some(v) = uri_host {
Ok((v.to_string(), uri_port))
} else {
let uri_from_host = headers_host.unwrap().to_str()?.parse::<Uri>()?;
Ok((
uri_from_host
.host()
.ok_or_else(|| anyhow!("Failed to parse host"))?
.to_string(),
uri_from_host.port_u16(),
))
// prioritize server_name in uri
uri_host.map_or_else(
|| {
let m = headers_host.unwrap().as_bytes();
if m.starts_with(&[b'[']) {
println!("v6 bracket");
// v6 address with bracket case. if port is specified, always it is in this case.
let mut iter = m.split(|ptr| ptr == &b'[' || ptr == &b']');
iter.next().ok_or_else(|| anyhow!("Invalid Host"))?; // first item is always blank
iter.next().ok_or_else(|| anyhow!("Invalid Host"))
} else if m.len() - m.split(|v| v == &b':').fold(0, |acc, s| acc + s.len()) >= 2 {
println!("v6 non-bracket");
// v6 address case, if 2 or more ':' is contained
Ok(m)
} else {
// v4 address or hostname
m.split(|colon| colon == &b':')
.into_iter()
.next()
.ok_or_else(|| anyhow!("Invalid Host"))
}
},
|v| Ok(v.as_bytes()),
)
}
}
// pub(super) fn parse_host_port<B: core::fmt::Debug>(
// req: &Request<B>,
// ) -> Result<(String, Option<u16>)> {
// let headers_host = req.headers().get("host");
// let uri_host = req.uri().host();
// let uri_port = req.uri().port_u16();
// ensure!(
// !(headers_host.is_none() && uri_host.is_none()),
// "No host in request header"
// );
// // prioritize server_name in uri
// if let Some(v) = uri_host {
// Ok((v.to_string(), uri_port))
// } else {
// let uri_from_host = headers_host.unwrap().to_str()?.parse::<Uri>()?;
// Ok((
// uri_from_host
// .host()
// .ok_or_else(|| anyhow!("Failed to parse host"))?
// .to_string(),
// uri_from_host.port_u16(),
// ))
// }
// }