From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 603871FF183 for ; Mon, 11 Nov 2024 13:21:31 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 348FFA0BA; Mon, 11 Nov 2024 13:21:30 +0100 (CET) Date: Mon, 11 Nov 2024 13:20:57 +0100 From: Stoiko Ivanov To: Maximiliano Sandoval Message-ID: <20241111132057.0ea5b2c2@rosa.proxmox.com> In-Reply-To: <20241111093231.120597-1-m.sandoval@proxmox.com> References: <20241111093231.120597-1-m.sandoval@proxmox.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.180 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 KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pmg-devel] [PATCH pmg-api v3 1/2] api: document that fingerprints are a SHA 256 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: , Cc: pmg-devel@lists.proxmox.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pmg-devel-bounces@lists.proxmox.com Sender: "pmg-devel" Thanks for the patches! On Mon, 11 Nov 2024 10:32:30 +0100 Maximiliano Sandoval wrote: > We use the description from the standard option 'fingerprint-sha256'. > The option itself cannot be used as the regex allows lowercase > characters which don't work here. It would really help to get a bit more information about what exactly did not work, and what you tested to come to that conclusion. As I'm quite in favor of reusing our standard-options where possible I gave your v2 a spin to find out what might not work - from a quick glance (w/o testing everything possible) - the following diff should cover most issues: ``` diff --git a/src/PMG/CLI/pmgcm.pm b/src/PMG/CLI/pmgcm.pm index 699089e..c55ef92 100644 --- a/src/PMG/CLI/pmgcm.pm +++ b/src/PMG/CLI/pmgcm.pm @@ -194,7 +194,7 @@ __PACKAGE__->register_method({ }; if ($param->{fingerprint}) { $setup->{cached_fingerprints} = { - $param->{fingerprint} => 1, + uc($param->{fingerprint}) => 1, }; } else { # allow manual fingerprint verification diff --git a/src/PMG/Cluster.pm b/src/PMG/Cluster.pm index 17ba44d..789746f 100644 --- a/src/PMG/Cluster.pm +++ b/src/PMG/Cluster.pm @@ -148,7 +148,7 @@ sub update_cert_cache { foreach my $entry (values %{$cinfo->{ids}}) { my $node = $entry->{name}; - my $fp = $entry->{fingerprint}; + my $fp = uc($entry->{fingerprint}); if ($node && $fp) { $cert_cache_fingerprints->{$fp} = 1; $cert_cache_nodes->{$node} = $fp; @@ -179,7 +179,7 @@ sub check_cert_fingerprint { my $check = sub { for my $expected (keys %$cert_cache_fingerprints) { - return 1 if $fp eq $expected; + return 1 if uc($fp) eq $expected; } return 0; }; diff --git a/src/PMG/ClusterConfig.pm b/src/PMG/ClusterConfig.pm index 491fede..e469ea9 100644 --- a/src/PMG/ClusterConfig.pm +++ b/src/PMG/ClusterConfig.pm @@ -195,6 +195,7 @@ sub read_cluster_conf { $names_hash->{$d->{name}} = 1; $d->{cid} = $cid; + $d->{fingerprint} = uc($d->{fingerprint}); $maxcid = $cid > $maxcid ? $cid : $maxcid; $maxcid = $d->{maxcid} if defined($d->{maxcid}) && $d->{maxcid} > $maxcid; $cinfo->{master} = $d if $d->{type} eq 'master'; ``` I tested: * installing this on a cluster-node where I manually changed the fingerprint to lower-case in /etc/pmg/cluster.conf * creating a cluster on the cli - but pasting the fingerprint-option in lower-case * changing the apicert (`pmgconfig apicert --force 1`), restarting pmgproxy and running `pmgcm update-fingerprints`) I also would rather not reuse the description of a standard-option for a slightly different copy of that option. > > Signed-off-by: Maximiliano Sandoval > --- > > Differences from v2: > - Use the same docstring as in pve-common > - Add regex pattern into the same patch > > src/PMG/API2/Cluster.pm | 2 +- > src/PMG/CLI/pmgcm.pm | 2 +- > src/PMG/ClusterConfig.pm | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/src/PMG/API2/Cluster.pm b/src/PMG/API2/Cluster.pm > index 84dafabb..6d776548 100644 > --- a/src/PMG/API2/Cluster.pm > +++ b/src/PMG/API2/Cluster.pm > @@ -409,7 +409,7 @@ __PACKAGE__->register_method({ > type => 'string', format => 'ip', > }, > fingerprint => { > - description => "SSL certificate fingerprint.", > + description => "Certificate SHA 256 fingerprint.", > type => 'string', > pattern => '^(:?[A-Z0-9][A-Z0-9]:){31}[A-Z0-9][A-Z0-9]$', > }, > diff --git a/src/PMG/CLI/pmgcm.pm b/src/PMG/CLI/pmgcm.pm > index ecf9cc76..b4601de4 100644 > --- a/src/PMG/CLI/pmgcm.pm > +++ b/src/PMG/CLI/pmgcm.pm > @@ -167,7 +167,7 @@ __PACKAGE__->register_method({ > type => 'string', format => 'ip', > }, > fingerprint => { > - description => "SSL certificate fingerprint.", > + description => "Certificate SHA 256 fingerprint.", > type => 'string', > pattern => '^(:?[A-Z0-9][A-Z0-9]:){31}[A-Z0-9][A-Z0-9]$', > optional => 1, > diff --git a/src/PMG/ClusterConfig.pm b/src/PMG/ClusterConfig.pm > index c52508dc..ad4acd05 100644 > --- a/src/PMG/ClusterConfig.pm > +++ b/src/PMG/ClusterConfig.pm > @@ -73,7 +73,7 @@ sub properties { > pattern => valid_ssh_pubkey_regex(), > }, > fingerprint => { > - description => "SSL certificate fingerprint.", > + description => "Certificate SHA 256 fingerprint.", > type => 'string', > pattern => '^(:?[A-Z0-9][A-Z0-9]:){31}[A-Z0-9][A-Z0-9]$', > }, _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel