From: Dominik Csapak <d.csapak@proxmox.com>
To: Stoiko Ivanov <s.ivanov@proxmox.com>, pmg-devel@lists.proxmox.com
Subject: Re: [pmg-devel] [PATCH pmg-api v3 3/5] pmg-smtp-filter: archive-detection: use header information as well
Date: Thu, 20 Feb 2025 16:21:52 +0100 [thread overview]
Message-ID: <27c002e3-c044-4bb4-a6ab-262f8c9ac275@proxmox.com> (raw)
In-Reply-To: <20250219121851.110090-4-s.ivanov@proxmox.com>
On 2/19/25 13:18, Stoiko Ivanov wrote:
> This restores the fall-back to the content-type from the header for
> detecting archives, which we want to unpack, as eagerly trying to get
> all information seems sensible in this case.
>
> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
> ---
> src/bin/pmg-smtp-filter | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/src/bin/pmg-smtp-filter b/src/bin/pmg-smtp-filter
> index 6061459..5c79a58 100755
> --- a/src/bin/pmg-smtp-filter
> +++ b/src/bin/pmg-smtp-filter
> @@ -561,7 +561,13 @@ sub run_dequeue {
> sub unpack_entity {
> my ($self, $unpack, $entity, $msginfo, $queue) = @_;
>
> - my ($magic, $path) = $entity->@{'PMX_magic_ct', 'PMX_decoded_path'};
> + my ($magic, $headerct, $path) = $entity->@{'PMX_magic_ct', 'PMX_header_ct', 'PMX_decoded_path'};
> +
> + # in order to not miss information from a misdetected archive use information provided in the
> + # header here as well
> + if ($magic eq 'application/octet-stream' && $headerct) {
> + $magic = $headerct;
> + }
AFAICS this will be called for all entities? so magic does not necessarily has to be set?
in that case i'd move this block into the if condition below here, where we check that magic
is actually set
>
> if ($magic && $path) {
> my $filename = basename ($path);
_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel
next prev parent reply other threads:[~2025-02-20 15:22 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-19 12:18 [pmg-devel] [PATCH pmg-api/pmg-gui v3] Stoiko Ivanov
2025-02-19 12:18 ` [pmg-devel] [PATCH pmg-api v3 1/5] ruledb: disclaimer: simplify update-case Stoiko Ivanov
2025-02-19 12:18 ` [pmg-devel] [PATCH pmg-api v3 2/5] utils: content-type: don't fallback to header information for magic Stoiko Ivanov
2025-02-19 12:18 ` [pmg-devel] [PATCH pmg-api v3 3/5] pmg-smtp-filter: archive-detection: use header information as well Stoiko Ivanov
2025-02-19 16:47 ` Friedrich Weber
2025-02-20 15:21 ` Dominik Csapak [this message]
2025-02-20 16:19 ` Stoiko Ivanov
2025-02-19 12:18 ` [pmg-devel] [PATCH pmg-api v3 4/5] ruledb: content-type: add flag for matching only based on magic/content Stoiko Ivanov
2025-02-19 12:18 ` [pmg-devel] [PATCH pmg-api v3 5/5] fix #2709: ruledb: match-field: optionally restrict to top mime-part Stoiko Ivanov
2025-02-19 12:18 ` [pmg-devel] [PATCH pmg-gui v3 1/3] rules/object: remove icon from remove button Stoiko Ivanov
2025-02-19 12:18 ` [pmg-devel] [PATCH pmg-gui v3 2/3] rules/content-typefilter: add checkbox for file content only matching Stoiko Ivanov
2025-02-19 12:18 ` [pmg-devel] [PATCH pmg-gui v3 3/3] fix #2709: rules: match-field: add top-level-only checkbox Stoiko Ivanov
2025-02-19 16:47 ` [pmg-devel] [PATCH pmg-api/pmg-gui v3] Friedrich Weber
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=27c002e3-c044-4bb4-a6ab-262f8c9ac275@proxmox.com \
--to=d.csapak@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal