From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 470351FF164 for ; Fri, 6 Dec 2024 12:20:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B3C043DB7; Fri, 6 Dec 2024 12:20:05 +0100 (CET) From: Gabriel Goller To: pve-devel@lists.proxmox.com Date: Fri, 6 Dec 2024 12:19:55 +0100 Message-Id: <20241206111958.117362-2-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241206111958.117362-1-g.goller@proxmox.com> References: <20241206111958.117362-1-g.goller@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.035 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 Subject: [pve-devel] [PATCH manager v2 1/4] show optional consent-banner before login X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Add ConsentBanner variable to html template and populate it from the `datacenter.cfg` config file. Add Datacenter option to set the text and trigger the popup on login. Signed-off-by: Gabriel Goller --- PVE/Service/pveproxy.pm | 13 ++++++++++--- www/index.html.tpl | 3 ++- www/manager6/dc/OptionView.js | 8 ++++++++ www/manager6/window/LoginWindow.js | 12 +++++++++++- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm index ac1085457f2e..b5bfd34ca3aa 100755 --- a/PVE/Service/pveproxy.pm +++ b/PVE/Service/pveproxy.pm @@ -218,10 +218,16 @@ sub get_index { } } - if (!$lang) { + my $consent_text; + eval { my $dc_conf = PVE::Cluster::cfs_read_file('datacenter.cfg'); - $lang = $dc_conf->{language} // 'en'; - } + $consent_text = $dc_conf->{'consent-text'}; + + if (!$lang) { + $lang = $dc_conf->{language} // 'en'; + } + }; + warn "$@\n" if $@; my $mobile = (is_phone($r->header('User-Agent')) && (!defined($args->{mobile}) || $args->{mobile})) || $args->{mobile}; @@ -251,6 +257,7 @@ sub get_index { version => "$version", wtversion => $wtversion, theme => $theme, + consenttext => $consent_text }; # by default, load the normal index diff --git a/www/index.html.tpl b/www/index.html.tpl index 46dc877bcaf2..d53a867522dd 100644 --- a/www/index.html.tpl +++ b/www/index.html.tpl @@ -41,7 +41,8 @@ defaultLang: '[% lang %]', NodeName: '[% nodename %]', UserName: '[% username %]', - CSRFPreventionToken: '[% token %]' + CSRFPreventionToken: '[% token %]', + ConsentText: '[% consenttext %]' }; diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js index b200fd12dcc9..8f9ea66eab1c 100644 --- a/www/manager6/dc/OptionView.js +++ b/www/manager6/dc/OptionView.js @@ -516,6 +516,14 @@ Ext.define('PVE.dc.OptionView', { }, }; + me.add_textareafield_row('consent-text', gettext('Consent Text'), { + deleteEmpty: true, + fieldOpts: { + maxLength: 24000, + }, + onlineHelp: 'consent_banner', + }); + me.selModel = Ext.create('Ext.selection.RowModel', {}); Ext.apply(me, { diff --git a/www/manager6/window/LoginWindow.js b/www/manager6/window/LoginWindow.js index aaeca3550289..b4dff0c19ac1 100644 --- a/www/manager6/window/LoginWindow.js +++ b/www/manager6/window/LoginWindow.js @@ -18,9 +18,19 @@ Ext.define('PVE.window.LoginWindow', { }, controller: { - xclass: 'Ext.app.ViewController', + init: async function() { + if (Proxmox.ConsentText) { + Ext.create("Proxmox.window.ConsentModal", { + autoShow: true, + consent: Proxmox.Markdown.parse( + Proxmox.Utils.base64ToUtf8(Proxmox.ConsentText), + ), + }); + } + }, + onLogon: async function() { var me = this; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel