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 AEDAEBB97
for <pve-devel@lists.proxmox.com>; Mon, 3 Jul 2023 15:37:12 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 906AA1E2B5
for <pve-devel@lists.proxmox.com>; Mon, 3 Jul 2023 15:37:12 +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 15:37:12 +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 CCFB041E2F
for <pve-devel@lists.proxmox.com>; Mon, 3 Jul 2023 15:37:11 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Mon, 3 Jul 2023 15:37:11 +0200
Message-Id: <20230703133711.3268237-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] 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 13:37:12 -0000
by converting the textfield into a textarea and validate the value
line wise (if there is more than one line)
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/manager6/lxc/CreateWizard.js | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/www/manager6/lxc/CreateWizard.js b/www/manager6/lxc/CreateWizard.js
index 0b82cc1c..e74b0b5c 100644
--- a/www/manager6/lxc/CreateWizard.js
+++ b/www/manager6/lxc/CreateWizard.js
@@ -120,17 +120,29 @@ 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) {
- return "Failed to recognize ssh key";
+ if (value.indexOf('\n') !== -1) {
+ let err;
+ value.split('\n').forEach((key) => {
+ if (key !== '' && !PVE.Parser.parseSSHKey(key)) {
+ err = "Failed to recognize ssh key";
+ }
+ });
+ if (err) {
+ return err;
+ }
+ } else {
+ let key = PVE.Parser.parseSSHKey(value);
+ if (!key) {
+ return "Failed to recognize ssh key";
+ }
}
pwfield.allowBlank = true;
} else {
@@ -166,7 +178,7 @@ Ext.define('PVE.lxc.CreateWizard', {
listeners: {
change: function(btn, e, value) {
e = e.event;
- let field = this.up().down('proxmoxtextfield[name=ssh-public-keys]');
+ let field = this.up().down('textarea[name=ssh-public-keys]');
PVE.Utils.loadSSHKeyFromFile(e.target.files[0], v => field.setValue(v));
btn.reset();
},
--
2.30.2