From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 4/5] fix #3887: api2: add regenerate token endpoint
Date: Tue, 20 Dec 2022 15:57:13 +0100 [thread overview]
Message-ID: <20221220145714.63985-5-h.laimer@proxmox.com> (raw)
In-Reply-To: <20221220145714.63985-1-h.laimer@proxmox.com>
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
src/api2/access/user.rs | 61 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 60 insertions(+), 1 deletion(-)
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
@@ -628,6 +628,59 @@ pub fn update_token(
Ok(())
}
+#[api(
+ protected: true,
+ input: {
+ properties: {
+ userid: {
+ type: Userid,
+ },
+ "token-name": {
+ type: Tokenname,
+ },
+ },
+ },
+ access: {
+ permission: &Permission::Or(&[
+ &Permission::Privilege(&["access", "users"], PRIV_PERMISSIONS_MODIFY, false),
+ &Permission::UserParam("userid"),
+ ]),
+ },
+ returns: {
+ description: "API token identifier + new generated secret.",
+ properties: {
+ value: {
+ type: String,
+ description: "The API token secret",
+ },
+ tokenid: {
+ type: String,
+ description: "The API token identifier",
+ },
+ },
+ },
+)]
+/// Regenerate an API token's secret, revokes the old secret and create a new one
+pub fn regenerate_token(userid: Userid, token_name: Tokenname) -> Result<Value, Error> {
+ let _user_lock = pbs_config::user::lock_config()?;
+
+ let tokenid = Authid::from((userid.clone(), Some(token_name.clone())));
+ let tokenid_string = tokenid.to_string();
+
+ let (user_config, _digest) = pbs_config::user::config()?;
+
+ // token just has to exist, we don't actually need it
+ let _data: ApiToken = user_config.lookup("token", &tokenid_string)?;
+
+ let secret = format!("{:x}", proxmox_uuid::Uuid::generate());
+ 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)
}
+const TOKEN_SUBDIRS: SubdirMap = &[(
+ "regenerate",
+ &Router::new().post(&API_METHOD_REGENERATE_TOKEN),
+)];
+
const TOKEN_ITEM_ROUTER: Router = 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);
const TOKEN_ROUTER: Router = Router::new()
.get(&API_METHOD_LIST_TOKENS)
--
2.30.2
next prev parent reply other threads:[~2022-12-20 14:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-20 14:57 [pbs-devel] [PATCH proxmox-backup 0/5] ACL removal on user/token deletion + token regeneration Hannes Laimer
2022-12-20 14:57 ` [pbs-devel] [PATCH proxmox-backup 1/5] pbs-config: add delete_authid to ACL-tree Hannes Laimer
2022-12-20 14:57 ` [pbs-devel] [PATCH proxmox-backup 2/5] fix #4382: api2: remove permissions of token on deletion Hannes Laimer
2022-12-20 14:57 ` [pbs-devel] [PATCH proxmox-backup 3/5] fix #4382: api2: remove permissions and tokens of user " Hannes Laimer
2022-12-21 9:23 ` Thomas Lamprecht
2022-12-20 14:57 ` Hannes Laimer [this message]
2022-12-21 9:56 ` [pbs-devel] [PATCH proxmox-backup 4/5] fix #3887: api2: add regenerate token endpoint Thomas Lamprecht
2022-12-21 10:53 ` Fabian Grünbichler
2022-12-21 13:06 ` Thomas Lamprecht
2022-12-20 14:57 ` [pbs-devel] [PATCH proxmox-backup 5/5] fix #3887: ui: add regenerate token button Hannes Laimer
2022-12-21 11:04 ` Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221220145714.63985-5-h.laimer@proxmox.com \
--to=h.laimer@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox