tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

api: allow tokens to list users

Browse Source 
their owner, or all if they have the appropriate privileges.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2020-12-30 12:21:14 +01:00 committed by Dietmar Maurer
parent 13f5863561
commit 08ac90f920
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/api2/access/user.rs
View File

@ -1,4 +1,4 @@
use anyhow::{bail, Error}; use anyhow::{bail, format_err, Error};
use serde::{Serialize, Deserialize}; use serde::{Serialize, Deserialize};
use serde_json::{json, Value}; use serde_json::{json, Value};
use std::collections::HashMap; use std::collections::HashMap;
@ -94,7 +94,6 @@ impl UserWithTokens {
} }
} }
#[api( #[api(
input: { input: {
properties: { properties: {
@ -113,7 +112,7 @@ impl UserWithTokens {
}, },
access: { access: {
permission: &Permission::Anybody, permission: &Permission::Anybody,
description: "Returns all or just the logged-in user, depending on privileges.", description: "Returns all or just the logged-in user (/API token owner), depending on privileges.",
}, },
)] )]
/// List users /// List users
@ -125,9 +124,12 @@ pub fn list_users(
let (config, digest) = user::config()?; let (config, digest) = user::config()?;
// intentionally user only for now let auth_id: Authid = rpcenv
let userid: Userid = rpcenv.get_auth_id().unwrap().parse()?; .get_auth_id()
let auth_id = Authid::from(userid.clone()); .ok_or_else(|| format_err!("no authid available"))?
.parse()?;
let userid = auth_id.user();
let user_info = CachedUserInfo::new()?; let user_info = CachedUserInfo::new()?;
@ -135,7 +137,7 @@ pub fn list_users(
let top_level_allowed = (top_level_privs & PRIV_SYS_AUDIT) != 0; let top_level_allowed = (top_level_privs & PRIV_SYS_AUDIT) != 0;
let filter_by_privs = |user: &user::User| { let filter_by_privs = |user: &user::User| {
top_level_allowed || user.userid == userid top_level_allowed || user.userid == *userid
}; };