From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pmg-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 2C0721FF16B
for <inbox@lore.proxmox.com>; Thu, 20 Feb 2025 17:19:52 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 1743817F67;
Thu, 20 Feb 2025 17:19:47 +0100 (CET)
Date: Thu, 20 Feb 2025 17:19:12 +0100
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: Dominik Csapak <d.csapak@proxmox.com>
Message-ID: <Z7dWAJgaVfYB15ho@rosa.proxmox.com>
References: <20250219121851.110090-1-s.ivanov@proxmox.com>
<20250219121851.110090-4-s.ivanov@proxmox.com>
<27c002e3-c044-4bb4-a6ab-262f8c9ac275@proxmox.com>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <27c002e3-c044-4bb4-a6ab-262f8c9ac275@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.067 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: Re: [pmg-devel] [PATCH pmg-api v3 3/5] pmg-smtp-filter:
archive-detection: use header information as well
X-BeenThere: pmg-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Mail Gateway development discussion
<pmg-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pmg-devel>,
<mailto:pmg-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pmg-devel/>
List-Post: <mailto:pmg-devel@lists.proxmox.com>
List-Help: <mailto:pmg-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel>,
<mailto:pmg-devel-request@lists.proxmox.com?subject=subscribe>
Cc: pmg-devel@lists.proxmox.com
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pmg-devel-bounces@lists.proxmox.com
Sender: "pmg-devel" <pmg-devel-bounces@lists.proxmox.com>
On Thu, Feb 20, 2025 at 04:21:52PM +0100, Dominik Csapak wrote:
> 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?
Thanks for looking into this! - I finally managed to reproduce
Friedrichs findings (seems I put some effort into overlooking the warnings
in my logs...)
the warning comes from my change - since I expected PMX_magic_ct to be set in any
case with my changes.
walking through pmg-smtp-filter -> PMG::MailQueue::(parse_mail->decode_entities)
shows that a PMX_decoded_path is only set if the part has a bodyhandle[0].
the mulitpart container has subparts, thus it in itself does not have a
body(handle).
>
> in that case i'd move this block into the if condition below here, where we check that magic
> is actually set
probably the safest fix - I'll respin a v4 (and test it)
>
> > if ($magic && $path) {
> > my $filename = basename ($path);
>
>
[0] https://metacpan.org/pod/MIME::Entity#bodyhandle says a entity either
has a body or parts
_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel