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 07C07934FD for ; Wed, 4 Jan 2023 14:56:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DC6EE1FBB2 for ; Wed, 4 Jan 2023 14:56:11 +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 ; Wed, 4 Jan 2023 14:56:11 +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 D92A042EF8 for ; Wed, 4 Jan 2023 14:56:10 +0100 (CET) Date: Wed, 4 Jan 2023 14:56:09 +0100 From: Wolfgang Bumiller To: Lukas Wagner Cc: pbs-devel@lists.proxmox.com Message-ID: <20230104135609.4cje6xvnwityb2u7@casey.proxmox.com> References: <20230103142308.656240-1-l.wagner@proxmox.com> <20230103142308.656240-11-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230103142308.656240-11-l.wagner@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.217 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: Re: [pbs-devel] [PATCH proxmox-backup 10/17] manager: add sync command for LDAP realms 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: Wed, 04 Jan 2023 13:56:12 -0000 On Tue, Jan 03, 2023 at 03:23:01PM +0100, Lukas Wagner wrote: > Signed-off-by: Lukas Wagner > --- > src/bin/proxmox_backup_manager/ldap.rs | 83 +++++++++++++++++++++++++- > 1 file changed, 81 insertions(+), 2 deletions(-) > > diff --git a/src/bin/proxmox_backup_manager/ldap.rs b/src/bin/proxmox_backup_manager/ldap.rs > index 4020caee..407c675d 100644 > --- a/src/bin/proxmox_backup_manager/ldap.rs > +++ b/src/bin/proxmox_backup_manager/ldap.rs > @@ -1,10 +1,15 @@ > use anyhow::Error; > +use futures::FutureExt; > use serde_json::Value; > +use tokio::signal::unix::{signal, SignalKind}; > > -use proxmox_router::{cli::*, ApiHandler, RpcEnvironment}; > +use proxmox_router::{cli::*, ApiHandler, Permission, RpcEnvironment}; > use proxmox_schema::api; > > -use pbs_api_types::REALM_ID_SCHEMA; > +use pbs_api_types::{ > + Realm, PRIV_PERMISSIONS_MODIFY, PROXMOX_UPID_REGEX, REALM_ID_SCHEMA, REMOVE_VANISHED_SCHEMA, > + UPID, > +}; > > use proxmox_backup::api2; > > @@ -67,6 +72,74 @@ fn show_ldap_realm(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result Ok(Value::Null) > } > > +#[api( > + protected: true, > + input: { > + properties: { > + realm: { > + type: Realm, > + }, > + "dry-run": { > + type: bool, > + description: "If set, do not create/delete anything", > + default: false, > + optional: true, > + }, > + "remove-vanished": { > + optional: true, > + schema: REMOVE_VANISHED_SCHEMA, > + }, > + "enable-new": { > + description: "Enable newly synced users immediately", > + optional: true, > + type: bool, > + } > + }, > + }, > + access: { > + permission: &Permission::Privilege(&["access", "users"], PRIV_PERMISSIONS_MODIFY, false), > + }, > +)] > +/// List configured LDAP realms > +async fn sync_ldap_realm(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result { > + let info = &api2::access::domain::API_METHOD_SYNC_REALM; > + let data = match info.handler { > + ApiHandler::Sync(handler) => (handler)(param, info, rpcenv)?, > + _ => unreachable!(), > + }; > + > + if let Some(upid) = data.as_str() { > + if PROXMOX_UPID_REGEX.is_match(upid) { > + handle_worker(upid).await?; > + } > + } > + > + Ok(Value::Null) > +} > + > +// TODO: This was copied from proxmox_backup_debug/api.rs - is there a good place to > +// put this so we can use the same impl for both? I'd say proxmox_rest_server (in proxmox.git), it already pulls in tokio's `signal` feature, the schema's UPID type and contains the main components of this function anyway. > +async fn handle_worker(upid_str: &str) -> Result<(), Error> { > + let upid: UPID = upid_str.parse()?; > + let mut signal_stream = signal(SignalKind::interrupt())?; > + let abort_future = async move { > + while signal_stream.recv().await.is_some() { > + println!("got shutdown request (SIGINT)"); > + proxmox_rest_server::abort_local_worker(upid.clone()); > + } > + Ok::<_, Error>(()) > + }; > + > + let result_future = proxmox_rest_server::wait_for_local_worker(upid_str); > + > + futures::select! { > + result = result_future.fuse() => result?, > + abort = abort_future.fuse() => abort?, > + }; > + > + Ok(()) > +} > + > pub fn ldap_commands() -> CommandLineInterface { > let cmd_def = CliCommandMap::new() > .insert("list", CliCommand::new(&API_METHOD_LIST_LDAP_REALMS)) > @@ -93,6 +166,12 @@ pub fn ldap_commands() -> CommandLineInterface { > CliCommand::new(&api2::config::access::ldap::API_METHOD_DELETE_LDAP_REALM) > .arg_param(&["realm"]) > .completion_cb("realm", pbs_config::domains::complete_ldap_realm_name), > + ) > + .insert( > + "sync", > + CliCommand::new(&API_METHOD_SYNC_LDAP_REALM) > + .arg_param(&["realm"]) > + .completion_cb("realm", pbs_config::domains::complete_ldap_realm_name), > ); > > cmd_def.into() > -- > 2.30.2