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 DAA4276076 for ; Wed, 14 Jul 2021 16:44:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D566F131F9 for ; Wed, 14 Jul 2021 16:44:46 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 78DFB131DE for ; Wed, 14 Jul 2021 16:44:45 +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 49395418E3 for ; Wed, 14 Jul 2021 16:44:45 +0200 (CEST) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Wed, 14 Jul 2021 16:44:29 +0200 Message-Id: <20210714144430.241822-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714144430.241822-1-s.ivanov@proxmox.com> References: <20210714144430.241822-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.453 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: [pmg-devel] [PATCH pmg-api 1/2] cluster: refactor ssh pubkey verification X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2021 14:44:46 -0000 to only have the regex in one place. Signed-off-by: Stoiko Ivanov --- 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