From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 C53E9723CE for ; Thu, 1 Jul 2021 14:42:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BC23924C8B for ; Thu, 1 Jul 2021 14:42:23 +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 0B40324C4F for ; Thu, 1 Jul 2021 14:42:21 +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 7BA0240359 for ; Thu, 1 Jul 2021 14:42:21 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 1 Jul 2021 14:25:01 +0200 Message-Id: <20210701122506.503289-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210701122506.503289-1-d.csapak@proxmox.com> References: <20210701122506.503289-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.700 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 1/6] ui: dc/AuthEditBase: only add tfa field on auth modes that support that 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: , X-List-Received-Date: Thu, 01 Jul 2021 12:42:53 -0000 for now that are all, but we will ad one where that is not possible Signed-off-by: Dominik Csapak --- www/manager6/Utils.js | 3 +++ www/manager6/dc/AuthEditBase.js | 14 +++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 44d72c7b..d728c4be 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -733,17 +733,20 @@ Ext.define('PVE.Utils', { ipanel: 'pveAuthADPanel', syncipanel: 'pveAuthLDAPSyncPanel', add: true, + tfa: true, }, ldap: { name: gettext('LDAP Server'), ipanel: 'pveAuthLDAPPanel', syncipanel: 'pveAuthLDAPSyncPanel', add: true, + tfa: true, }, pam: { name: 'Linux PAM', ipanel: 'pveAuthBasePanel', add: false, + tfa: true, }, pve: { name: 'Proxmox VE authentication server', diff --git a/www/manager6/dc/AuthEditBase.js b/www/manager6/dc/AuthEditBase.js index f07052a0..e18fbc3b 100644 --- a/www/manager6/dc/AuthEditBase.js +++ b/www/manager6/dc/AuthEditBase.js @@ -24,6 +24,8 @@ Ext.define('PVE.panel.AuthBase', { initComponent: function() { let me = this; + let options = PVE.Utils.authSchema[me.type]; + if (!me.column1) { me.column1 = []; } if (!me.column2) { me.column2 = []; } if (!me.columnB) { me.columnB = []; } @@ -45,11 +47,13 @@ Ext.define('PVE.panel.AuthBase', { uncheckedValue: 0, }); - // last field of column2is tfa - me.column2.push({ - xtype: 'pveTFASelector', - deleteEmpty: !me.isCreate, - }); + if (options.tfa) { + // last field of column2is tfa + me.column2.push({ + xtype: 'pveTFASelector', + deleteEmpty: !me.isCreate, + }); + } me.columnB.push({ xtype: 'textfield', -- 2.30.2