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 6D38E92038 for ; Thu, 9 Feb 2023 15:19:13 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2E1322535C for ; Thu, 9 Feb 2023 15:18:43 +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 ; Thu, 9 Feb 2023 15:18:42 +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 21E1246543 for ; Thu, 9 Feb 2023 15:18:42 +0100 (CET) Message-ID: Date: Thu, 9 Feb 2023 15:18:40 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Content-Language: en-US To: Wolfgang Bumiller Cc: pbs-devel@lists.proxmox.com References: <20230209114139.501580-1-s.sterz@proxmox.com> <20230209141654.5r2dkru47uscqbzr@fwblub> From: Stefan Sterz In-Reply-To: <20230209141654.5r2dkru47uscqbzr@fwblub> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.476 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -1.148 Looks like a legit reply (A) 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. [tasks.rs, proxmox.com] Subject: Re: [pbs-devel] [PATCH proxmox-backup] fix #4521: api/tasks: replace upid as filename for task log downloads 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: Thu, 09 Feb 2023 14:19:13 -0000 On 2/9/23 15:16, Wolfgang Bumiller wrote: > On Thu, Feb 09, 2023 at 12:41:39PM +0100, Stefan Sterz wrote: >> previously the upid would just be used without a file extension when >> downloading a task log. this lead to rather strange filenames that >> appeared unfamiliar to users as the upid is not very prevalent in the >> gui. set a proper file name based on the node name, worker type and a >> time stamp instead. also add the ".log" file extension to indicate >> that these files contain logs. >> >> Signed-off-by: Stefan Sterz >> --- >> src/api2/node/tasks.rs | 7 ++++++- >> 1 file changed, 6 insertions(+), 1 deletion(-) >> >> diff --git a/src/api2/node/tasks.rs b/src/api2/node/tasks.rs >> index d386f805..b0a4f159 100644 >> --- a/src/api2/node/tasks.rs >> +++ b/src/api2/node/tasks.rs >> @@ -341,7 +341,12 @@ fn read_task_log( >> bail!("Parameter 'download' cannot be used with other parameters"); >> } >> >> - let header_disp = format!("attachment; filename={}", &upid.to_string()); >> + let header_disp = format!( >> + "attachment; filename=task-{}-{}-{}.log", >> + upid.node, >> + upid.worker_type, >> + proxmox_time::epoch_to_rfc3339_utc(upid.starttime)? > > Mostly fine, I'm not sure the timestamp format is a good idea? > It contains colons which seem to be turned to spaces by my browser. > Colons in http headers are a bit weird? > Maybe we should just strip them out or replace them with underscores or > something? > yeah this has been discussed briefly here in the bugtracker [1]. underscores sound good to me. [1]: https://bugzilla.proxmox.com/show_bug.cgi?id=4521 >> + ); >> let stream = AsyncReaderStream::new(tokio::fs::File::open(path).await?); >> >> return Ok(Response::builder()