From: Maximiliano Sandoval <m.sandoval@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api v2] api: use standard fingerprint-sha256 option
Date: Wed, 30 Oct 2024 14:35:03 +0100 [thread overview]
Message-ID: <20241030133503.300014-1-m.sandoval@proxmox.com> (raw)
This makes the regex a bit more precise and specifies that the
fingerprint uses SHA-256.
Suggested-by: Shannon Sterz <s.sterz@proxmox.com>
Suggested-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
Differences from v1:
- Use the existing standard option
src/PMG/API2/Cluster.pm | 6 +-----
src/PMG/CLI/pmgcm.pm | 8 +++-----
src/PMG/ClusterConfig.pm | 8 +++-----
3 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/PMG/API2/Cluster.pm b/src/PMG/API2/Cluster.pm
index 84dafabb..6846716f 100644
--- a/src/PMG/API2/Cluster.pm
+++ b/src/PMG/API2/Cluster.pm
@@ -408,11 +408,7 @@ __PACKAGE__->register_method({
description => "IP address.",
type => 'string', format => 'ip',
},
- fingerprint => {
- description => "SSL certificate fingerprint.",
- type => 'string',
- pattern => '^(:?[A-Z0-9][A-Z0-9]:){31}[A-Z0-9][A-Z0-9]$',
- },
+ fingerprint => get_standard_option('fingerprint-sha256'),
password => {
description => "Superuser password.",
type => 'string',
diff --git a/src/PMG/CLI/pmgcm.pm b/src/PMG/CLI/pmgcm.pm
index ecf9cc76..699089e0 100644
--- a/src/PMG/CLI/pmgcm.pm
+++ b/src/PMG/CLI/pmgcm.pm
@@ -11,6 +11,7 @@ use PVE::SafeSyslog;
use PVE::Tools qw(extract_param);
use PVE::INotify;
use PVE::CLIHandler;
+use PVE::JSONSchema qw(get_standard_option);
use PMG::Utils;
use PMG::Ticket;
@@ -166,12 +167,9 @@ __PACKAGE__->register_method({
description => "IP address.",
type => 'string', format => 'ip',
},
- fingerprint => {
- description => "SSL certificate fingerprint.",
- type => 'string',
- pattern => '^(:?[A-Z0-9][A-Z0-9]:){31}[A-Z0-9][A-Z0-9]$',
+ fingerprint => get_standard_option('fingerprint-sha256', {
optional => 1,
- },
+ }),
},
},
returns => { type => 'null' },
diff --git a/src/PMG/ClusterConfig.pm b/src/PMG/ClusterConfig.pm
index c52508dc..491fede1 100644
--- a/src/PMG/ClusterConfig.pm
+++ b/src/PMG/ClusterConfig.pm
@@ -45,6 +45,8 @@ use warnings;
use base qw(PMG::ClusterConfig::Base);
+use PVE::JSONSchema qw(get_standard_option);
+
sub valid_ssh_pubkey_regex {
return '^[A-Za-z0-9\.\/\+=]{200,}$';
}
@@ -72,11 +74,7 @@ sub properties {
type => 'string',
pattern => valid_ssh_pubkey_regex(),
},
- fingerprint => {
- description => "SSL certificate fingerprint.",
- type => 'string',
- pattern => '^(:?[A-Z0-9][A-Z0-9]:){31}[A-Z0-9][A-Z0-9]$',
- },
+ fingerprint => get_standard_option('fingerprint-sha256'),
};
}
--
2.39.5
_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel
next reply other threads:[~2024-10-30 13:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-30 13:35 Maximiliano Sandoval [this message]
2024-10-31 12:34 ` Fabian Grünbichler
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=20241030133503.300014-1-m.sandoval@proxmox.com \
--to=m.sandoval@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.