From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B901790217 for ; Wed, 5 Oct 2022 18:28:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9BA8C4319 for ; Wed, 5 Oct 2022 18:28:01 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 5 Oct 2022 18:27:59 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 48EEB445DE for ; Wed, 5 Oct 2022 18:27:59 +0200 (CEST) Date: Wed, 5 Oct 2022 18:27:58 +0200 From: Stoiko Ivanov To: Dominik Csapak Cc: pmg-devel@lists.proxmox.com Message-ID: <20221005182758.3333ff62@rosa.proxmox.com> In-Reply-To: <20221005074941.903941-1-d.csapak@proxmox.com> References: <20221005074941.903941-1-d.csapak@proxmox.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.178 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [notify.pm] Subject: Re: [pmg-devel] [PATCH pmg-api] RuleDB/Notify: properly en-/decode the mail subject X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2022 16:28:31 -0000 huge thanks for addressing this so quickly! after quickly diving into the docs of the used perl-modules - seems like the best approach here and works in my tests! tiny nit/question: On Wed, 5 Oct 2022 09:49:41 +0200 Dominik Csapak wrote: > 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 > --- > 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'), any reason why 'No Subject' is inside the mime_to_perl_string call? Works either way - and I'm fine with both options - but stumbled upon reading it > 'RULE' => $rule->{name}, > 'RULE_INFO' => $msginfo->{rule_info}, > 'SENDER' => $msginfo->{sender}, with or without the potential change: Tested-By: Stoiko Ivanov Reviewed-By: Stoiko Ivanov