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 27F277C1A9 for ; Thu, 14 Jul 2022 14:46:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1CB6F1D582 for ; Thu, 14 Jul 2022 14:46:13 +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 ; Thu, 14 Jul 2022 14:46:11 +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 3EDB24228B for ; Thu, 14 Jul 2022 14:46:11 +0200 (CEST) Date: Thu, 14 Jul 2022 14:46:04 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20220713143629.459837-1-s.sterz@proxmox.com> In-Reply-To: <20220713143629.459837-1-s.sterz@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1657802040.d358x68txc.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.169 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. [tasks.rs, proxmox.com] Subject: [pbs-devel] applied: [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: Thu, 14 Jul 2022 12:46:13 -0000 thanks! On July 13, 2022 4:36 pm, Stefan Sterz wrote: > when prune jobs were refactored, their worker type was changed from > "prune" to "prunejob" this broke `check_job_store` and > `check_job_privs` >=20 > as reported in the forum: https://forum.proxmox.com/threads/problem-with-= apirequest-on-pbs-2-2-3.112131/#post-483835 >=20 > 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`=20 > endpoint >=20 > src/api2/node/tasks.rs | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > 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: &Cached= UserInfo, upid: &UPID) -> > true, > ) > } > - ("prune", Some(workerid)) =3D> { > + ("prune", Some(workerid)) | ("prunejob", Some(workerid)) =3D> { > let mut acl_path =3D vec!["datastore"]; > acl_path.extend(workerid.split(':')); > let acl_path =3D 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)) =3D> { > return workerid =3D=3D store || workerid.starts_with(&format= !("{}:", store)); > --=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