From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: Dominik Csapak <d.csapak@proxmox.com>
Cc: pmg-devel@lists.proxmox.com
Subject: Re: [pmg-devel] [PATCH pmg-api 2/3] add 'quarantinelink' to admin config
Date: Tue, 17 Nov 2020 14:20:06 +0100 [thread overview]
Message-ID: <20201117142006.6b029081@rosa.proxmox.com> (raw)
In-Reply-To: <20201117080513.15046-3-d.csapak@proxmox.com>
On Tue, 17 Nov 2020 09:05:11 +0100
Dominik Csapak <d.csapak@proxmox.com> wrote:
> to enable the 'Request Quarantine Link' button and api call
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> src/PMG/Config.pm | 6 ++++++
> src/PMG/Service/pmgproxy.pm | 4 ++++
> 2 files changed, 10 insertions(+)
>
> diff --git a/src/PMG/Config.pm b/src/PMG/Config.pm
> index cd69c9c..c7e2aca 100755
> --- a/src/PMG/Config.pm
> +++ b/src/PMG/Config.pm
> @@ -126,6 +126,11 @@ sub properties {
> description => "Default DKIM selector",
> type => 'string', format => 'dns-name', #see RFC6376 3.1
> },
> + quarantinelink => {
> + description => "Enables user self-service for Quarantine Links. Caution: this is accessible without authentication",
> + type => 'boolean',
> + default => 0,
> + },
> };
> }
>
> @@ -144,6 +149,7 @@ sub options {
> dkim_sign => { optional => 1 },
> dkim_sign_all_mail => { optional => 1 },
> dkim_selector => { optional => 1 },
> + quarantinelink => { optional => 1 },
> };
> }
>
> diff --git a/src/PMG/Service/pmgproxy.pm b/src/PMG/Service/pmgproxy.pm
> index ea58b50..6d51048 100755
> --- a/src/PMG/Service/pmgproxy.pm
> +++ b/src/PMG/Service/pmgproxy.pm
> @@ -21,6 +21,7 @@ use PVE::APIServer::Utils;
>
> use PMG::HTTPServer;
> use PMG::API2;
> +use PMG::Config;
>
> use Template;
>
> @@ -227,6 +228,8 @@ sub get_index {
> $version = $1;
> };
>
> + my $cfg = PMG::Config->new();
> + my $quarantinelink = $cfg->get('admin', 'quarantinelink');
>
> $username = '' if !$username;
>
> @@ -242,6 +245,7 @@ sub get_index {
> debug => $args->{debug} || $server->{debug},
> version => $version,
> wtversion => $wtversion,
> + quarantinelink => $quarantinelink,
> };
>
> my $template_name;
nit: I would probably put the change to pmgproxy in the next patch (where
it actually gets used in the index.html.tt template
next prev parent reply other threads:[~2020-11-17 13:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-17 8:05 [pmg-devel] [PATCH pmg-api/gui] add quarantine self service button Dominik Csapak
2020-11-17 8:05 ` [pmg-devel] [PATCH pmg-api 1/3] refactor domain_regex to Utils Dominik Csapak
2020-11-17 13:18 ` Stoiko Ivanov
2020-11-17 8:05 ` [pmg-devel] [PATCH pmg-api 2/3] add 'quarantinelink' to admin config Dominik Csapak
2020-11-17 13:20 ` Stoiko Ivanov [this message]
2020-11-17 8:05 ` [pmg-devel] [PATCH pmg-api 3/3] api2/quarantine: add global sendlink api call Dominik Csapak
2020-11-17 8:05 ` [pmg-devel] [PATCH pmg-gui 1/1] add 'Request Quarantine Link' Button to LoginView Dominik Csapak
2020-11-17 13:27 ` Stoiko Ivanov
2020-11-17 13:16 ` [pmg-devel] [PATCH pmg-api/gui] add quarantine self service button Stoiko Ivanov
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=20201117142006.6b029081@rosa.proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=d.csapak@proxmox.com \
--cc=pmg-devel@lists.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.