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 B3AAC7BE55 for ; Wed, 13 Jul 2022 16:36:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AB7CC498B for ; Wed, 13 Jul 2022 16:36:43 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 13 Jul 2022 16:36:42 +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 E177E42147 for ; Wed, 13 Jul 2022 16:36:41 +0200 (CEST) From: Stefan Sterz To: pbs-devel@lists.proxmox.com Date: Wed, 13 Jul 2022 16:36:29 +0200 Message-Id: <20220713143629.459837-1-s.sterz@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.049 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 - Subject: [pbs-devel] [PATCH proxmox-backup] fix: api2: make tasks endpoint work with new prune job worker type 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, 13 Jul 2022 14:36:43 -0000 when prune jobs were refactored, their worker type was changed from "prune" to "prunejob" this broke `check_job_store` and `check_job_privs` as reported in the forum: https://forum.proxmox.com/threads/problem-with-apirequest-on-pbs-2-2-3.112131/#post-483835 Signed-off-by: Stefan Sterz --- afaict: we can't just remove the "prune" branches here, because there are tasks that will still use this worker id. e.g. prune tasks created by the `POST /api2/json/admin/datastore/{store}/prune-datastore` endpoint src/api2/node/tasks.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api2/node/tasks.rs b/src/api2/node/tasks.rs index 592e927d..cbd0894e 100644 --- a/src/api2/node/tasks.rs +++ b/src/api2/node/tasks.rs @@ -64,7 +64,7 @@ fn check_job_privs(auth_id: &Authid, user_info: &CachedUserInfo, upid: &UPID) -> true, ) } - ("prune", Some(workerid)) => { + ("prune", Some(workerid)) | ("prunejob", Some(workerid)) => { let mut acl_path = vec!["datastore"]; acl_path.extend(workerid.split(':')); let acl_path = match acl_path.len() { @@ -103,6 +103,7 @@ fn check_job_store(upid: &UPID, store: &str) -> bool { } } ("prune", Some(workerid)) + | ("prunejob", Some(workerid)) | ("backup", Some(workerid)) | ("garbage_collection", Some(workerid)) => { return workerid == store || workerid.starts_with(&format!("{}:", store)); -- 2.30.2