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 24FC36A3B2 for ; Thu, 16 Sep 2021 12:05:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1B91723ACC for ; Thu, 16 Sep 2021 12:04:53 +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 2D7D223AC1 for ; Thu, 16 Sep 2021 12:04:52 +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 058C7448DC for ; Thu, 16 Sep 2021 12:04:52 +0200 (CEST) Date: Thu, 16 Sep 2021 12:04:45 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20210906105755.2651203-1-d.csapak@proxmox.com> <20210906105755.2651203-9-d.csapak@proxmox.com> In-Reply-To: <<<20210906105755.2651203-9-d.csapak@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1631785922.5n9qsuqvpr.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.366 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 08/12] api2/admin/datastore: add get/set_protection 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, 16 Sep 2021 10:05:23 -0000 On September 6, 2021 12:57 pm, Dominik Csapak wrote: > for gettin/setting the protected flag for snapshots (akin to notes) >=20 > Signed-off-by: Dominik Csapak > --- > src/api2/admin/datastore.rs | 101 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 101 insertions(+) >=20 > diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs > index f88fd105..572c65a9 100644 > --- a/src/api2/admin/datastore.rs > +++ b/src/api2/admin/datastore.rs > @@ -1751,6 +1751,101 @@ pub fn set_notes( > Ok(()) > } > =20 > +#[api( > + input: { > + properties: { > + store: { > + schema: DATASTORE_SCHEMA, > + }, > + "backup-type": { > + schema: BACKUP_TYPE_SCHEMA, > + }, > + "backup-id": { > + schema: BACKUP_ID_SCHEMA, > + }, > + "backup-time": { > + schema: BACKUP_TIME_SCHEMA, > + }, > + }, > + }, > + access: { > + permission: &Permission::Privilege(&["datastore", "{store}"], PR= IV_DATASTORE_AUDIT | PRIV_DATASTORE_BACKUP, true), > + }, > +)] > +/// Query protection for a specific backup > +pub fn get_protection( > + store: String, > + backup_type: String, > + backup_id: String, > + backup_time: i64, > + rpcenv: &mut dyn RpcEnvironment, > +) -> Result { > + let datastore =3D DataStore::lookup_datastore(&store)?; > + > + let auth_id: Authid =3D rpcenv.get_auth_id().unwrap().parse()?; > + let backup_dir =3D BackupDir::new(backup_type, backup_id, backup_tim= e)?; > + > + check_priv_or_backup_owner(&datastore, backup_dir.group(), &auth_id,= PRIV_DATASTORE_AUDIT)?; > + > + let protected_path =3D backup_dir.protected_file(datastore.base_path= ()); > + > + Ok(protected_path.exists()) > +} > + > +#[api( > + input: { > + properties: { > + store: { > + schema: DATASTORE_SCHEMA, > + }, > + "backup-type": { > + schema: BACKUP_TYPE_SCHEMA, > + }, > + "backup-id": { > + schema: BACKUP_ID_SCHEMA, > + }, > + "backup-time": { > + schema: BACKUP_TIME_SCHEMA, > + }, > + protected: { > + description: "Enable/disable protection.", protected is already part of the CLI schema and API path, maybe simply=20 'value' or 'enabled'? > + }, > + }, > + }, > + access: { > + permission: &Permission::Privilege(&["datastore", "{store}"], > + PRIV_DATASTORE_MODIFY | PRIV_= DATASTORE_BACKUP, > + true), > + }, > +)] > +/// En- or disable protection for a specific backup > +pub fn set_protection( > + store: String, > + backup_type: String, > + backup_id: String, > + backup_time: i64, > + protected: bool, > + rpcenv: &mut dyn RpcEnvironment, > +) -> Result<(), Error> { > + let datastore =3D DataStore::lookup_datastore(&store)?; > + > + let auth_id: Authid =3D rpcenv.get_auth_id().unwrap().parse()?; > + let backup_dir =3D BackupDir::new(backup_type, backup_id, backup_tim= e)?; > + > + check_priv_or_backup_owner(&datastore, backup_dir.group(), &auth_id,= PRIV_DATASTORE_MODIFY)?; > + > + let protected_path =3D backup_dir.protected_file(datastore.base_path= ()); > + if protected { > + std::fs::File::create(protected_path) > + .map_err(|err| format_err!("could not create protection file= : {}", err))?; > + } else { > + std::fs::remove_file(protected_path) > + .map_err(|err| format_err!("could not remove protection file= : {}", err))?; > + } this is modifying a file related to the snapdir, shouldn't this have=20 some sort of locking? to protect against other modifications of the=20 protection flag, but also other operations that might make decisions=20 based on the flag? haven't fully thought it through, but it seems to be=20 there might be something missing here.. e.g., setting/removing notes is guarded by the manifest update=20 mechanism, which does the locking. > + > + Ok(()) > +} > + > #[api( > input: { > properties: { > @@ -1899,6 +1994,12 @@ const DATASTORE_INFO_SUBDIRS: SubdirMap =3D &[ > .get(&API_METHOD_GET_NOTES) > .put(&API_METHOD_SET_NOTES) > ), > + ( > + "protected", > + &Router::new() > + .get(&API_METHOD_GET_PROTECTION) > + .put(&API_METHOD_SET_PROTECTION) > + ), > ( > "prune", > &Router::new() > --=20 > 2.30.2 >=20 >=20 >=20 > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel >=20 >=20 >=20