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))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 1AB8B71069
for <pmg-devel@lists.proxmox.com>; Mon, 17 May 2021 16:03:44 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 090952CCA4
for <pmg-devel@lists.proxmox.com>; Mon, 17 May 2021 16:03:14 +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))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 319A22CC98
for <pmg-devel@lists.proxmox.com>; Mon, 17 May 2021 16:03:12 +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 E298E465B8
for <pmg-devel@lists.proxmox.com>; Mon, 17 May 2021 16:03:11 +0200 (CEST)
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Date: Mon, 17 May 2021 16:02:57 +0200
Message-Id: <20210517140257.3449-1-s.ivanov@proxmox.com>
X-Mailer: git-send-email 2.20.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.007 Adjusted score from AWL reputation of From: address
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
Subject: [pmg-devel] [PATCH pmg-api] fix #2013 spamreport: remove ticket if
authmode is ldap
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: Mon, 17 May 2021 14:03:44 -0000
Currently the 'authmode' setting for the spamquarantine is not used
anywhere. According to documentation setting it to 'ldap' should allow
access to the quarantine only with ldap credentials.
This patch addresses the issue by not generating a quarantineticket,
and adapting all links accordingly if the authmode is 'ldap'.
tested by changing the authmode and running
`pmgqm send -receiver <email-address> -debug 1`
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
src/PMG/CLI/pmgqm.pm | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/PMG/CLI/pmgqm.pm b/src/PMG/CLI/pmgqm.pm
index 39253db..1e21bf0 100755
--- a/src/PMG/CLI/pmgqm.pm
+++ b/src/PMG/CLI/pmgqm.pm
@@ -70,8 +70,12 @@ sub get_item_data {
$item->{file} = $ref->{file};
my $basehref = "$data->{protocol_fqdn_port}/quarantine";
- my $ticket = uri_escape($data->{ticket});
- $item->{href} = "$basehref?ticket=$ticket&cselect=$item->{id}&date=$item->{date}";
+ if ($data->{authmode} ne 'ldap') {
+ my $ticket = uri_escape($data->{ticket});
+ $item->{href} = "$basehref?ticket=$ticket&cselect=$item->{id}&date=$item->{date}";
+ } else {
+ $item->{href} = "$basehref?cselect=$item->{id}&date=$item->{date}";
+ }
return $item;
}
@@ -229,6 +233,8 @@ __PACKAGE__->register_method ({
$protocol_fqdn_port .= ":$port";
}
+ my $authmode = $cfg->get ('spamquar', 'authmode') // 'ticket';
+
my $global_data = {
protocol => $protocol,
port => $port,
@@ -238,6 +244,7 @@ __PACKAGE__->register_method ({
timespan => $timespan,
items => [],
protocol_fqdn_port => $protocol_fqdn_port,
+ authmode => $authmode,
};
my $mailfrom = $cfg->get ('spamquar', 'mailfrom') //
@@ -306,9 +313,13 @@ __PACKAGE__->register_method ({
$mailcount = 0;
$data->{pmail} = $creceiver;
- $data->{ticket} = PMG::Ticket::assemble_quarantine_ticket($data->{pmail});
- my $esc_ticket = uri_escape($data->{ticket});
- $data->{managehref} = "$protocol_fqdn_port/quarantine?ticket=${esc_ticket}";
+ $data->{managehref} = "$protocol_fqdn_port/quarantine";
+ if ($data->{authmode} ne 'ldap') {
+ $data->{ticket} = PMG::Ticket::assemble_quarantine_ticket($data->{pmail});
+ my $esc_ticket = uri_escape($data->{ticket});
+ $data->{managehref} .= "?ticket=${esc_ticket}";
+ }
+
}
push @{$data->{items}}, get_item_data($data, $ref);
--
2.20.1