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 7411D7A8E5 for ; Tue, 5 Jul 2022 15:09:17 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1FA812F50D for ; Tue, 5 Jul 2022 15:08:57 +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 for ; Tue, 5 Jul 2022 15:08:53 +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 030B043DA2 for ; Tue, 5 Jul 2022 15:08:50 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 5 Jul 2022 13:08:31 +0000 Message-Id: <20220705130834.14285-26-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220705130834.14285-1-h.laimer@proxmox.com> References: <20220705130834.14285-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.042 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mod.rs] Subject: [pbs-devel] [PATCH proxmox-backup 23/26] api2: admin: add mount-device endpoint that just takes an UUID 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, 05 Jul 2022 13:09:17 -0000 ... needed for auto mounting a removable device when it is plugged in Signed-off-by: Hannes Laimer --- src/api2/admin/mod.rs | 4 ++ src/api2/admin/removable_device.rs | 70 +++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/src/api2/admin/mod.rs b/src/api2/admin/mod.rs index 00ff9131..09da6f2f 100644 --- a/src/api2/admin/mod.rs +++ b/src/api2/admin/mod.rs @@ -20,6 +20,10 @@ const SUBDIRS: SubdirMap = &sorted!([ ("prune", &prune::ROUTER), ("sync", &sync::ROUTER), ("removable-device", &removable_device::ROUTER), + ( + "mount-device", + &Router::new().post(&removable_device::API_METHOD_MOUNT_UUID_DEVICE), + ), ("traffic-control", &traffic_control::ROUTER), ("verify", &verify::ROUTER), ]); diff --git a/src/api2/admin/removable_device.rs b/src/api2/admin/removable_device.rs index 53b92ba7..54aee88f 100644 --- a/src/api2/admin/removable_device.rs +++ b/src/api2/admin/removable_device.rs @@ -5,14 +5,14 @@ use proxmox_router::{ list_subdirs_api_method, ApiMethod, Permission, Router, RpcEnvironment, RpcEnvironmentType, SubdirMap, }; -use proxmox_schema::api; +use proxmox_schema::{api, param_bail}; use proxmox_section_config::SectionConfigData; use proxmox_sys::{sortable, task_log, WorkerTaskContext}; use serde_json::Value; use pbs_api_types::{ Authid, DataStoreConfig, RemovableDeviceConfig, RemovableDeviceStatus, DATASTORE_SCHEMA, - DEVICE_NAME_SCHEMA, PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_MODIFY, + DEVICE_NAME_SCHEMA, DEVICE_UUID_SCHEMA, PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_MODIFY, }; use pbs_config::{datastore, removable_device, BackupLockGuard, CachedUserInfo}; use pbs_datastore::ChunkStore; @@ -202,6 +202,72 @@ pub fn mount_removable_device( Ok(upid) } +#[api( + protected: true, + input: { + properties: { + uuid: { + schema: DEVICE_UUID_SCHEMA, + } + } + }, + access: { + permission: &Permission::Anybody, + description: "Requires Datastore.Modify on removable devices's datastore.", + }, +)] +/// Mounts removable device by uuid. +pub fn mount_uuid_device( + uuid: String, + _info: &ApiMethod, + rpcenv: &mut dyn RpcEnvironment, +) -> Result { + let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; + let user_info = CachedUserInfo::new()?; + + let lock = pbs_config::datastore::lock_config()?; + let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI; + + let (section_config, _digest) = removable_device::config()?; + if let Some(device_config) = section_config + .convert_to_typed_array::("removable-device")? + .into_iter() + .find(|c| c.uuid.eq(&uuid)) + { + user_info.check_privs( + &auth_id, + &device_config.acl_path(), + PRIV_DATASTORE_MODIFY, + true, + )?; + + let (datastore_section_config, _digest) = datastore::config()?; + let store: DataStoreConfig = + datastore_section_config.lookup("datastore", &device_config.store)?; + + let upid = WorkerTask::new_thread( + "mount-device", + Some(store.name.to_string()), + auth_id.to_string(), + to_stdout, + move |worker| { + do_mount_removable( + lock, + section_config, + datastore_section_config, + store, + device_config, + Some(&worker), + ) + }, + )?; + + Ok(upid) + } else { + param_bail!("uuid", "no removable device with uuid '{}' exists", uuid); + } +} + #[sortable] const DEVICE_INFO_SUBDIRS: SubdirMap = &[( "mount", -- 2.30.2