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 160439DE07 for ; Tue, 6 Jun 2023 12:03:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EC65632F9E for ; Tue, 6 Jun 2023 12:03:19 +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 for ; Tue, 6 Jun 2023 12:03:19 +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 424CB48C72 for ; Tue, 6 Jun 2023 12:03:19 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Tue, 6 Jun 2023 12:03:18 +0200 Message-Id: <20230606100318.110005-2-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230606100318.110005-1-w.bumiller@proxmox.com> References: <20230606100318.110005-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.129 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH widget-toolkit 2/2] tfa: show 'Locked' in 'Enabled' column if tfa is locked 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: Tue, 06 Jun 2023 10:03:50 -0000 Signed-off-by: Wolfgang Bumiller --- This one's new. src/panel/TfaView.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/panel/TfaView.js b/src/panel/TfaView.js index e7a09a9..58b8a3a 100644 --- a/src/panel/TfaView.js +++ b/src/panel/TfaView.js @@ -67,8 +67,11 @@ Ext.define('Proxmox.panel.TfaView', { onLoad: function(store, data, success) { if (!success) return; + let now = new Date().getTime() / 1000; let records = []; Ext.Array.each(data, user => { + let tfa_locked = (user.data['tfa-locked-until'] || 0) > now; + let totp_locked = user.data['totp-locked']; Ext.Array.each(user.data.entries, entry => { records.push({ fullid: `${user.id}/${entry.id}`, @@ -77,6 +80,7 @@ Ext.define('Proxmox.panel.TfaView', { description: entry.description, created: entry.created, enable: entry.enable, + locked: tfa_locked || (entry.type === 'totp' && totp_locked), }); }); }); @@ -154,8 +158,10 @@ Ext.define('Proxmox.panel.TfaView', { renderUser: fullid => fullid.split('/')[0], - renderEnabled: enabled => { - if (enabled === undefined) { + renderEnabled: function(enabled, metaData, record) { + if (record.data.locked) { + return gettext("Locked"); + } else if (enabled === undefined) { return Proxmox.Utils.yesText; } else { return Proxmox.Utils.format_boolean(enabled); -- 2.39.2