From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <s.ivanov@proxmox.com>
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 93533BEC5
for <pmg-devel@lists.proxmox.com>; Wed, 13 Sep 2023 18:21:00 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 78E5E30C5F
for <pmg-devel@lists.proxmox.com>; Wed, 13 Sep 2023 18:21:00 +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 <pmg-devel@lists.proxmox.com>; Wed, 13 Sep 2023 18:20:58 +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 A449346F7C
for <pmg-devel@lists.proxmox.com>; Wed, 13 Sep 2023 18:20:58 +0200 (CEST)
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Date: Wed, 13 Sep 2023 18:20:46 +0200
Message-Id: <20230913162046.12637-1-s.ivanov@proxmox.com>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.088 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
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]
Subject: [pmg-devel] [PATCH pmg-api] quarantine: ticket: use raw pmail for
ticket assembly
X-BeenThere: pmg-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Mail Gateway development discussion
<pmg-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pmg-devel>,
<mailto:pmg-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pmg-devel/>
List-Post: <mailto:pmg-devel@lists.proxmox.com>
List-Help: <mailto:pmg-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel>,
<mailto:pmg-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 13 Sep 2023 16:21:00 -0000
currently the quarantine report does not work if the recipient has
some encodable characters in their local part - e.g.
'some&other@domain.example'
when clicking on the links on the report the user gets logged in
however their quarantine list is empty (the call to
/api2/json/quarantine/spamusers returns 403)
With this patch the ticket (thus also the username remains
'some&other@domain.example' instead of 'some&other@domain.example'
and the listing works as expected
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
Tested this quickly here in my test-setup - but would really need some
feedback on potential pitfalls, as this is authentication-related code...
src/PMG/CLI/pmgqm.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/PMG/CLI/pmgqm.pm b/src/PMG/CLI/pmgqm.pm
index 7293579..987ddc9 100755
--- a/src/PMG/CLI/pmgqm.pm
+++ b/src/PMG/CLI/pmgqm.pm
@@ -316,7 +316,7 @@ __PACKAGE__->register_method ({
$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});
+ $data->{ticket} = PMG::Ticket::assemble_quarantine_ticket($data->{pmail_raw});
my $esc_ticket = uri_escape($data->{ticket});
$data->{managehref} .= "?ticket=${esc_ticket}";
}
--
2.39.2