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 25760686D8 for ; Thu, 9 Sep 2021 15:48:58 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1C5A59480 for ; Thu, 9 Sep 2021 15:48:28 +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 C1F509415 for ; Thu, 9 Sep 2021 15:48:20 +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 9309844658 for ; Thu, 9 Sep 2021 15:48:20 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 9 Sep 2021 15:48:19 +0200 Message-Id: <20210909134819.2082605-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909134819.2082605-1-d.csapak@proxmox.com> References: <20210909134819.2082605-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.421 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: [pbs-devel] [PATCH proxmox-backup 5/5] api2: nodes: add missing node list api call X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Sep 2021 13:48:58 -0000 to have an api call for api path traversal Signed-off-by: Dominik Csapak --- 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 { + 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