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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E4E56B79C for ; Thu, 24 Nov 2022 13:21:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B22A42EB32 for ; Thu, 24 Nov 2022 13:21:21 +0100 (CET) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 24 Nov 2022 13:21:20 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 07800429A9 for ; Thu, 24 Nov 2022 13:21:14 +0100 (CET) From: Dominik Csapak To: pmg-devel@lists.proxmox.com Date: Thu, 24 Nov 2022 13:21:04 +0100 Message-Id: <20221124122112.666868-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221124122112.666868-1-d.csapak@proxmox.com> References: <20221124122112.666868-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.065 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. [remove.pm, quarantine.pm, notify.pm, bcc.pm] Subject: [pmg-devel] [PATCH pmg-api v4 04/12] ruledb: encode e-mail addresses for syslog 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: Thu, 24 Nov 2022 12:21:21 -0000 From: Stoiko Ivanov as done in 114655f4fdb07c789a361b2f397f5345eafd16c6 for Accept and Block. Signed-off-by: Stoiko Ivanov Signed-off-by: Dominik Csapak --- src/PMG/RuleDB/BCC.pm | 19 +++++++++++++++++-- src/PMG/RuleDB/Notify.pm | 18 ++++++++++++++++-- src/PMG/RuleDB/Quarantine.pm | 16 ++++++++++++++-- src/PMG/RuleDB/Remove.pm | 8 +++++++- 4 files changed, 54 insertions(+), 7 deletions(-) diff --git a/src/PMG/RuleDB/BCC.pm b/src/PMG/RuleDB/BCC.pm index 6244dd9..0f016f8 100644 --- a/src/PMG/RuleDB/BCC.pm +++ b/src/PMG/RuleDB/BCC.pm @@ -3,6 +3,7 @@ package PMG::RuleDB::BCC; use strict; use warnings; use DBI; +use Encode qw(encode); use PVE::SafeSyslog; @@ -164,10 +165,24 @@ sub execute { $entity, $msginfo->{sender}, \@bcc_targets, $msginfo->{xforward}, $msginfo->{fqdn}, $param); foreach (@bcc_targets) { + my $target = encode('UTF-8', $_); if ($qid) { - syslog('info', "%s: bcc to <%s> (rule: %s, %s)", $queue->{logid}, $_, $rulename, $qid); + syslog( + 'info', + "%s: bcc to <%s> (rule: %s, %s)", + $queue->{logid}, + $target, + $rulename, + $qid, + ); } else { - syslog('err', "%s: bcc to <%s> (rule: %s) failed", $queue->{logid}, $_, $rulename); + syslog( + 'err', + "%s: bcc to <%s> (rule: %s) failed", + $queue->{logid}, + $target, + $rulename, + ); } } } diff --git a/src/PMG/RuleDB/Notify.pm b/src/PMG/RuleDB/Notify.pm index 8a9945b..68f9b4e 100644 --- a/src/PMG/RuleDB/Notify.pm +++ b/src/PMG/RuleDB/Notify.pm @@ -259,10 +259,24 @@ sub execute { my $qid = PMG::Utils::reinject_mail( $top, $from, \@targets, undef, $msginfo->{fqdn}); foreach (@targets) { + my $target = encode('UTF-8', $_); if ($qid) { - syslog('info', "%s: notify <%s> (rule: %s, %s)", $queue->{logid}, $_, $rulename, $qid); + syslog( + 'info', + "%s: notify <%s> (rule: %s, %s)", + $queue->{logid}, + $target, + $rulename, + $qid, + ); } else { - syslog ('err', "%s: notify <%s> (rule: %s) failed", $queue->{logid}, $_, $rulename); + syslog ( + 'err', + "%s: notify <%s> (rule: %s) failed", + $queue->{logid}, + $target, + $rulename, + ); } } } diff --git a/src/PMG/RuleDB/Quarantine.pm b/src/PMG/RuleDB/Quarantine.pm index 9d802fe..0fc8352 100644 --- a/src/PMG/RuleDB/Quarantine.pm +++ b/src/PMG/RuleDB/Quarantine.pm @@ -101,7 +101,13 @@ sub execute { if (my $qid = $queue->quarantine_mail($ruledb, 'V', $entity, $tg, $msginfo, $vars, $ldap)) { foreach (@$tg) { - syslog ('info', "$queue->{logid}: moved mail for <%s> to virus quarantine - %s (rule: %s)", $_, $qid, $rulename); + syslog ( + 'info', + "$queue->{logid}: moved mail for <%s> to virus quarantine - %s (rule: %s)", + encode('UTF-8',$_), + $qid, + $rulename, + ); } $queue->set_status ($tg, 'delivered'); @@ -111,7 +117,13 @@ sub execute { if (my $qid = $queue->quarantine_mail($ruledb, 'S', $entity, $tg, $msginfo, $vars, $ldap)) { foreach (@$tg) { - syslog ('info', "$queue->{logid}: moved mail for <%s> to spam quarantine - %s (rule: %s)", $_, $qid, $rulename); + syslog ( + 'info', + "$queue->{logid}: moved mail for <%s> to spam quarantine - %s (rule: %s)", + encode('UTF-8',$_), + $qid, + $rulename, + ); } $queue->set_status($tg, 'delivered'); diff --git a/src/PMG/RuleDB/Remove.pm b/src/PMG/RuleDB/Remove.pm index da6c25f..e7c353c 100644 --- a/src/PMG/RuleDB/Remove.pm +++ b/src/PMG/RuleDB/Remove.pm @@ -235,7 +235,13 @@ sub execute { } foreach (@$tg) { - syslog ('info', "$queue->{logid}: moved mail for <%s> to attachment quarantine - %s (rule: %s)", $_, $qid, $rulename); + syslog ( + 'info', + "$queue->{logid}: moved mail for <%s> to attachment quarantine - %s (rule: %s)", + encode('UTF-8',$_), + $qid, + $rulename, + ); } } } -- 2.30.2