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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 3C2208478 for ; Fri, 3 Mar 2023 16:56:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2479A19A11 for ; Fri, 3 Mar 2023 16:56: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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 3 Mar 2023 16:56: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 3895D48DA3 for ; Fri, 3 Mar 2023 16:56:20 +0100 (CET) From: Leo Nunner To: pmg-devel@lists.proxmox.com Date: Fri, 3 Mar 2023 16:56:11 +0100 Message-Id: <20230303155611.202750-1-l.nunner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.117 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: [pmg-devel] [PATCH v2 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 15:56:21 -0000 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. Consequently, libio-compress-perl was added as an extra dependency to the debian control file. Signed-off-by: Leo Nunner --- Changes since v1: - add libio-compress-perl as a dependency - only add the name from the header to the list of filenames, don't actually use it as a path to store anything debian/control | 2 ++ src/PMG/Unpack.pm | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/debian/control b/debian/control index 3e4ba77..93ad72c 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,7 @@ Build-Depends: debhelper (>= 12~), libfile-readbackwards-perl, libfile-sync-perl, libhtml-scrubber-perl, + libio-compress-perl, liblockfile-simple-perl, libmime-tools-perl, libnet-ldap-perl, @@ -56,6 +57,7 @@ Depends: apt (>= 2~), libhtml-parser-perl, libhtml-scrubber-perl, libhtml-tree-perl, + libio-compress-perl, libjs-qrcodejs (>= 1.20201119), liblockfile-simple-perl, libmail-spf-perl, diff --git a/src/PMG/Unpack.pm b/src/PMG/Unpack.pm index d4fe454..cc5a345 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(); + $self->add_glob_mime_type($header->{Name}) if $header->{Name}; + } + $self->add_glob_mime_type ($newname); my $outfd; -- 2.30.2