public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Lorenz Stechauner <l.stechauner@proxmox.com>
To: Lorenz Stechauner <l.stechauner@proxmox.com>,
	Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH manager] fix #3426: ui: parser: adapt parseSSHKey to accept "@..." suffix
Date: Thu, 22 Jul 2021 09:06:11 +0200	[thread overview]
Message-ID: <b1c73d54-256f-89bc-ef4e-046bfff1261c@proxmox.com> (raw)
In-Reply-To: <20210607104456.66895-1-l.stechauner@proxmox.com>

ping

On 07.06.21 12:44, Lorenz Stechauner wrote:
> also rearranged the regex groups to allow sk-ecdsa-sha2-...
>
> note: FIDO keys are now parsable, the backend only supports it with
> OpenSSH >= 8.2. This may be achieved with upgrading to PVE 7 or
> using a back port.
> ---
>   www/manager6/Parser.js | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/www/manager6/Parser.js b/www/manager6/Parser.js
> index bb6a9a33..23236dac 100644
> --- a/www/manager6/Parser.js
> +++ b/www/manager6/Parser.js
> @@ -565,7 +565,7 @@ Ext.define('PVE.Parser', {
>       parseSSHKey: function(key) {
>   	//                |--- options can have quotes--|     type    key        comment
>   	let keyre = /^(?:((?:[^\s"]|"(?:\\.|[^"\\])*")+)\s+)?(\S+)\s+(\S+)(?:\s+(.*))?$/;
> -	let typere = /^(?:(?:sk-)?ssh-(?:dss|rsa|ed25519)|ecdsa-sha2-nistp\d+)$/;
> +	let typere = /^(?:(?:sk-)?(?:ssh-(?:dss|rsa|ed25519)|ecdsa-sha2-nistp\d+)(?:@(?:[a-z0-9_-]+\.)+[a-z]{2,})?)$/;
>   
>   	let m = key.match(keyre);
>   	if (!m || m.length < 3 || !m[2]) { // [2] is always either type or key




  reply	other threads:[~2021-07-22  7:06 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-07 10:44 Lorenz Stechauner
2021-07-22  7:06 ` Lorenz Stechauner [this message]
2021-07-23  7:09 ` [pve-devel] applied: " Dominik Csapak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b1c73d54-256f-89bc-ef4e-046bfff1261c@proxmox.com \
    --to=l.stechauner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal