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 5DBB9915FA for ; Wed, 21 Dec 2022 11:53:09 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3E7DD6834 for ; Wed, 21 Dec 2022 11:53:09 +0100 (CET) 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 ; Wed, 21 Dec 2022 11:53:07 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BC75244086 for ; Wed, 21 Dec 2022 11:53:07 +0100 (CET) Date: Wed, 21 Dec 2022 11:53:01 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Hannes Laimer , Proxmox Backup Server development discussion References: <20221220145714.63985-1-h.laimer@proxmox.com> <20221220145714.63985-5-h.laimer@proxmox.com> <085a267f-64e3-7e94-3781-9400589c870a@proxmox.com> In-Reply-To: <085a267f-64e3-7e94-3781-9400589c870a@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1671619620.8tmlx3xl5k.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.133 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [user.rs] Subject: Re: [pbs-devel] [PATCH proxmox-backup 4/5] fix #3887: api2: add regenerate token endpoint 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, 21 Dec 2022 10:53:09 -0000 On December 21, 2022 10:56 am, Thomas Lamprecht wrote: > On 20/12/2022 15:57, Hannes Laimer wrote: >> Signed-off-by: Hannes Laimer >> --- >> src/api2/access/user.rs | 61 ++++++++++++++++++++++++++++++++++++++++- >> 1 file changed, 60 insertions(+), 1 deletion(-) >>=20 >> diff --git a/src/api2/access/user.rs b/src/api2/access/user.rs >> index 40177c8d..c2b563f7 100644 >> --- a/src/api2/access/user.rs >> +++ b/src/api2/access/user.rs > [..] >> + token_shadow::set_secret(&tokenid, &secret)?; >> + >> + Ok(json!({ >> + "tokenid": tokenid_string, >> + "value": secret >> + })) >> +} >> + >> #[api( >> protected: true, >> input: { >> @@ -754,11 +807,17 @@ pub fn list_tokens( >> Ok(res) >> } >> =20 >> +const TOKEN_SUBDIRS: SubdirMap =3D &[( >> + "regenerate", >> + &Router::new().post(&API_METHOD_REGENERATE_TOKEN), >> +)]; >> + >> const TOKEN_ITEM_ROUTER: Router =3D Router::new() >> .get(&API_METHOD_READ_TOKEN) >> .put(&API_METHOD_UPDATE_TOKEN) >> .post(&API_METHOD_GENERATE_TOKEN) >> - .delete(&API_METHOD_DELETE_TOKEN); >> + .delete(&API_METHOD_DELETE_TOKEN) >> + .subdirs(TOKEN_SUBDIRS); >=20 > hmm, but now I cannot get the available subdir's via GET due to that bein= g > already used for reading the token info. Besides the added imperfection, = I'm > actually not sure from top of my head about the implications in PBS, but = in > PVE this would cause some technical issues in pvesh/api-viewer - did you > check how those (debug api and api-viewer) handle to a shared subdir + "n= ormal" > get on the same API endpoint? yeah, this would break editing tokens (and external calls to that GET API e= ndpoint). >=20 >> =20 >> const TOKEN_ROUTER: Router =3D Router::new() >> .get(&API_METHOD_LIST_TOKENS) it could be folded either into the update_token call (currently no return t= ype, could return an optional new secret) or the generate_token call, guarded by= a new "regenerate" boolean parameter. for updating it could even be combined = with an actual metadata update, for generate it would probably make more sense t= o enforce that any optional parameters match the current one to avoid acciden= ts..