From: Dominik Csapak <d.csapak@proxmox.com>
To: Stoiko Ivanov <s.ivanov@proxmox.com>, pmg-devel@lists.proxmox.com
Subject: Re: [pmg-devel] [PATCH pmg-api] fix #2013 spamreport: remove ticket if authmode is ldap
Date: Wed, 16 Jun 2021 13:10:01 +0200 [thread overview]
Message-ID: <ff48b18e-cbaa-ddc8-3d3c-7be483722c1b@proxmox.com> (raw)
In-Reply-To: <20210517140257.3449-1-s.ivanov@proxmox.com>
Looks good and works like intended, setting the authmode to
ldap does not include the ticket anymore
just want to comment that this is now the opposite behaviour
of pmg <= 4 where setting authmode to ldap would not
change the template, but not accept quarantine tickets anymore
(which we should *probably* also do, since there may be
some valid tickets around; but this can be a separate patch)
Reviewed-By: Dominik Csapak <d.csapak@proxmox.com>
Tested-By: Dominik Csapak <d.csapak@proxmox.com>
On 5/17/21 4:02 PM, Stoiko Ivanov wrote:
> 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);
>
next prev parent reply other threads:[~2021-06-16 11:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-17 14:02 Stoiko Ivanov
2021-06-16 11:10 ` Dominik Csapak [this message]
2021-06-28 13:31 ` [pmg-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ff48b18e-cbaa-ddc8-3d3c-7be483722c1b@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pmg-devel@lists.proxmox.com \
--cc=s.ivanov@proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox