all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 5/5] api2: nodes: add missing node list api call
Date: Thu,  9 Sep 2021 15:48:19 +0200	[thread overview]
Message-ID: <20210909134819.2082605-7-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210909134819.2082605-1-d.csapak@proxmox.com>

to have an api call for api path traversal

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/api2/mod.rs      |  4 +---
 src/api2/node/mod.rs | 12 +++++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/api2/mod.rs b/src/api2/mod.rs
index 132e2c2a..0ede4165 100644
--- a/src/api2/mod.rs
+++ b/src/api2/mod.rs
@@ -18,14 +18,12 @@ use proxmox::api::router::SubdirMap;
 use proxmox::api::Router;
 use proxmox::list_subdirs_api_method;
 
-const NODES_ROUTER: Router = Router::new().match_all("node", &node::ROUTER);
-
 const SUBDIRS: SubdirMap = &[
     ("access", &access::ROUTER),
     ("admin", &admin::ROUTER),
     ("backup", &backup::ROUTER),
     ("config", &config::ROUTER),
-    ("nodes", &NODES_ROUTER),
+    ("nodes", &node::ROUTER),
     ("ping", &ping::ROUTER),
     ("pull", &pull::ROUTER),
     ("reader", &reader::ROUTER),
diff --git a/src/api2/node/mod.rs b/src/api2/node/mod.rs
index f1a17934..194ec920 100644
--- a/src/api2/node/mod.rs
+++ b/src/api2/node/mod.rs
@@ -315,6 +315,12 @@ fn upgrade_to_websocket(
     .boxed()
 }
 
+#[api]
+/// List Nodes (only for compatiblity)
+fn list_nodes() -> Result<Value, Error> {
+    Ok(json!([ { "node": proxmox::tools::nodename().to_string() } ]))
+}
+
 pub const SUBDIRS: SubdirMap = &[
     ("apt", &apt::ROUTER),
     ("certificates", &certificates::ROUTER),
@@ -338,6 +344,10 @@ pub const SUBDIRS: SubdirMap = &[
     ),
 ];
 
-pub const ROUTER: Router = Router::new()
+pub const ITEM_ROUTER: Router = Router::new()
     .get(&list_subdirs_api_method!(SUBDIRS))
     .subdirs(SUBDIRS);
+
+pub const ROUTER: Router = Router::new()
+    .get(&API_METHOD_LIST_NODES)
+    .match_all("node", &ITEM_ROUTER);
-- 
2.30.2





  parent reply	other threads:[~2021-09-09 13:48 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-09 13:48 [pbs-devel] [PATCH proxmox/proxmox-backup] add 'pbs-shell' tool Dominik Csapak
2021-09-09 13:48 ` [pbs-devel] [PATCH proxmox 1/1] proxmox: generate_usage_str: don't require static lifetimes Dominik Csapak
2021-09-15  7:40   ` [pbs-devel] applied: " Thomas Lamprecht
2021-09-09 13:48 ` [pbs-devel] [PATCH proxmox-backup 1/5] add 'pbs-shell' utility Dominik Csapak
2021-09-09 13:48 ` [pbs-devel] [PATCH proxmox-backup 2/5] api2: add missing token list match_all property Dominik Csapak
2021-09-09 13:48 ` [pbs-devel] [PATCH proxmox-backup 3/5] api2: disks/directory: refactor BASE_MOUNT_DIR Dominik Csapak
2021-09-09 13:48 ` [pbs-devel] [PATCH proxmox-backup 4/5] api2: disks/directory: add 'name' property to directory mount listing Dominik Csapak
2021-09-09 13:48 ` Dominik Csapak [this message]
2021-09-15  9:44   ` [pbs-devel] applied: [PATCH proxmox-backup 5/5] api2: nodes: add missing node list api call Thomas Lamprecht
2021-09-13  9:36 ` [pbs-devel] [PATCH proxmox/proxmox-backup] add 'pbs-shell' tool Hannes Laimer
2021-09-13 10:38   ` Dominik Csapak
2021-09-15  5:25     ` 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=20210909134819.2082605-7-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pbs-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