public inbox for pmg-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Leo Nunner <l.nunner@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH v2 pmg-api] fix #4536: parse original filenames from gzip files
Date: Fri,  3 Mar 2023 16:56:11 +0100	[thread overview]
Message-ID: <20230303155611.202750-1-l.nunner@proxmox.com> (raw)

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 <l.nunner@proxmox.com>
---
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





             reply	other threads:[~2023-03-03 15:56 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-03 15:56 Leo Nunner [this message]
2023-03-07 10:25 ` [pmg-devel] applied: " Stoiko Ivanov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230303155611.202750-1-l.nunner@proxmox.com \
    --to=l.nunner@proxmox.com \
    --cc=pmg-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal