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 E6D301FF173 for <inbox@lore.proxmox.com>; Mon, 24 Feb 2025 22:07:56 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5F2A910342; Mon, 24 Feb 2025 22:07:53 +0100 (CET) From: Stoiko Ivanov <s.ivanov@proxmox.com> To: pmg-devel@lists.proxmox.com Date: Mon, 24 Feb 2025 22:07:28 +0100 Message-Id: <20250224210728.378493-3-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250224210728.378493-1-s.ivanov@proxmox.com> References: <20250224210728.378493-1-s.ivanov@proxmox.com> MIME-Version: 1.0 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: [pmg-devel] [PATCH pmg-api 2/2] ruledb: content-type: do not rely on PMX_header_ct 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> as noted in the cover-letter for v3 of the series introducing this: https://lore.proxmox.com/pmg-devel/74a089b6-d858-4525-9822-da58b9c8f4d7@proxmox.com/T/#t the PMX_magic_ct, PMX_glob_ct and PMX_header_ct are only set if there is a bodyhandle for a mime-part, which only exists if the part has no sub-parts. However we want to match on content-types even for mail-parts which have no bodyhandle: * our internal regression-test suite has a mail with `message/partial` set * there are probably sensible uses for matching `multipart/related` parts (e.g. when trying to get a negated match. Noticed during a check of our regression-tests. Fixes: c320d56 ("utils: content-type: don't fallback to header information for magic") Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> --- src/PMG/RuleDB/ArchiveFilter.pm | 2 +- src/PMG/RuleDB/ContentTypeFilter.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PMG/RuleDB/ArchiveFilter.pm b/src/PMG/RuleDB/ArchiveFilter.pm index d7f6399..3d9890c 100644 --- a/src/PMG/RuleDB/ArchiveFilter.pm +++ b/src/PMG/RuleDB/ArchiveFilter.pm @@ -59,7 +59,7 @@ sub parse_entity { if (my $id = $entity->head->mime_attr ('x-proxmox-tmp-aid')) { chomp $id; - my $header_ct = $entity->{PMX_header_ct}; + my $header_ct = $entity->head->mime_attr ('content-type'); my $magic_ct = $entity->{PMX_magic_ct}; diff --git a/src/PMG/RuleDB/ContentTypeFilter.pm b/src/PMG/RuleDB/ContentTypeFilter.pm index ef1d377..2308829 100644 --- a/src/PMG/RuleDB/ContentTypeFilter.pm +++ b/src/PMG/RuleDB/ContentTypeFilter.pm @@ -114,7 +114,7 @@ sub parse_entity { if (my $id = $entity->head->mime_attr ('x-proxmox-tmp-aid')) { chomp $id; - my $header_ct = $entity->{PMX_header_ct}; + my $header_ct = $entity->head->mime_attr ('content-type'); my $magic_ct = $entity->{PMX_magic_ct}; -- 2.39.5 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel