From 09989d99634abbb12a81a7f32b8e0354ce1a31d1 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 3 May 2021 11:39:56 +0200 Subject: [PATCH] add node/{node}/config api path Signed-off-by: Wolfgang Bumiller --- src/api2/node.rs | 2 ++ src/api2/node/config.rs | 80 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 src/api2/node/config.rs diff --git a/src/api2/node.rs b/src/api2/node.rs index ebb51aaf..75271cd5 100644 --- a/src/api2/node.rs +++ b/src/api2/node.rs @@ -28,6 +28,7 @@ use crate::tools::ticket::{self, Empty, Ticket}; pub mod apt; pub mod certificates; +pub mod config; pub mod disks; pub mod dns; pub mod network; @@ -316,6 +317,7 @@ fn upgrade_to_websocket( pub const SUBDIRS: SubdirMap = &[ ("apt", &apt::ROUTER), ("certificates", &certificates::ROUTER), + ("config", &config::ROUTER), ("disks", &disks::ROUTER), ("dns", &dns::ROUTER), ("journal", &journal::ROUTER), diff --git a/src/api2/node/config.rs b/src/api2/node/config.rs new file mode 100644 index 00000000..fd997062 --- /dev/null +++ b/src/api2/node/config.rs @@ -0,0 +1,80 @@ +use anyhow::Error; +use serde_json::Value; + +use proxmox::api::schema::Updatable; +use proxmox::api::{api, Permission, Router, RpcEnvironment}; + +use crate::api2::types::NODE_SCHEMA; +use crate::config::acl::PRIV_SYS_MODIFY; +use crate::config::node::NodeConfigUpdater; + +pub const ROUTER: Router = Router::new() + .get(&API_METHOD_GET_NODE_CONFIG) + .put(&API_METHOD_UPDATE_NODE_CONFIG); + +#[api( + input: { + properties: { + node: { schema: NODE_SCHEMA }, + }, + }, + access: { + permission: &Permission::Privilege(&["system"], PRIV_SYS_MODIFY, false), + }, +)] +/// Create a new changer device. +pub fn get_node_config(mut rpcenv: &mut dyn RpcEnvironment) -> Result { + let (config, digest) = crate::config::node::config()?; + rpcenv["digest"] = proxmox::tools::digest_to_hex(&digest).into(); + Ok(serde_json::to_value(config)?) +} + +#[api( + input: { + properties: { + node: { schema: NODE_SCHEMA }, + digest: { + description: "Digest to protect against concurrent updates", + optional: true, + }, + updater: { + type: NodeConfigUpdater, + flatten: true, + }, + delete: { + description: "Options to remove from the configuration", + optional: true, + }, + }, + }, + access: { + permission: &Permission::Privilege(&["system"], PRIV_SYS_MODIFY, false), + }, + protected: true, +)] +/// Create a new changer device. +pub fn update_node_config( + updater: NodeConfigUpdater, + delete: Option, + digest: Option, +) -> Result<(), Error> { + let _lock = crate::config::node::lock()?; + let (mut config, expected_digest) = crate::config::node::config()?; + if let Some(digest) = digest { + // FIXME: GUI doesn't handle our non-inlined digest part here properly... + if !digest.is_empty() { + let digest = proxmox::tools::hex_to_digest(&digest)?; + crate::tools::detect_modified_configuration_file(&digest, &expected_digest)?; + } + } + + let delete: Vec<&str> = delete + .as_deref() + .unwrap_or("") + .split(&[' ', ',', ';', '\0'][..]) + .collect(); + + config.update_from(updater, &delete)?; + + crate::config::node::save_config(&config) +}