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 3557B840F for ; Fri, 3 Mar 2023 12:43:51 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1090DDA59 for ; Fri, 3 Mar 2023 12:43:21 +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 ; Fri, 3 Mar 2023 12:43:20 +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 E159846375 for ; Fri, 3 Mar 2023 12:43:19 +0100 (CET) Date: Fri, 3 Mar 2023 12:43:18 +0100 From: Stoiko Ivanov To: Leo Nunner Cc: pmg-devel@lists.proxmox.com Message-ID: <20230303124318.55b1dce8@rosa.proxmox.com> In-Reply-To: <20230303100456.51670-1-l.nunner@proxmox.com> References: <20230303100456.51670-1-l.nunner@proxmox.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.24; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.145 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pmg-devel] [PATCH pmg-api] fix #4536: parse original filenames from gzip files X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2023 11:43:51 -0000 Thank you very much for addressing the issue and providing the patch! technically I think this seems like a good approach! one thing I'm not 100% sure about is, why the finding of the filename from header is done in uncompress_file and not in __unpack_archive (where the $newname variable is originally assigned)? https://git.proxmox.com/?p=pmg-api.git;a=blob;f=src/PMG/Unpack.pm;h=d4fe4547ba9341a23a6841f9e24b756ed65605df;hb=HEAD#l1014 IIUC $newname is also an absolute path to a tempdir (which conveniently also gets cleaned up on exit) did not run any explicit tests yet - but thought I'll ask anyways. On Fri, 3 Mar 2023 11:04:56 +0100 Leo Nunner wrote: > GZIP provides the possiblity to store the original filename in the > optional FNAME header field, which we can use for 'Match Archive > Filename' rules. > > IO::Uncompress::Gunzip is explicitly recommended for this purpose by the > documentation on Compress::Zlib, so an additional imnport was > introduced here. > > Signed-off-by: Leo Nunner > --- > src/PMG/Unpack.pm | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/src/PMG/Unpack.pm b/src/PMG/Unpack.pm > index d4fe454..f79ed3f 100755 > --- a/src/PMG/Unpack.pm > +++ b/src/PMG/Unpack.pm > @@ -7,6 +7,7 @@ use IO::Select; > use Xdgmime; > use Compress::Zlib qw(gzopen); > use Compress::Bzip2 qw(bzopen); > +use IO::Uncompress::Gunzip; > use File::Path; > use File::Temp qw(tempdir); > use File::Basename; > @@ -298,6 +299,13 @@ sub uncompress_file { > $maxsize = min2 ($maxsize, $filesize * $self->{maxratio}); > } > > + if($app eq 'guzip' && (my $z = IO::Uncompress::Gunzip->new($filename))) { > + # the name (FNAME) field is optional in GZIP archives, so we won't > + # always have a value here > + my $header = $z->getHeaderInfo(); > + $newname = $header->{Name} if $header->{Name}; > + } > + > $self->add_glob_mime_type ($newname); > > my $outfd;