From: Leo Nunner <l.nunner@proxmox.com>
To: Stoiko Ivanov <s.ivanov@proxmox.com>
Cc: pmg-devel@lists.proxmox.com
Subject: Re: [pmg-devel] [PATCH pmg-api] fix #4536: parse original filenames from gzip files
Date: Fri, 3 Mar 2023 13:18:31 +0100 [thread overview]
Message-ID: <1b9c5909-3586-a600-d87b-0147aaf53363@proxmox.com> (raw)
In-Reply-To: <20230303124318.55b1dce8@rosa.proxmox.com>
On 2023-03-03 12:43, Stoiko Ivanov wrote:
> 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
Something that Dominik pointed out to me offlist: we might want to push
both the original name *and* the generated name (using
add_glob_mime_type), since we only need to store the original name to
iterate over and not actually save anything there (as otherwise, someone
could just write *any* path in the header and we'll save the attachment
there…).
If we do that (i.e., just add another add_glob_mime_type call in the if
block), I feel like it might still be a better choice in
uncompress_file, but that's more personal preference.
> 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.
FWIW, the regression tests all passed for me. I'll send a v2 either way,
because we should also update the debian control file to explicitly
include libio-compress-perl for IO::Uncompress::Gunzip.
> On Fri, 3 Mar 2023 11:04:56 +0100
> Leo Nunner <l.nunner@proxmox.com> 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 <l.nunner@proxmox.com>
>> ---
>> 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;
prev parent reply other threads:[~2023-03-03 12:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-03 10:04 Leo Nunner
2023-03-03 11:43 ` Stoiko Ivanov
2023-03-03 12:18 ` Leo Nunner [this message]
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=1b9c5909-3586-a600-d87b-0147aaf53363@proxmox.com \
--to=l.nunner@proxmox.com \
--cc=pmg-devel@lists.proxmox.com \
--cc=s.ivanov@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