From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api 1/2] cluster: refactor ssh pubkey verification
Date: Wed, 14 Jul 2021 16:44:29 +0200 [thread overview]
Message-ID: <20210714144430.241822-2-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20210714144430.241822-1-s.ivanov@proxmox.com>
to only have the regex in one place.
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
src/PMG/Cluster.pm | 5 +++--
src/PMG/ClusterConfig.pm | 8 ++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/PMG/Cluster.pm b/src/PMG/Cluster.pm
index 131b41f..127d597 100644
--- a/src/PMG/Cluster.pm
+++ b/src/PMG/Cluster.pm
@@ -94,8 +94,9 @@ sub read_local_cluster_info {
$hostrsapubkey =~ s/^.*ssh-rsa\s+//i;
$hostrsapubkey =~ s/\s+root\@\S+\s*$//i;
+ my $sshpubkeypattern = PMG::ClusterConfig::Node::valid_ssh_pubkey();
die "unable to parse ${hostrsapubkey_fn}\n"
- if $hostrsapubkey !~ m/^[A-Za-z0-9\.\/\+]{200,}$/;
+ if $hostrsapubkey !~ m/$sshpubkeypattern/;
my $nodename = PVE::INotify::nodename();
@@ -117,7 +118,7 @@ sub read_local_cluster_info {
$rootrsapubkey =~ s/\s+root\@\S+\s*$//i;
die "unable to parse ${rootrsapubkey_fn}\n"
- if $rootrsapubkey !~ m/^[A-Za-z0-9\.\/\+]{200,}$/;
+ if $rootrsapubkey !~ m/$sshpubkeypattern/;
$res->{rootrsapubkey} = $rootrsapubkey;
diff --git a/src/PMG/ClusterConfig.pm b/src/PMG/ClusterConfig.pm
index 166e927..b615a6c 100644
--- a/src/PMG/ClusterConfig.pm
+++ b/src/PMG/ClusterConfig.pm
@@ -45,6 +45,10 @@ use warnings;
use base qw(PMG::ClusterConfig::Base);
+sub valid_ssh_pubkey {
+ return'^[A-Za-z0-9\.\/\+]{200,}$';
+}
+
sub type {
return 'node';
}
@@ -61,12 +65,12 @@ sub properties {
hostrsapubkey => {
description => "Public SSH RSA key for the host.",
type => 'string',
- pattern => '^[A-Za-z0-9\.\/\+]{200,}$',
+ pattern => valid_ssh_pubkey(),
},
rootrsapubkey => {
description => "Public SSH RSA key for the root user.",
type => 'string',
- pattern => '^[A-Za-z0-9\.\/\+]{200,}$',
+ pattern => valid_ssh_pubkey(),
},
fingerprint => {
description => "SSL certificate fingerprint.",
--
2.30.2
next prev parent reply other threads:[~2021-07-14 14:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-14 14:44 [pmg-devel] [PATCH pmg-api 0/2] fix clusterjoin with ssh-keys !=2048 bits Stoiko Ivanov
2021-07-14 14:44 ` Stoiko Ivanov [this message]
2021-07-14 14:44 ` [pmg-devel] [PATCH pmg-api 2/2] cluster: add '=' to ssh pubkey pattern Stoiko Ivanov
2021-07-14 16:02 ` [pmg-devel] [PATCH pmg-api 0/2] fix clusterjoin with ssh-keys !=2048 bits Thomas Lamprecht
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=20210714144430.241822-2-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pmg-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