From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pbs-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 6BB611FF18E for <inbox@lore.proxmox.com>; Fri, 4 Apr 2025 17:15:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2F7C63582F; Fri, 4 Apr 2025 17:15:17 +0200 (CEST) Message-ID: <6d359560-89a4-4335-9604-1a6cb04d7ce5@proxmox.com> Date: Fri, 4 Apr 2025 17:14:43 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Proxmox Backup Server development discussion <pbs-devel@lists.proxmox.com>, Hannes Laimer <h.laimer@proxmox.com> References: <20250404151017.32991-1-h.laimer@proxmox.com> <20250404151017.32991-4-h.laimer@proxmox.com> Content-Language: en-US, de-DE From: Christian Ebner <c.ebner@proxmox.com> In-Reply-To: <20250404151017.32991-4-h.laimer@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com, user.rs] Subject: Re: [pbs-devel] [PATCH proxmox-backup v2 3/5] fix #4382: api: remove permissions and tokens of user on deletion X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion <pbs-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/> List-Post: <mailto:pbs-devel@lists.proxmox.com> List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox Backup Server development discussion <pbs-devel@lists.proxmox.com> Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com> On 4/4/25 17:10, Hannes Laimer wrote: > Signed-off-by: Hannes Laimer <h.laimer@proxmox.com> > --- > src/api2/access/user.rs | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/src/api2/access/user.rs b/src/api2/access/user.rs > index bba5bb2c0..a51ee8f3f 100644 > --- a/src/api2/access/user.rs > +++ b/src/api2/access/user.rs > @@ -353,6 +353,7 @@ pub async fn update_user( > pub fn delete_user(userid: Userid, digest: Option<String>) -> Result<(), Error> { > let _lock = pbs_config::user::lock_config()?; > let _tfa_lock = crate::config::tfa::write_lock()?; > + let _acl_lock = pbs_config::acl::lock_config()?; > > let (mut config, expected_digest) = pbs_config::user::config()?; > > @@ -380,6 +381,19 @@ pub fn delete_user(userid: Userid, digest: Option<String>) -> Result<(), Error> > eprintln!("error updating TFA config after deleting user {userid:?} {err}",); > } > > + let user_tokens: Vec<ApiToken> = config > + .convert_to_typed_array::<ApiToken>("token")? > + .into_iter() > + .filter(|token| token.tokenid.user().eq(&userid)) > + .collect(); > + > + let (mut acl_tree, _digest) = pbs_config::acl::config()?; > + for token in user_tokens { > + if let Some(name) = token.tokenid.tokenname() { > + do_delete_token(name.to_owned(), &userid, &mut config, &mut acl_tree)?; > + } > + } Unfortunately you were faster with the rebase an probably missed my previous comment. Referencing it for this series, so it does get considered: https://lore.proxmox.com/pbs-devel/20fe5ca6-889d-4930-ae18-457bc3abf5a5@proxmox.com/ > Ok(()) > } > _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel