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 F2B4D8DBF8 for ; Wed, 9 Nov 2022 19:28:46 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CDD221F752 for ; Wed, 9 Nov 2022 19:28:16 +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 ; Wed, 9 Nov 2022 19:28:14 +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 7260B446A0 for ; Wed, 9 Nov 2022 19:28:14 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Wed, 9 Nov 2022 19:27:27 +0100 Message-Id: <20221109182728.629576-5-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221109182728.629576-1-s.ivanov@proxmox.com> References: <20221109182728.629576-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.172 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. [bcc.pm, remove.pm, notify.pm, quarantine.pm] Subject: [pmg-devel] [PATCH pmg-api 4/5] 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: Wed, 09 Nov 2022 18:28:47 -0000 as done in 114655f4fdb07c789a361b2f397f5345eafd16c6 for Accept and Block. Signed-off-by: Stoiko Ivanov --- src/PMG/RuleDB/BCC.pm | 17 +++++++++++++++-- src/PMG/RuleDB/Notify.pm | 17 +++++++++++++++-- src/PMG/RuleDB/Quarantine.pm | 16 ++++++++++++++-- src/PMG/RuleDB/Remove.pm | 8 +++++++- 4 files changed, 51 insertions(+), 7 deletions(-) diff --git a/src/PMG/RuleDB/BCC.pm b/src/PMG/RuleDB/BCC.pm index c1225f3..e56f051 100644 --- a/src/PMG/RuleDB/BCC.pm +++ b/src/PMG/RuleDB/BCC.pm @@ -165,9 +165,22 @@ sub execute { $msginfo->{xforward}, $msginfo->{fqdn}, $param); foreach (@bcc_targets) { 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}, + encode('UTF-8',$_), + $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}, + encode('UTF-8',$_), + $rulename, + ); } } } diff --git a/src/PMG/RuleDB/Notify.pm b/src/PMG/RuleDB/Notify.pm index bca5ebf..ee5d2ac 100644 --- a/src/PMG/RuleDB/Notify.pm +++ b/src/PMG/RuleDB/Notify.pm @@ -260,9 +260,22 @@ sub execute { $top, $from, \@targets, undef, $msginfo->{fqdn}); foreach (@targets) { if ($qid) { - syslog('info', "%s: notify <%s> (rule: %s, %s)", $queue->{logid}, $_, $rulename, $qid); + syslog( + 'info', + "%s: notify <%s> (rule: %s, %s)", + $queue->{logid}, + encode('UTF-8', $_), + $rulename, + $qid, + ); } else { - syslog ('err', "%s: notify <%s> (rule: %s) failed", $queue->{logid}, $_, $rulename); + syslog ( + 'err', + "%s: notify <%s> (rule: %s) failed", + $queue->{logid}, + encode('UTF-8', $_), + $rulename, + ); } } } diff --git a/src/PMG/RuleDB/Quarantine.pm b/src/PMG/RuleDB/Quarantine.pm index 30bc5ec..f7154d8 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