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 336D192FF7 for ; Tue, 3 Jan 2023 15:23:18 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1CC67BCC3 for ; Tue, 3 Jan 2023 15:23:18 +0100 (CET) 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, 3 Jan 2023 15:23:17 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2C95E442D5 for ; Tue, 3 Jan 2023 15:23:17 +0100 (CET) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Tue, 3 Jan 2023 15:22:53 +0100 Message-Id: <20230103142308.656240-3-l.wagner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230103142308.656240-1-l.wagner@proxmox.com> References: <20230103142308.656240-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.199 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: [pbs-devel] [PATCH proxmox-backup 02/17] ui: add 'realm' field in user edit X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jan 2023 14:23:18 -0000 This allows specifying a user's realm when adding a new user. For now, adding users to the PAM realm is explicitely disabled Signed-off-by: Lukas Wagner --- www/window/UserEdit.js | 95 +++++++++++++++++++++++++++++++++++------- 1 file changed, 80 insertions(+), 15 deletions(-) diff --git a/www/window/UserEdit.js b/www/window/UserEdit.js index 06ec5377..092ff31f 100644 --- a/www/window/UserEdit.js +++ b/www/window/UserEdit.js @@ -1,3 +1,27 @@ +Ext.define('PBS.window.UserEditViewModel', { + extend: 'Ext.app.ViewModel', + + alias: 'viewmodel.pbsUserEdit', + + data: { + realm: 'pbs', + }, + + formulas: { + maySetPassword: function(get) { + // Dummy read, so that ExtJS will update the formula when + // the combobox changes + let _dummy = get('realm'); + + // All in all a bit hacky, is there a nicer way to do this? + let realm_type = this.data.realmComboBox.selection?.data.type + ? this.data.realmComboBox.selection?.data.type : 'pbs'; + + return Proxmox.Schema.authDomains[realm_type].pwchange && this.config.view.isCreate; + }, + }, +}); + Ext.define('PBS.window.UserEdit', { extend: 'Proxmox.window.Edit', alias: 'widget.pbsUserEdit', @@ -13,6 +37,10 @@ Ext.define('PBS.window.UserEdit', { fieldDefaults: { labelWidth: 120 }, + viewModel: { + type: 'pbsUserEdit', + }, + cbindData: function(initialConfig) { var me = this; @@ -43,6 +71,43 @@ Ext.define('PBS.window.UserEdit', { editable: '{isCreate}', }, }, + { + xtype: 'pmxRealmComboBox', + name: 'realm', + fieldLabel: gettext('Realm'), + allowBlank: false, + matchFieldWidth: false, + listConfig: { width: 300 }, + reference: 'realmComboBox', + bind: '{realm}', + cbind: { + hidden: '{!isCreate}', + disabled: '{!isCreate}', + }, + + submitValue: true, + // Let's override the default controller so that we can + // remove the PAM realm. We don't want to manually add users + // for the PAM realm. + controller: { + xclass: 'Ext.app.ViewController', + + init: function(view) { + view.store.on('load', this.onLoad, view); + }, + + onLoad: function(store, records, success) { + if (!success) { + return; + } + + let pamRecord = this.store.findRecord('realm', 'pam', 0, false, true, true); + + this.store.remove(pamRecord); + this.setValue('pbs'); + }, + }, + }, { xtype: 'textfield', inputType: 'password', @@ -51,16 +116,16 @@ Ext.define('PBS.window.UserEdit', { allowBlank: false, name: 'password', listeners: { - change: function(field) { + change: function(field) { field.next().validate(); - }, - blur: function(field) { + }, + blur: function(field) { field.next().validate(); - }, + }, }, - cbind: { - hidden: '{!isCreate}', - disabled: '{!isCreate}', + bind: { + disabled: '{!maySetPassword}', + hidden: '{!maySetPassword}', }, }, { @@ -72,19 +137,19 @@ Ext.define('PBS.window.UserEdit', { initialPassField: 'password', allowBlank: false, submitValue: false, - cbind: { - hidden: '{!isCreate}', - disabled: '{!isCreate}', + bind: { + disabled: '{!maySetPassword}', + hidden: '{!maySetPassword}', }, }, { - xtype: 'datefield', - name: 'expire', + xtype: 'datefield', + name: 'expire', emptyText: Proxmox.Utils.neverText, format: 'Y-m-d', submitFormat: 'U', - fieldLabel: gettext('Expire'), - }, + fieldLabel: gettext('Expire'), + }, { xtype: 'proxmoxcheckbox', fieldLabel: gettext('Enabled'), @@ -146,7 +211,7 @@ Ext.define('PBS.window.UserEdit', { } if (me.isCreate) { - values.userid = values.userid + '@pbs'; + values.userid = values.userid + '@' + values.realm; } delete values.username; -- 2.30.2