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 D97167051C for ; Fri, 2 Apr 2021 14:20:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CF9F6EA1A for ; Fri, 2 Apr 2021 14:20:26 +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 F0980EA0D for ; Fri, 2 Apr 2021 14:20:25 +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 B5EBA4364C for ; Fri, 2 Apr 2021 14:20:25 +0200 (CEST) Message-ID: Date: Fri, 2 Apr 2021 14:20:21 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:88.0) Gecko/20100101 Thunderbird/88.0 Content-Language: en-US To: Proxmox Backup Server development discussion , Dominik Csapak References: <20210401141123.12964-1-d.csapak@proxmox.com> <20210401141123.12964-4-d.csapak@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20210401141123.12964-4-d.csapak@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.043 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) 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, ietf.org, mozilla.org] Subject: Re: [pbs-devel] [PATCH proxmox-backup v2 3/5] server/rest: add helper to extract compression headers 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: Fri, 02 Apr 2021 12:20:56 -0000 On 01.04.21 16:11, Dominik Csapak wrote: > for now we only extract 'deflate' > > Signed-off-by: Dominik Csapak > --- > src/server/rest.rs | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > > diff --git a/src/server/rest.rs b/src/server/rest.rs > index 1cd26787..00ff6844 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::compression::CompressionMethod; > use crate::tools::FileLogger; > > extern "C" { > @@ -587,6 +588,28 @@ fn extract_lang_header(headers: &http::HeaderMap) -> Option { > None > } > > +fn extract_compression_method(headers: &http::HeaderMap) -> Option { > + let mut compression = None; > + if let Some(raw_encoding) = headers.get(header::ACCEPT_ENCODING) { > + if let Ok(encoding) = raw_encoding.to_str() { FWIW, above two lines could be merged with: if let Some(Ok(encodings)) = headers.get(header::ACCEPT_ENCODING).map(|v| v.to_str()) { Would reduce a level of indentation, which this fn has quite a few. > + for encoding in encoding.split(&[',', ' '][..]) { as mentioned off-list, the Accept-Encoding allows to add "Quality values" [2], like `deflate;q=`[1], to encodings, I haven't seen any browser actually using it but it is allowed in the RFC[0]. I'd not implement support for it, but we could either adapt the FromStr implementation or split also by semicolon here. [0]: https://tools.ietf.org/html/rfc7231#section-5.3.4 [1]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept-Encoding#directives [2]: https://developer.mozilla.org/en-US/docs/Glossary/Quality_values > + if let Ok(method) = encoding.parse() { > + if method != CompressionMethod::Deflate { > + // fixme: implement other compressors > + continue; > + } > + let method = Some(method); > + if method > compression { > + compression = method; > + } > + } > + } > + } > + } > + > + return compression; > +} > + > async fn handle_request( > api: Arc, > req: Request, >