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 2E78F9313D for ; Tue, 3 Jan 2023 15:23:54 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 04876BDE8 for ; Tue, 3 Jan 2023 15:23:24 +0100 (CET) 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 for ; Tue, 3 Jan 2023 15:23:22 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2EE38442EB for ; Tue, 3 Jan 2023 15:23:22 +0100 (CET) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Tue, 3 Jan 2023 15:23:00 +0100 Message-Id: <20230103142308.656240-10-l.wagner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230103142308.656240-1-l.wagner@proxmox.com> References: <20230103142308.656240-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.166 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [domains.rs, proxmox-backup-manager.rs, ldap.rs, mod.rs] Subject: [pbs-devel] [PATCH proxmox-backup 09/17] manager: add LDAP commands 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: Tue, 03 Jan 2023 14:23:54 -0000 Adds commands for managing LDAP realms to `proxmox-backup-manager`. Signed-off-by: Lukas Wagner --- pbs-config/src/domains.rs | 12 +++- src/bin/proxmox-backup-manager.rs | 1 + src/bin/proxmox_backup_manager/ldap.rs | 99 ++++++++++++++++++++++++++ src/bin/proxmox_backup_manager/mod.rs | 2 + 4 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 src/bin/proxmox_backup_manager/ldap.rs diff --git a/pbs-config/src/domains.rs b/pbs-config/src/domains.rs index 6cef3ec5..fda87259 100644 --- a/pbs-config/src/domains.rs +++ b/pbs-config/src/domains.rs @@ -72,13 +72,13 @@ pub fn complete_realm_name(_arg: &str, _param: &HashMap) -> Vec< } } -pub fn complete_openid_realm_name(_arg: &str, _param: &HashMap) -> Vec { +fn complete_realm_of_type(realm_type: &str) -> Vec { match config() { Ok((data, _digest)) => data .sections .iter() .filter_map(|(id, (t, _))| { - if t == "openid" { + if t == realm_type { Some(id.to_string()) } else { None @@ -88,3 +88,11 @@ pub fn complete_openid_realm_name(_arg: &str, _param: &HashMap) Err(_) => Vec::new(), } } + +pub fn complete_openid_realm_name(_arg: &str, _param: &HashMap) -> Vec { + complete_realm_of_type("openid") +} + +pub fn complete_ldap_realm_name(_arg: &str, _param: &HashMap) -> Vec { + complete_realm_of_type("ldap") +} diff --git a/src/bin/proxmox-backup-manager.rs b/src/bin/proxmox-backup-manager.rs index 06330c78..c97d06d8 100644 --- a/src/bin/proxmox-backup-manager.rs +++ b/src/bin/proxmox-backup-manager.rs @@ -427,6 +427,7 @@ async fn run() -> Result<(), Error> { .insert("datastore", datastore_commands()) .insert("disk", disk_commands()) .insert("dns", dns_commands()) + .insert("ldap", ldap_commands()) .insert("network", network_commands()) .insert("node", node_commands()) .insert("user", user_commands()) diff --git a/src/bin/proxmox_backup_manager/ldap.rs b/src/bin/proxmox_backup_manager/ldap.rs new file mode 100644 index 00000000..4020caee --- /dev/null +++ b/src/bin/proxmox_backup_manager/ldap.rs @@ -0,0 +1,99 @@ +use anyhow::Error; +use serde_json::Value; + +use proxmox_router::{cli::*, ApiHandler, RpcEnvironment}; +use proxmox_schema::api; + +use pbs_api_types::REALM_ID_SCHEMA; + +use proxmox_backup::api2; + +#[api( + input: { + properties: { + "output-format": { + schema: OUTPUT_FORMAT, + optional: true, + }, + } + } +)] +/// List configured LDAP realms +fn list_ldap_realms(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result { + let output_format = get_output_format(¶m); + + let info = &api2::config::access::ldap::API_METHOD_LIST_LDAP_REALMS; + let mut data = match info.handler { + ApiHandler::Sync(handler) => (handler)(param, info, rpcenv)?, + _ => unreachable!(), + }; + + let options = default_table_format_options() + .column(ColumnConfig::new("realm")) + .column(ColumnConfig::new("server1")) + .column(ColumnConfig::new("comment")); + + format_and_print_result_full(&mut data, &info.returns, &output_format, &options); + + Ok(Value::Null) +} +#[api( + input: { + properties: { + realm: { + schema: REALM_ID_SCHEMA, + }, + "output-format": { + schema: OUTPUT_FORMAT, + optional: true, + }, + } + } +)] + +/// Show LDAP realm configuration +fn show_ldap_realm(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result { + let output_format = get_output_format(¶m); + + let info = &api2::config::access::ldap::API_METHOD_READ_LDAP_REALM; + let mut data = match info.handler { + ApiHandler::Sync(handler) => (handler)(param, info, rpcenv)?, + _ => unreachable!(), + }; + + let options = default_table_format_options(); + format_and_print_result_full(&mut data, &info.returns, &output_format, &options); + + Ok(Value::Null) +} + +pub fn ldap_commands() -> CommandLineInterface { + let cmd_def = CliCommandMap::new() + .insert("list", CliCommand::new(&API_METHOD_LIST_LDAP_REALMS)) + .insert( + "show", + CliCommand::new(&API_METHOD_SHOW_LDAP_REALM) + .arg_param(&["realm"]) + .completion_cb("realm", pbs_config::domains::complete_ldap_realm_name), + ) + .insert( + "create", + CliCommand::new(&api2::config::access::ldap::API_METHOD_CREATE_LDAP_REALM) + .arg_param(&["realm"]) + .completion_cb("realm", pbs_config::domains::complete_ldap_realm_name), + ) + .insert( + "update", + CliCommand::new(&api2::config::access::ldap::API_METHOD_UPDATE_LDAP_REALM) + .arg_param(&["realm"]) + .completion_cb("realm", pbs_config::domains::complete_ldap_realm_name), + ) + .insert( + "delete", + CliCommand::new(&api2::config::access::ldap::API_METHOD_DELETE_LDAP_REALM) + .arg_param(&["realm"]) + .completion_cb("realm", pbs_config::domains::complete_ldap_realm_name), + ); + + cmd_def.into() +} diff --git a/src/bin/proxmox_backup_manager/mod.rs b/src/bin/proxmox_backup_manager/mod.rs index 9788f637..8a1c140c 100644 --- a/src/bin/proxmox_backup_manager/mod.rs +++ b/src/bin/proxmox_backup_manager/mod.rs @@ -8,6 +8,8 @@ mod datastore; pub use datastore::*; mod dns; pub use dns::*; +mod ldap; +pub use ldap::*; mod network; pub use network::*; mod prune; -- 2.30.2