From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@proxmox.com>
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) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 11BA2BD24
for <pve-devel@lists.proxmox.com>; Mon, 3 Jul 2023 16:51:19 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id EEB511FB94
for <pve-devel@lists.proxmox.com>; Mon, 3 Jul 2023 16:51:18 +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) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Mon, 3 Jul 2023 16:51:17 +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 A42104388D
for <pve-devel@lists.proxmox.com>; Mon, 3 Jul 2023 16:51:17 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Mon, 3 Jul 2023 16:51:16 +0200
Message-Id: <20230703145116.257861-1-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.016 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 manager v2] fix #4758: ui: lxc wizard: allow
multiple ssh keys
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Mon, 03 Jul 2023 14:51:19 -0000
by converting the textfield into a textarea and validate the value
line wise (if there is more than one line)
also create a 'MultiFileButton' (mostly copied from extjs) that allows
to select multiple files at once
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
changes from v2:
* reduces lines of code (Thanks @Thomas)
* implemented multi file select
www/manager6/Makefile | 1 +
www/manager6/form/MultiFileButton.js | 58 ++++++++++++++++++++++++++++
www/manager6/lxc/CreateWizard.js | 19 +++++----
3 files changed, 71 insertions(+), 7 deletions(-)
create mode 100644 www/manager6/form/MultiFileButton.js
diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 5b455c80..7ec9d7a5 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -84,6 +84,7 @@ JSSRC= \
form/ListField.js \
form/Tag.js \
form/TagEdit.js \
+ form/MultiFileButton.js \
grid/BackupView.js \
grid/FirewallAliases.js \
grid/FirewallOptions.js \
diff --git a/www/manager6/form/MultiFileButton.js b/www/manager6/form/MultiFileButton.js
new file mode 100644
index 00000000..a73662f2
--- /dev/null
+++ b/www/manager6/form/MultiFileButton.js
@@ -0,0 +1,58 @@
+// mostly copied from ExtJS FileButton, but added 'multiple' at the relevant
+// places so we have a file picker where one can select multiple files
+Ext.define('PVE.form.MultiFileButton', {
+ extend: 'Ext.form.field.FileButton',
+ alias: 'widget.pveMultiFileButton',
+
+ afterTpl: [
+ '<input id="{id}-fileInputEl" data-ref="fileInputEl" class="{childElCls} {inputCls}" ',
+ 'type="file" size="1" name="{inputName}" unselectable="on" multiple ',
+ '<tpl if="accept != null">accept="{accept}"</tpl>',
+ '<tpl if="tabIndex != null">tabindex="{tabIndex}"</tpl>',
+ '>',
+ ],
+
+ createFileInput: function(isTemporary) {
+ var me = this,
+ fileInputEl, listeners;
+
+ fileInputEl = me.fileInputEl = me.el.createChild({
+ name: me.inputName || me.id,
+ multiple: true,
+ id: !isTemporary ? me.id + '-fileInputEl' : undefined,
+ cls: me.inputCls + (me.getInherited().rtl ? ' ' + Ext.baseCSSPrefix + 'rtl' : ''),
+ tag: 'input',
+ type: 'file',
+ size: 1,
+ unselectable: 'on',
+ }, me.afterInputGuard); // Nothing special happens outside of IE/Edge
+
+ // This is our focusEl
+ fileInputEl.dom.setAttribute('data-componentid', me.id);
+
+ if (me.tabIndex !== null) {
+ me.setTabIndex(me.tabIndex);
+ }
+
+ if (me.accept) {
+ fileInputEl.dom.setAttribute('accept', me.accept);
+ }
+
+ // We place focus and blur listeners on fileInputEl to activate Button's
+ // focus and blur style treatment
+ listeners = {
+ scope: me,
+ change: me.fireChange,
+ mousedown: me.handlePrompt,
+ keydown: me.handlePrompt,
+ focus: me.onFileFocus,
+ blur: me.onFileBlur,
+ };
+
+ if (me.useTabGuards) {
+ listeners.keydown = me.onFileInputKeydown;
+ }
+
+ fileInputEl.on(listeners);
+ },
+});
diff --git a/www/manager6/lxc/CreateWizard.js b/www/manager6/lxc/CreateWizard.js
index 0b82cc1c..7cc59299 100644
--- a/www/manager6/lxc/CreateWizard.js
+++ b/www/manager6/lxc/CreateWizard.js
@@ -120,16 +120,16 @@ Ext.define('PVE.lxc.CreateWizard', {
},
},
{
- xtype: 'proxmoxtextfield',
+ xtype: 'textarea',
name: 'ssh-public-keys',
value: '',
- fieldLabel: gettext('SSH public key'),
+ fieldLabel: gettext('SSH public key(s)'),
allowBlank: true,
validator: function(value) {
let pwfield = this.up().down('field[name=password]');
if (value.length) {
- let key = PVE.Parser.parseSSHKey(value);
- if (!key) {
+ let keys = value.indexOf('\n') !== -1 ? value.split('\n') : [ value ];
+ if (keys.some(key => key === '' || !PVE.Parser.parseSSHKey(key))) {
return "Failed to recognize ssh key";
}
pwfield.allowBlank = true;
@@ -159,15 +159,20 @@ Ext.define('PVE.lxc.CreateWizard', {
},
},
{
- xtype: 'filebutton',
+ xtype: 'pveMultiFileButton',
name: 'file',
hidden: !window.FileReader,
text: gettext('Load SSH Key File'),
listeners: {
change: function(btn, e, value) {
e = e.event;
- let field = this.up().down('proxmoxtextfield[name=ssh-public-keys]');
- PVE.Utils.loadSSHKeyFromFile(e.target.files[0], v => field.setValue(v));
+ let field = this.up().down('textarea[name=ssh-public-keys]');
+ for (const file of e?.target?.files ?? []) {
+ PVE.Utils.loadSSHKeyFromFile(file, v => {
+ let oldValue = field.getValue();
+ field.setValue(oldValue ? `${oldValue}\n${v.trim()}` : v.trim());
+ });
+ }
btn.reset();
},
},
--
2.30.2