From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B092A9B8D7 for ; Tue, 21 Nov 2023 11:09:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 911266119 for ; Tue, 21 Nov 2023 11:08:53 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 21 Nov 2023 11:08:52 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9CB0540E35 for ; Tue, 21 Nov 2023 11:08:52 +0100 (CET) From: Max Carrara To: pbs-devel@lists.proxmox.com Date: Tue, 21 Nov 2023 11:08:45 +0100 Message-Id: <20231121100846.216207-3-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231121100846.216207-1-m.carrara@proxmox.com> References: <20231121100846.216207-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.068 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH v4 proxmox 2/3] rest-server: Add `Redirector` X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Nov 2023 10:09:23 -0000 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 --- 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` Changes v3 --> v4: * Use `str` concatenation instead of regex to create the value for the "Location" header proxmox-rest-server/src/lib.rs | 2 +- proxmox-rest-server/src/rest.rs | 73 +++++++++++++++++++++++++++++++++ 2 files changed, 74 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..3e10a3a 100644 --- a/proxmox-rest-server/src/rest.rs +++ b/proxmox-rest-server/src/rest.rs @@ -97,6 +97,79 @@ impl Service<&T> for RestServer { } } +pub struct Redirector; + +impl Default for Redirector { + fn default() -> Self { + Redirector::new() + } +} + +impl Redirector { + pub fn new() -> Self { + Self {} + } +} + +impl Service<&T> for Redirector { + type Response = RedirectService; + type Error = Error; + type Future = std::future::Ready>; + + fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll> { + Poll::Ready(Ok(())) + } + + fn call(&mut self, _ctx: &T) -> Self::Future { + std::future::ready(Ok(RedirectService {})) + } +} + +pub struct RedirectService; + +impl Service> for RedirectService { + type Response = Response; + type Error = anyhow::Error; + type Future = Pin> + Send>>; + + fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll> { + Poll::Ready(Ok(())) + } + + fn call(&mut self, req: Request) -> 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 { fn peer_addr(&self) -> Result; } -- 2.39.2