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 0F0BE767F5 for ; Fri, 16 Jul 2021 10:53:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 920D3E232 for ; Fri, 16 Jul 2021 10:53:32 +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 B524DE1A9 for ; Fri, 16 Jul 2021 10:53:29 +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 840D5420A7 for ; Fri, 16 Jul 2021 10:53:29 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 16 Jul 2021 10:53:22 +0200 Message-Id: <20210716085328.3731574-6-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210716085328.3731574-1-d.csapak@proxmox.com> References: <20210716085328.3731574-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.584 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: [pbs-devel] [PATCH proxmox-backup 05/11] backup/datastore: refactor check_backup_owner there 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: Fri, 16 Jul 2021 08:53:34 -0000 and add a 'owns_backup' convenience function Signed-off-by: Dominik Csapak --- src/api2/admin/datastore.rs | 12 ------------ src/backup/datastore.rs | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 0bf6a86b..79ab97e7 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -74,18 +74,6 @@ fn check_priv_or_backup_owner( Ok(()) } -fn check_backup_owner( - owner: &Authid, - auth_id: &Authid, -) -> Result<(), Error> { - let correct_owner = owner == auth_id - || (owner.is_token() && &Authid::from(owner.user().clone()) == auth_id); - if !correct_owner { - bail!("backup owner check failed ({} != {})", auth_id, owner); - } - Ok(()) -} - fn read_backup_index( store: &DataStore, backup_dir: &BackupDir, diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs index d47c412b..29700846 100644 --- a/src/backup/datastore.rs +++ b/src/backup/datastore.rs @@ -37,6 +37,20 @@ lazy_static! { static ref DATASTORE_MAP: Mutex>> = Mutex::new(HashMap::new()); } +/// checks if auth_id is owner, or, if owner is a token, if +/// auth_id is the user of the token +pub fn check_backup_owner( + owner: &Authid, + auth_id: &Authid, +) -> Result<(), Error> { + let correct_owner = owner == auth_id + || (owner.is_token() && &Authid::from(owner.user().clone()) == auth_id); + if !correct_owner { + bail!("backup owner check failed ({} != {})", auth_id, owner); + } + Ok(()) +} + /// Datastore Management /// /// A Datastore can store severals backups, and provides the @@ -338,6 +352,12 @@ impl DataStore { Ok(owner.trim_end().parse()?) // remove trailing newline } + pub fn owns_backup(&self, backup_group: &BackupGroup, auth_id: &Authid) -> Result { + let owner = self.get_owner(backup_group)?; + + Ok(check_backup_owner(owner, auth_id).is_ok()) + } + /// Set the backup owner. pub fn set_owner( &self, -- 2.30.2