From: Max Carrara <m.carrara@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH v3 proxmox 2/3] rest-server: Add `Redirector`
Date: Tue, 31 Oct 2023 19:47:04 +0100 [thread overview]
Message-ID: <20231031184705.1142244-3-m.carrara@proxmox.com> (raw)
In-Reply-To: <20231031184705.1142244-1-m.carrara@proxmox.com>
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>
---
Changes v1 --> v2:
* `RedirectService` is now a ZST
* Drop constraint on `PeerAddress` trait from `Service` `impl` of
`Redirector`
Changes v2 --> v3:
* Implement `Default` for `Redirector`
proxmox-rest-server/src/lib.rs | 2 +-
proxmox-rest-server/src/rest.rs | 77 +++++++++++++++++++++++++++++++++
2 files changed, 78 insertions(+), 1 deletion(-)
diff --git a/proxmox-rest-server/src/lib.rs b/proxmox-rest-server/src/lib.rs
index bc5be01..1c64ffb 100644
--- a/proxmox-rest-server/src/lib.rs
+++ b/proxmox-rest-server/src/lib.rs
@@ -48,7 +48,7 @@ mod api_config;
pub use api_config::{ApiConfig, AuthError, AuthHandler, IndexHandler};
mod rest;
-pub use rest::RestServer;
+pub use rest::{Redirector, RestServer};
pub mod connection;
diff --git a/proxmox-rest-server/src/rest.rs b/proxmox-rest-server/src/rest.rs
index 2ccd4d5..74e9474 100644
--- a/proxmox-rest-server/src/rest.rs
+++ b/proxmox-rest-server/src/rest.rs
@@ -97,6 +97,83 @@ 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 {
+ lazy_static! {
+ static ref RE: Regex = Regex::new(r"((http(s)?://)|^)").unwrap();
+ }
+
+ 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 = RE.replace(value, "https://");
+
+ 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 {
fn peer_addr(&self) -> Result<std::net::SocketAddr, Error>;
}
--
2.39.2
next prev parent reply other threads:[~2023-10-31 18:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-31 18:47 [pbs-devel] [PATCH v3 proxmox, proxmox-backup 0/3] Add support for HTTP to HTTPS redirection Max Carrara
2023-10-31 18:47 ` [pbs-devel] [PATCH v3 proxmox 1/3] rest-server: Refactor `AcceptBuilder`, provide support for optional TLS Max Carrara
2023-11-16 7:35 ` Wolfgang Bumiller
2023-10-31 18:47 ` Max Carrara [this message]
2023-11-03 10:17 ` [pbs-devel] [PATCH v3 proxmox 2/3] rest-server: Add `Redirector` Wolfgang Bumiller
2023-10-31 18:47 ` [pbs-devel] [PATCH v3 proxmox-backup 3/3] proxy: redirect HTTP requests to HTTPS Max Carrara
2023-11-03 10:24 ` Wolfgang Bumiller
2023-11-15 15:22 ` Max Carrara
2023-11-16 7:35 ` Wolfgang Bumiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231031184705.1142244-3-m.carrara@proxmox.com \
--to=m.carrara@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox