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 4AB611FF15E for <inbox@lore.proxmox.com>; Tue, 25 Feb 2025 12:15:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3FAFC1B03B; Tue, 25 Feb 2025 12:15:45 +0100 (CET) From: Stoiko Ivanov <s.ivanov@proxmox.com> To: pmg-devel@lists.proxmox.com Date: Tue, 25 Feb 2025 12:15:04 +0100 Message-Id: <20250225111504.439075-4-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250225111504.439075-1-s.ivanov@proxmox.com> References: <20250225111504.439075-1-s.ivanov@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.066 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [utils.pm] Subject: [pmg-devel] [PATCH pmg-api v2 3/3] utils: drop unneeded 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> The variable was introduced in a early version of c320d56 ("utils: content-type: don't fallback to header information for magic" without realizing that the PMX_magic|glob_ct variables are only set for MIME-Parts with bodyhandle - and expecting to replace the header-lookup in multiple places. As the header is also present and needed for MIME-Parts without bodyhandle (parts that have subparts have no bodyhandle) - drop the variable, in order to cause less confusion. Also drop '$magic' as part of the nested if-condition, as it is already checked in the if one line above. Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> --- src/PMG/Utils.pm | 2 -- src/bin/pmg-smtp-filter | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm index b2a75fb..b225a9e 100644 --- a/src/PMG/Utils.pm +++ b/src/PMG/Utils.pm @@ -620,8 +620,6 @@ sub add_ct_marks { if (my $path = $entity->{PMX_decoded_path}) { - $entity->{PMX_header_ct} = $entity->head->mime_attr('content-type'); - $entity->{PMX_magic_ct} = magic_mime_type_for_file($path); my $filename = $entity->head->recommended_filename; diff --git a/src/bin/pmg-smtp-filter b/src/bin/pmg-smtp-filter index 60737ea..760a2ef 100755 --- a/src/bin/pmg-smtp-filter +++ b/src/bin/pmg-smtp-filter @@ -561,12 +561,14 @@ sub run_dequeue { sub unpack_entity { my ($self, $unpack, $entity, $msginfo, $queue) = @_; - my ($magic, $headerct, $path) = $entity->@{'PMX_magic_ct', 'PMX_header_ct', 'PMX_decoded_path'}; + my ($magic, $path) = $entity->@{'PMX_magic_ct', 'PMX_decoded_path'}; if ($magic && $path) { # 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')) { + + my $headerct = $entity->head->mime_attr('content-type'); + if ($headerct && $magic eq 'application/octet-stream') { $magic = $headerct; } -- 2.39.5 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel