all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Elias Huhsovitz <e.huhsovitz@proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: Elias Huhsovitz <e.huhsovitz@proxmox.com>
Subject: [PATCH manager 2/3] fix #7803: api: nodes: resolve 'localhost' alias in node-specific endpoints
Date: Tue, 14 Jul 2026 16:50:26 +0200	[thread overview]
Message-ID: <20260714145027.53038-3-e.huhsovitz@proxmox.com> (raw)
In-Reply-To: <20260714145027.53038-1-e.huhsovitz@proxmox.com>

When 'localhost' is used as the node parameter, the API proxy correctly
routes the request to the local node. However, several endpoint handlers
used the literal string 'localhost' to construct file paths or validate
cluster nodes, resulting in empty data or validation errors.

Use the new PVE::INotify::resolve_nodename() helper to correctly resolve
the alias before accessing the cluster filesystem or checking node
existence. This fixes the following endpoints:
- NodeConfig (get_config, set_options)
- Certificates (info, upload_custom_cert, remove_custom_cert)
- Nodes (rrd, rrddata, migrateall)

Signed-off-by: Elias Huhsovitz <e.huhsovitz@proxmox.com>
---
 PVE/API2/Certificates.pm |  8 +++++---
 PVE/API2/NodeConfig.pm   |  6 ++++--
 PVE/API2/Nodes.pm        | 13 ++++++-------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/PVE/API2/Certificates.pm b/PVE/API2/Certificates.pm
index de8762c5..d567939c 100644
--- a/PVE/API2/Certificates.pm
+++ b/PVE/API2/Certificates.pm
@@ -7,6 +7,7 @@ use PVE::API2::ACME;
 use PVE::Certificate;
 use PVE::CertHelpers;
 use PVE::Exception qw(raise_param_exc);
+use PVE::INotify;
 use PVE::JSONSchema qw(get_standard_option);
 use PVE::Tools qw(extract_param file_get_contents file_set_contents);
 
@@ -66,7 +67,8 @@ __PACKAGE__->register_method({
     code => sub {
         my ($param) = @_;
 
-        my $node_path = "/etc/pve/nodes/$param->{node}";
+        my $node = PVE::INotify::resolve_nodename($param->{node});
+        my $node_path = "/etc/pve/nodes/$node";
 
         my $res = [];
         my $cert_paths = [
@@ -125,7 +127,7 @@ __PACKAGE__->register_method({
     code => sub {
         my ($param) = @_;
 
-        my $node = extract_param($param, 'node');
+        my $node = PVE::INotify::resolve_nodename(extract_param($param, 'node'));
         my $cert_prefix = PVE::CertHelpers::cert_path_prefix($node);
 
         my $certs = extract_param($param, 'certificates');
@@ -188,7 +190,7 @@ __PACKAGE__->register_method({
     code => sub {
         my ($param) = @_;
 
-        my $node = extract_param($param, 'node');
+        my $node = PVE::INotify::resolve_nodename(extract_param($param, 'node'));
         my $cert_prefix = PVE::CertHelpers::cert_path_prefix($node);
 
         my $code = sub {
diff --git a/PVE/API2/NodeConfig.pm b/PVE/API2/NodeConfig.pm
index cc726dac..cad81c3e 100644
--- a/PVE/API2/NodeConfig.pm
+++ b/PVE/API2/NodeConfig.pm
@@ -3,6 +3,7 @@ package PVE::API2::NodeConfig;
 use strict;
 use warnings;
 
+use PVE::INotify;
 use PVE::JSONSchema qw(get_standard_option);
 use PVE::NodeConfig;
 use PVE::Tools qw(extract_param);
@@ -61,7 +62,8 @@ __PACKAGE__->register_method({
     code => sub {
         my ($param) = @_;
 
-        my $config = PVE::NodeConfig::load_config($param->{node});
+        my $node = PVE::INotify::resolve_nodename($param->{node});
+        my $config = PVE::NodeConfig::load_config($node);
 
         if (defined(my $prop = $param->{property})) {
             return {} if !exists $config->{$prop};
@@ -91,7 +93,7 @@ __PACKAGE__->register_method({
         my ($param) = @_;
 
         my $delete = extract_param($param, 'delete');
-        my $node = extract_param($param, 'node');
+        my $node = PVE::INotify::resolve_nodename(extract_param($param, 'node'));
         my $digest = extract_param($param, 'digest');
 
         my $code = sub {
diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm
index dfe3b4cf..90ce3c10 100644
--- a/PVE/API2/Nodes.pm
+++ b/PVE/API2/Nodes.pm
@@ -830,9 +830,9 @@ __PACKAGE__->register_method({
     },
     code => sub {
         my ($param) = @_;
-
+        my $node = PVE::INotify::resolve_nodename($param->{node});
         return PVE::RRD::create_rrd_graph(
-            "pve-node-9.0/$param->{node}", $param->{timeframe}, $param->{ds}, $param->{cf},
+            "pve-node-9.0/$node", $param->{timeframe}, $param->{ds}, $param->{cf},
         );
 
     },
@@ -873,9 +873,9 @@ __PACKAGE__->register_method({
     },
     code => sub {
         my ($param) = @_;
-
+        my $node = PVE::INotify::resolve_nodename($param->{node});
         return PVE::RRD::create_rrd_data(
-            "pve-node-9.0/$param->{node}", $param->{timeframe}, $param->{cf},
+            "pve-node-9.0/$node", $param->{timeframe}, $param->{cf},
         );
     },
 });
@@ -2718,10 +2718,9 @@ __PACKAGE__->register_method({
             }
         }
 
-        my $nodename = $param->{node};
-        $nodename = PVE::INotify::nodename() if $nodename eq 'localhost';
+        my $nodename = PVE::INotify::resolve_nodename($param->{node});
 
-        my $target = $param->{target};
+        my $target = PVE::INotify::resolve_nodename($param->{target});
         my $with_local_disks = $param->{'with-local-disks'};
         raise_param_exc({ target => "target is local node." }) if $target eq $nodename;
 
-- 
2.47.3





  parent reply	other threads:[~2026-07-14 14:50 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-14 14:50 [PATCH common/manager 0/3] fix #7803: 'localhost' alias handling in node-specific endpoints Elias Huhsovitz
2026-07-14 14:50 ` [PATCH common 1/3] inotify: add helper to resolve 'localhost' node alias Elias Huhsovitz
2026-07-14 14:50 ` Elias Huhsovitz [this message]
2026-07-14 14:57   ` [PATCH manager 2/3] fix #7803: api: nodes: resolve 'localhost' alias in node-specific endpoints Shannon Sterz
2026-07-14 14:50 ` [PATCH manager 3/3] api: nodes: use resolve_nodename helper for bulk operation Elias Huhsovitz

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=20260714145027.53038-3-e.huhsovitz@proxmox.com \
    --to=e.huhsovitz@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 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.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal