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 C69776CD56 for ; Wed, 31 Mar 2021 11:44:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 97FCCD214 for ; Wed, 31 Mar 2021 11:44:21 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id C8A4BD1FA for ; Wed, 31 Mar 2021 11:44:19 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8ADF342976 for ; Wed, 31 Mar 2021 11:44:19 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 31 Mar 2021 11:44:18 +0200 Message-Id: <20210331094418.16609-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210331094418.16609-1-d.csapak@proxmox.com> References: <20210331094418.16609-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.175 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [rest.rs] Subject: [pbs-devel] [PATCH proxmox-backup 6/6] server/rest: compress static files 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: Wed, 31 Mar 2021 09:44:51 -0000 Signed-off-by: Dominik Csapak --- src/server/rest.rs | 62 +++++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/src/server/rest.rs b/src/server/rest.rs index 0b641c66..2876f31f 100644 --- a/src/server/rest.rs +++ b/src/server/rest.rs @@ -39,6 +39,7 @@ use crate::api2::types::{Authid, Userid}; use crate::auth_helpers::*; use crate::config::cached_user_info::CachedUserInfo; use crate::tools; +use crate::tools::AsyncReaderStream; use crate::tools::compression::{self, CompressionMethod, DeflateEncoder, Level}; use crate::tools::ticket::Ticket; use crate::tools::FileLogger; @@ -622,14 +623,14 @@ async fn get_possibly_compressed_file( } } -async fn simple_static_file_download(filename: PathBuf) -> Result, Error> { - let (content_type, _nocomp) = extension_to_content_type(&filename); - +async fn simple_static_file_download( + filename: PathBuf, + content_type: &'static str, + mut compression: Option, +) -> Result, Error> { use tokio::io::AsyncReadExt; - let mut file = File::open(filename) - .await - .map_err(|err| http_err!(BAD_REQUEST, "File open failed: {}", err))?; + let mut file = get_possibly_compressed_file(filename, &mut compression).await?; let mut data: Vec = Vec::new(); file.read_to_end(&mut data) @@ -641,37 +642,51 @@ async fn simple_static_file_download(filename: PathBuf) -> Result header::CONTENT_TYPE, header::HeaderValue::from_static(content_type), ); + + if let Some(method) = compression { + response + .headers_mut() + .insert(header::CONTENT_ENCODING, method.content_encoding()); + } + Ok(response) } -async fn chuncked_static_file_download(filename: PathBuf) -> Result, Error> { - let (content_type, _nocomp) = extension_to_content_type(&filename); +async fn chuncked_static_file_download( + filename: PathBuf, + content_type: &'static str, + mut compression: Option, +) -> Result, Error> { + let mut resp = Response::builder() + .status(StatusCode::OK) + .header(header::CONTENT_TYPE, content_type); - let file = File::open(filename) - .await - .map_err(|err| http_err!(BAD_REQUEST, "File open failed: {}", err))?; + let file = get_possibly_compressed_file(filename, &mut compression).await?; - let payload = tokio_util::codec::FramedRead::new(file, tokio_util::codec::BytesCodec::new()) - .map_ok(|bytes| bytes.freeze()); - let body = Body::wrap_stream(payload); + if let Some(method) = compression { + resp = resp.header(header::CONTENT_ENCODING, method.content_encoding()); + } - // FIXME: set other headers ? - Ok(Response::builder() - .status(StatusCode::OK) - .header(header::CONTENT_TYPE, content_type) - .body(body) + Ok(resp + .body(Body::wrap_stream(AsyncReaderStream::new(file))) .unwrap()) } -async fn handle_static_file_download(filename: PathBuf) -> Result, Error> { +async fn handle_static_file_download( + filename: PathBuf, + compression: Option, +) -> Result, Error> { let metadata = tokio::fs::metadata(filename.clone()) .map_err(|err| http_err!(BAD_REQUEST, "File access problems: {}", err)) .await?; + let (content_type, nocomp) = extension_to_content_type(&filename); + let compression = if nocomp { None } else { compression }; + if metadata.len() < 1024 * 32 { - simple_static_file_download(filename).await + simple_static_file_download(filename, content_type, compression).await } else { - chuncked_static_file_download(filename).await + chuncked_static_file_download(filename, content_type, compression).await } } @@ -944,7 +959,8 @@ async fn handle_request( } } else { let filename = api.find_alias(&components); - return handle_static_file_download(filename).await; + let compression = extract_compression_method(&parts.headers); + return handle_static_file_download(filename, compression).await; } } -- 2.20.1