From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <d.csapak@proxmox.com> 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 DCC1D6D73E for <pbs-devel@lists.proxmox.com>; Thu, 1 Apr 2021 16:11:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C4B361CA7E for <pbs-devel@lists.proxmox.com>; Thu, 1 Apr 2021 16:11:25 +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 3E23D1CA52 for <pbs-devel@lists.proxmox.com>; Thu, 1 Apr 2021 16:11:24 +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 F2F0042651 for <pbs-devel@lists.proxmox.com>; Thu, 1 Apr 2021 16:11:23 +0200 (CEST) From: Dominik Csapak <d.csapak@proxmox.com> To: pbs-devel@lists.proxmox.com Date: Thu, 1 Apr 2021 16:11:22 +0200 Message-Id: <20210401141123.12964-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210401141123.12964-1-d.csapak@proxmox.com> References: <20210401141123.12964-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.174 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 v2 4/5] server/rest: compress api calls X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion <pbs-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/> List-Post: <mailto:pbs-devel@lists.proxmox.com> List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Thu, 01 Apr 2021 14:11:55 -0000 Signed-off-by: Dominik Csapak <d.csapak@proxmox.com> --- src/server/rest.rs | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/server/rest.rs b/src/server/rest.rs index 00ff6844..357d1b81 100644 --- a/src/server/rest.rs +++ b/src/server/rest.rs @@ -39,7 +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::compression::CompressionMethod; +use crate::tools::compression::{CompressionMethod, DeflateEncoder, Level}; use crate::tools::FileLogger; extern "C" { @@ -397,6 +397,7 @@ pub async fn handle_api_request<Env: RpcEnvironment, S: 'static + BuildHasher + uri_param: HashMap<String, String, S>, ) -> Result<Response<Body>, Error> { let delay_unauth_time = std::time::Instant::now() + std::time::Duration::from_millis(3000); + let compression = extract_compression_method(&parts.headers); let result = match info.handler { ApiHandler::AsyncHttp(handler) => { @@ -417,7 +418,7 @@ pub async fn handle_api_request<Env: RpcEnvironment, S: 'static + BuildHasher + } }; - let resp = match result { + let mut resp = match result { Ok(resp) => resp, Err(err) => { if let Some(httperr) = err.downcast_ref::<HttpError>() { @@ -429,6 +430,26 @@ pub async fn handle_api_request<Env: RpcEnvironment, S: 'static + BuildHasher + } }; + let resp = match compression { + Some(CompressionMethod::Deflate) => { + resp.headers_mut() + .insert(header::CONTENT_ENCODING, CompressionMethod::Deflate.content_encoding()); + resp.map(|body| + Body::wrap_stream(DeflateEncoder::with_quality( + body.map_err(|err| { + proxmox::io_format_err!("error during compression: {}", err) + }), + Level::Fastest, + )), + ) + } + Some(_other) => { + // fixme: implement other compression algorithms + resp + } + None => resp, + }; + if info.reload_timezone { unsafe { tzset(); -- 2.20.1