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 3AB7CB7DD for ; Thu, 24 Nov 2022 13:21:56 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EC1382F188 for ; Thu, 24 Nov 2022 13:21:25 +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:21 +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 2D87F43741 for ; Thu, 24 Nov 2022 13:21:15 +0100 (CET) From: Dominik Csapak To: pmg-devel@lists.proxmox.com Date: Thu, 24 Nov 2022 13:21:07 +0100 Message-Id: <20221124122112.666868-8-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.064 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. [pmgqm.pm, utils.pm] Subject: [pmg-devel] [PATCH pmg-api v4 07/12] pmgqm: handle smtputf8 data 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:56 -0000 From: Stoiko Ivanov $data->{pmail} is both used in the template rendering ('Spam Report for $pmail'), and as content for the To header, which need different treatment. Thus introduce 'pmail_raw' additionally. Signed-off-by: Stoiko Ivanov Signed-off-by: Dominik Csapak --- src/PMG/CLI/pmgqm.pm | 24 +++++++++++++----------- src/PMG/Utils.pm | 7 ++++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/PMG/CLI/pmgqm.pm b/src/PMG/CLI/pmgqm.pm index dbec8ef..7293579 100755 --- a/src/PMG/CLI/pmgqm.pm +++ b/src/PMG/CLI/pmgqm.pm @@ -2,6 +2,7 @@ package PMG::CLI::pmgqm; use strict; use Data::Dumper; +use Encode qw(encode); use Template; use MIME::Entity; use HTML::Entities; @@ -17,6 +18,7 @@ use PVE::SafeSyslog; use PVE::Tools; use PVE::INotify; use PVE::CLIHandler; +use PVE::JSONSchema qw(get_standard_option); use PMG::RESTEnvironment; use PMG::Utils; @@ -57,7 +59,7 @@ sub get_item_data { } $item->{envelope_sender} = $ref->{sender}; - $item->{pmail} = $ref->{pmail}; + $item->{pmail} = encode_entities(PMG::Utils::try_decode_utf8($ref->{pmail})); $item->{receiver} = $ref->{receiver} || $ref->{pmail}; $item->{date} = strftime("%F", localtime($ref->{time})); @@ -157,11 +159,10 @@ __PACKAGE__->register_method ({ parameters => { additionalProperties => 0, properties => { - receiver => { + receiver => get_standard_option('pmg-email-address', { description => "Generate report for a single email address. If not specified, generate reports for all users.", - type => 'string', format => 'email', optional => 1, - }, + }), timespan => { description => "Select time span.", type => 'string', @@ -175,11 +176,10 @@ __PACKAGE__->register_method ({ enum => ['short', 'verbose', 'custom'], optional => 1, }, - redirect => { + redirect => get_standard_option('pmg-email-address', { description => "Redirect spam report email to this address.", - type => 'string', format => 'email', optional => 1, - }, + }), debug => { description => "Debug mode. Print raw email to stdout instead of sending them.", type => 'boolean', @@ -280,7 +280,7 @@ __PACKAGE__->register_method ({ "ORDER BY pmail, time, receiver"); if ($target) { - $sth->execute($target); + $sth->execute(encode('UTF-8', $target)); } else { $sth->execute(); } @@ -302,16 +302,18 @@ __PACKAGE__->register_method ({ }; while (my $ref = $sth->fetchrow_hashref()) { - if ($creceiver ne $ref->{pmail}) { + my $decoded_pmail = PMG::Utils::try_decode_utf8($ref->{pmail}); + if ($creceiver ne $decoded_pmail) { $finalize->() if $data; $data = clone($global_data); - $creceiver = $ref->{pmail}; + $creceiver = $decoded_pmail; $mailcount = 0; - $data->{pmail} = $creceiver; + $data->{pmail} = encode_entities($decoded_pmail); + $data->{pmail_raw} = $ref->{pmail}; $data->{managehref} = "$protocol_fqdn_port/quarantine"; if ($data->{authmode} ne 'ldap') { $data->{ticket} = PMG::Ticket::assemble_quarantine_ticket($data->{pmail}); diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm index cc30e67..5c9e873 100644 --- a/src/PMG/Utils.pm +++ b/src/PMG/Utils.pm @@ -1143,12 +1143,13 @@ sub rfc1522_to_html { my ($d, $cs) = @$r; if ($d) { if ($cs) { - $res .= encode_entities(decode($cs, $d)); + $res .= encode('UTF-8', decode($cs, $d)); } else { - $res .= encode_entities($d); + $res .= $d; } } } + $res = encode_entities(decode('UTF-8', $res)); }; $res = $enc if $@; @@ -1257,7 +1258,7 @@ sub finalize_report { my $top = MIME::Entity->build( Type => "multipart/related", - To => $data->{pmail}, + To => $data->{pmail_raw}, From => $mailfrom, Subject => bencode_header(decode_entities($title))); -- 2.30.2