tsarevvv/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api: notification: also list datastores if user has only Backup privs

Browse Source 
Use the /admin/datatore API instead of /config/datastore to get a list
of all available datastores - this ensures that users can see
datastores even if they only have Datastore.Backup privs.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Lukas Wagner 2024-04-23 13:52:30 +02:00 committed by Thomas Lamprecht
parent 1e5cb74d89
commit d6ed84f88c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api2/config/notifications/mod.rs
View File

@ -3,17 +3,17 @@ use serde::Serialize;
use serde_json::Value; use serde_json::Value;
use std::cmp::Ordering; use std::cmp::Ordering;
use proxmox_router::{list_subdirs_api_method, Permission, RpcEnvironment}; use proxmox_router::{list_subdirs_api_method, ApiMethod, Permission, RpcEnvironment};
use proxmox_router::{Router, SubdirMap}; use proxmox_router::{Router, SubdirMap};
use proxmox_schema::api; use proxmox_schema::api;
use proxmox_sortable_macro::sortable; use proxmox_sortable_macro::sortable;
use crate::api2::admin::datastore::get_datastore_list;
use pbs_api_types::PRIV_SYS_AUDIT; use pbs_api_types::PRIV_SYS_AUDIT;
use crate::api2::admin::prune::list_prune_jobs; use crate::api2::admin::prune::list_prune_jobs;
use crate::api2::admin::sync::list_sync_jobs; use crate::api2::admin::sync::list_sync_jobs;
use crate::api2::admin::verify::list_verification_jobs; use crate::api2::admin::verify::list_verification_jobs;
use crate::api2::config::datastore::list_datastores;
use crate::api2::config::media_pool::list_pools; use crate::api2::config::media_pool::list_pools;
use crate::api2::tape::backup::list_tape_backup_jobs; use crate::api2::tape::backup::list_tape_backup_jobs;
@ -112,16 +112,17 @@ pub fn get_fields() -> Result<Vec<MatchableField>, Error> {
/// List all known, matchable metadata field values. /// List all known, matchable metadata field values.
pub fn get_values( pub fn get_values(
param: Value, param: Value,
info: &ApiMethod,
rpcenv: &mut dyn RpcEnvironment, rpcenv: &mut dyn RpcEnvironment,
) -> Result<Vec<MatchableValue>, Error> { ) -> Result<Vec<MatchableValue>, Error> {
let mut values = Vec::new(); let mut values = Vec::new();
let datastores = list_datastores(param.clone(), rpcenv)?; let datastores = get_datastore_list(param.clone(), info, rpcenv)?;
for datastore in datastores { for datastore in datastores {
values.push(MatchableValue { values.push(MatchableValue {
field: "datastore".into(), field: "datastore".into(),
value: datastore.name.clone(), value: datastore.store.clone(),
comment: datastore.comment.clone(), comment: datastore.comment.clone(),
}); });
} }