From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api v2 3/3] utils: drop unneeded PMX_header_ct
Date: Tue, 25 Feb 2025 12:15:04 +0100 [thread overview]
Message-ID: <20250225111504.439075-4-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20250225111504.439075-1-s.ivanov@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
next prev parent reply other threads:[~2025-02-25 11:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-25 11:15 [pmg-devel] [PATCH pmg-api v2 0/3] fix content-type matching for parts without bodyhandle Stoiko Ivanov
2025-02-25 11:15 ` [pmg-devel] [PATCH pmg-api v2 1/3] ruledb: content-type: drop unreachable fallback for only_content Stoiko Ivanov
2025-02-25 11:15 ` [pmg-devel] [PATCH pmg-api v2 2/3] ruledb: content-type: do not rely on PMX_header_ct Stoiko Ivanov
2025-02-25 11:15 ` Stoiko Ivanov [this message]
2025-02-25 13:45 ` [pmg-devel] [PATCH pmg-api v2 0/3] fix content-type matching for parts without bodyhandle Dominik Csapak
2025-02-25 16:50 ` [pmg-devel] applied: " Thomas Lamprecht
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=20250225111504.439075-4-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pmg-devel@lists.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