public inbox for pmg-devel@lists.proxmox.com
 help / color / mirror / Atom feed
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 v4 3/5] pmg-smtp-filter: archive-detection: use header information as well
Date: Fri, 21 Feb 2025 10:49:59 +0100	[thread overview]
Message-ID: <2dbddc2b-3976-4d48-9dc1-abd05f849f82@proxmox.com> (raw)
In-Reply-To: <20250220201309.181365-4-s.ivanov@proxmox.com>

On 2/20/25 21:13, 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 | 10 ++++++++--
>   1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/src/bin/pmg-smtp-filter b/src/bin/pmg-smtp-filter
> index 6061459..6c03631 100755
> --- a/src/bin/pmg-smtp-filter
> +++ b/src/bin/pmg-smtp-filter
> @@ -561,9 +561,15 @@ 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'};
> +
> +    if ($path) {

while not really wrong (currently, since $path and $magic are always set or unset together)
not checking for $magic here sets us up for future bugs

we use both in the branch (independently of one another), so if some codechange in the future
would set $path but not $magic, we'd enter the branch with '$magic = undef' here unintentionally

so keeping the `if ($magic && $path)` here does not hurt us, and only makes
it clearer that both must be set for the branch to be executed..

> +	# in order to not miss information from a misdetected archive use information provided in the
> +	# header here as well
> +	if ($headerct && ($magic && $magic eq 'application/octet-stream')) {
> +	    $magic = $headerct;
> +	}
>   
> -    if ($magic && $path) {
>   	my $filename = basename ($path);
>   
>   	if (PMG::Unpack::is_archive ($magic)) {



_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel


  reply	other threads:[~2025-02-21 10:13 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-20 20:13 [pmg-devel] [PATCH pmg-api/pmg-gui v4] add additional attributes to ContentTypeFilter and MatchField Stoiko Ivanov
2025-02-20 20:13 ` [pmg-devel] [PATCH pmg-api v4 1/5] ruledb: disclaimer: simplify update-case Stoiko Ivanov
2025-02-20 20:13 ` [pmg-devel] [PATCH pmg-api v4 2/5] utils: content-type: don't fallback to header information for magic Stoiko Ivanov
2025-02-20 20:13 ` [pmg-devel] [PATCH pmg-api v4 3/5] pmg-smtp-filter: archive-detection: use header information as well Stoiko Ivanov
2025-02-21  9:49   ` Dominik Csapak [this message]
2025-02-21  9:54   ` Dominik Csapak
2025-02-20 20:13 ` [pmg-devel] [PATCH pmg-api v4 4/5] ruledb: content-type: add flag for matching only based on magic/content Stoiko Ivanov
2025-02-20 20:13 ` [pmg-devel] [PATCH pmg-api v4 5/5] fix #2709: ruledb: match-field: optionally restrict to top mime-part Stoiko Ivanov
2025-02-21 10:10   ` Dominik Csapak
2025-02-21 11:23     ` Stoiko Ivanov
2025-02-21 12:01       ` Dominik Csapak
2025-02-20 20:13 ` [pmg-devel] [PATCH pmg-gui v4 1/3] rules/object: remove icon from remove button Stoiko Ivanov
2025-02-20 20:13 ` [pmg-devel] [PATCH pmg-gui v4 2/3] rules/content-typefilter: add checkbox for file content only matching Stoiko Ivanov
2025-02-20 20:13 ` [pmg-devel] [PATCH pmg-gui v4 3/3] fix #2709: rules: match-field: add top-level-only checkbox Stoiko Ivanov
2025-02-21 10:33 ` [pmg-devel] [PATCH pmg-api/pmg-gui v4] add additional attributes to ContentTypeFilter and MatchField Dominik Csapak
2025-02-21 16:12 ` 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=2dbddc2b-3976-4d48-9dc1-abd05f849f82@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