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 B1152666D0 for ; Fri, 6 Nov 2020 14:14:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A47D521F63 for ; Fri, 6 Nov 2020 14:14:08 +0100 (CET) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 1CC6021F57 for ; Fri, 6 Nov 2020 14:14:08 +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 DCE6546055 for ; Fri, 6 Nov 2020 14:14:07 +0100 (CET) Date: Fri, 6 Nov 2020 14:14:06 +0100 From: Wolfgang Bumiller To: Dominik Csapak Cc: pbs-devel@lists.proxmox.com Message-ID: <20201106131406.3fpkgwtecigkym7z@olga.proxmox.com> References: <20201106100343.12161-1-d.csapak@proxmox.com> <20201106100343.12161-4-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201106100343.12161-4-d.csapak@proxmox.com> User-Agent: NeoMutt/20180716 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.010 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: Re: [pbs-devel] [PATCH proxmox-backup 3/6] server/rest: set last-modified for 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: Fri, 06 Nov 2020 13:14:08 -0000 On Fri, Nov 06, 2020 at 11:03:40AM +0100, Dominik Csapak wrote: > this way the browser can cache them > > Signed-off-by: Dominik Csapak > --- > src/server/rest.rs | 23 +++++++++++++++++++++-- > 1 file changed, 21 insertions(+), 2 deletions(-) > > diff --git a/src/server/rest.rs b/src/server/rest.rs > index ea87c9c8..d0169ba5 100644 > --- a/src/server/rest.rs > +++ b/src/server/rest.rs > @@ -492,10 +492,17 @@ async fn simple_static_file_download(filename: PathBuf) -> Result > > use tokio::io::AsyncReadExt; > > - let mut file = File::open(filename) > + let mut file = File::open(&filename) > .await > .map_err(|err| http_err!(BAD_REQUEST, "File open failed: {}", err))?; > > + let mtime = crate::tools::fs::get_async_file_mtime(filename) We already have an open file handle here, so please don't use the path again. Split the helper in something to which you can pass either the metadata you get from `file.metadata().await?`, or the file directly. > + .await > + .map_err(|err| http_err!(INTERNAL_SERVER_ERROR, "File stat failed: {}", err))?; > + > + let last_modified = proxmox::tools::time::strftime_utc("%a, %d %b %Y %T GMT", mtime) > + .map_err(|err| http_err!(INTERNAL_SERVER_ERROR, "strftime failed: {}", err))?; > + > let mut data: Vec = Vec::new(); > file.read_to_end(&mut data) > .await > @@ -505,16 +512,27 @@ async fn simple_static_file_download(filename: PathBuf) -> Result > response.headers_mut().insert( > header::CONTENT_TYPE, > header::HeaderValue::from_static(content_type)); > + response.headers_mut().insert( > + header::LAST_MODIFIED, > + header::HeaderValue::from_str(&last_modified)?); > Ok(response) > } > > async fn chuncked_static_file_download(filename: PathBuf) -> Result, Error> { > let (content_type, _nocomp) = extension_to_content_type(&filename); > > - let file = File::open(filename) > + let file = File::open(&filename) > .await > .map_err(|err| http_err!(BAD_REQUEST, "File open failed: {}", err))?; > > + let mtime = crate::tools::fs::get_async_file_mtime(filename) ^ same > + .await > + .map_err(|err| http_err!(INTERNAL_SERVER_ERROR, "File stat failed: {}", err))?; > + > + let last_modified = proxmox::tools::time::strftime_utc("%a, %d %b %Y %T GMT", mtime) > + .map_err(|err| http_err!(INTERNAL_SERVER_ERROR, "strftime failed: {}", err))?; > + > + > let payload = tokio_util::codec::FramedRead::new(file, tokio_util::codec::BytesCodec::new()) > .map_ok(|bytes| hyper::body::Bytes::from(bytes.freeze())); > let body = Body::wrap_stream(payload); > @@ -523,6 +541,7 @@ async fn chuncked_static_file_download(filename: PathBuf) -> Result Ok(Response::builder() > .status(StatusCode::OK) > .header(header::CONTENT_TYPE, content_type) > + .header(header::LAST_MODIFIED, &last_modified) > .body(body) > .unwrap() > ) > -- > 2.20.1