konevsa/proxmox
1
0
Fork 0
forked from Proxmox/proxmox
Code Pull Requests Activity

rest-server: Add Redirector

Browse Source 
The `Redirector` is a simple `Service` that redirects HTTP requests
to HTTPS and can be served by a `hyper::Server`.

Signed-off-by: Max Carrara <m.carrara@proxmox.com>
Tested-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Lukas Wagner <l.wagner@proxmox.com>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Max Carrara 2023-11-21 11:08:45 +01:00 committed by Wolfgang Bumiller
parent 57b4c4624b
commit 7d29269986
2 changed files with 74 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proxmox-rest-server/src/lib.rs
View File

@ -48,7 +48,7 @@ mod api_config;
pub use api_config::{ApiConfig, AuthError, AuthHandler, IndexHandler}; pub use api_config::{ApiConfig, AuthError, AuthHandler, IndexHandler};
mod rest; mod rest;
pub use rest::RestServer; pub use rest::{Redirector, RestServer};
pub mod connection; pub mod connection;

73
proxmox-rest-server/src/rest.rs
View File

@ -97,6 +97,79 @@ impl<T: PeerAddress> Service<&T> for RestServer {
} }
} }
pub struct Redirector;
impl Default for Redirector {
fn default() -> Self {
Redirector::new()
}
}
impl Redirector {
pub fn new() -> Self {
Self {}
}
}
impl<T> Service<&T> for Redirector {
type Response = RedirectService;
type Error = Error;
type Future = std::future::Ready<Result<Self::Response, Self::Error>>;
fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
Poll::Ready(Ok(()))
}
fn call(&mut self, _ctx: &T) -> Self::Future {
std::future::ready(Ok(RedirectService {}))
}
}
pub struct RedirectService;
impl Service<Request<Body>> for RedirectService {
type Response = Response<Body>;
type Error = anyhow::Error;
type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
Poll::Ready(Ok(()))
}
fn call(&mut self, req: Request<Body>) -> Self::Future {
let future = async move {
let header_host_value = req
.headers()
.get("host")
.and_then(|value| value.to_str().ok());
let response = if let Some(value) = header_host_value {
let location_value = String::from_iter(["https://", value]);
let status_code = if matches!(*req.method(), http::Method::GET | http::Method::HEAD)
{
StatusCode::MOVED_PERMANENTLY
} else {
StatusCode::PERMANENT_REDIRECT
};
Response::builder()
.status(status_code)
.header("Location", String::from(location_value))
.body(Body::empty())?
} else {
Response::builder()
.status(StatusCode::BAD_REQUEST)
.body(Body::empty())?
};
Ok(response)
};
future.boxed()
}
}
pub trait PeerAddress { pub trait PeerAddress {
fn peer_addr(&self) -> Result<std::net::SocketAddr, Error>; fn peer_addr(&self) -> Result<std::net::SocketAddr, Error>;
} }