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 [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id CF7561FF15C for <inbox@lore.proxmox.com>; Wed, 19 Feb 2025 17:47:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D21182FA68; Wed, 19 Feb 2025 17:47:11 +0100 (CET) Message-ID: <316c2080-133a-4bae-ba90-64aa62b718ae@proxmox.com> Date: Wed, 19 Feb 2025 17:47:08 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Stoiko Ivanov <s.ivanov@proxmox.com>, pmg-devel@lists.proxmox.com References: <20250219121851.110090-1-s.ivanov@proxmox.com> <20250219121851.110090-4-s.ivanov@proxmox.com> Content-Language: en-US From: Friedrich Weber <f.weber@proxmox.com> In-Reply-To: <20250219121851.110090-4-s.ivanov@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.002 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 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> 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 19/02/2025 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) { nit: If I have a rule with an "Archive Filter" and send an email with an attachment: swaks [...] --attach <(dd if=/dev/urandom bs=1k count=1) I get the following in the journal: Feb 19 17:31:20 pmg230 pmg-smtp-filter[3021]: WARNING: Use of uninitialized value $magic in string eq at /usr/bin/pmg-smtp-filter line 568. Not sure why, though. _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel