public inbox for pmg-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api] RuleDB/Notify: properly en-/decode the mail subject
Date: Wed,  5 Oct 2022 09:49:41 +0200	[thread overview]
Message-ID: <20221005074941.903941-1-d.csapak@proxmox.com> (raw)

we need to mime decode the subject after reading it, so that we get
the 'real' subject instead of the (possibly) mime encoded one (which
might be base64 or quoted-printable encoded). To get a proper subject in
the notification mail again, we have to encode it again before passing
it MIME::Entity->build

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/PMG/RuleDB/Notify.pm | 3 ++-
 src/bin/pmg-smtp-filter  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/PMG/RuleDB/Notify.pm b/src/PMG/RuleDB/Notify.pm
index 6b964a6..af853a3 100644
--- a/src/PMG/RuleDB/Notify.pm
+++ b/src/PMG/RuleDB/Notify.pm
@@ -6,6 +6,7 @@ use DBI;
 use MIME::Body;
 use MIME::Head;
 use MIME::Entity;
+use MIME::Words qw(encode_mimewords);
 use Encode qw(decode encode);
 
 use PVE::SafeSyslog;
@@ -228,7 +229,7 @@ sub execute {
 	Charset => 'UTF-8',
 	From    => $from,
 	To      => $to,
-	Subject => encode('UTF-8', $subject),
+	Subject => encode_mimewords(encode('UTF-8', $subject), "Charset" => "UTF-8"),
 	Data => encode('UTF-8', $body));
 
     if ($self->{attach} eq 'O') {
diff --git a/src/bin/pmg-smtp-filter b/src/bin/pmg-smtp-filter
index 45eb125..eaecd21 100755
--- a/src/bin/pmg-smtp-filter
+++ b/src/bin/pmg-smtp-filter
@@ -9,6 +9,7 @@ use Time::HiRes qw (usleep gettimeofday tv_interval);
 use POSIX qw(:sys_wait_h errno_h signal_h);
 
 use MIME::Parser;
+use MIME::WordDecoder qw(mime_to_perl_string);
 use File::Path;
 use Net::Server::PreFork;
 use Net::Server::SIG qw(register_sig check_sigs);
@@ -152,7 +153,7 @@ sub get_prox_vars {
     } if !$spaminfo;
 
     my $vars = {
-	'SUBJECT' => $entity->head->get ('subject', 0) || 'No Subject',
+	'SUBJECT' => mime_to_perl_string($entity->head->get ('subject', 0) || 'No Subject'),
 	'RULE' => $rule->{name},
 	'RULE_INFO' => $msginfo->{rule_info},
 	'SENDER' => $msginfo->{sender},
-- 
2.30.2





             reply	other threads:[~2022-10-05  7:58 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-05  7:49 Dominik Csapak [this message]
2022-10-05 16:27 ` Stoiko Ivanov
2022-10-05 16:36 ` [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=20221005074941.903941-1-d.csapak@proxmox.com \
    --to=d.csapak@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