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

src/config/user.rs - cached_config: do not store/return digest

This commit is contained in:
Dietmar Maurer 2020-04-15 11:35:57 +02:00
parent 5354511fd0
commit 109d7817cd
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api2/access/acl.rs
View File

@ -199,7 +199,7 @@ pub fn update_acl(
bail!("parameter 'group' - groups are currently not supported."); bail!("parameter 'group' - groups are currently not supported.");
} else if let Some(ref userid) = userid { } else if let Some(ref userid) = userid {
if !delete { // Note: we allow to delete non-existent users if !delete { // Note: we allow to delete non-existent users
let (user_cfg, _) = crate::config::user::cached_config()?; let user_cfg = crate::config::user::cached_config()?;
if user_cfg.sections.get(userid).is_none() { if user_cfg.sections.get(userid).is_none() {
bail!("no such user."); bail!("no such user.");
} }

14
src/config/user.rs
View File

@ -141,10 +141,10 @@ pub fn config() -> Result<(SectionConfigData, [u8;32]), Error> {
Ok((data, digest)) Ok((data, digest))
} }
pub fn cached_config() -> Result<(Arc<SectionConfigData>,[u8;32]), Error> { pub fn cached_config() -> Result<Arc<SectionConfigData>, Error> {
struct ConfigCache { struct ConfigCache {
data: Option<(Arc<SectionConfigData>,[u8;32])>, data: Option<Arc<SectionConfigData>>,
last_mtime: i64, last_mtime: i64,
last_mtime_nsec: i64, last_mtime_nsec: i64,
} }
@ -159,21 +159,21 @@ pub fn cached_config() -> Result<(Arc<SectionConfigData>,[u8;32]), Error> {
{ // limit scope { // limit scope
let cache = CACHED_CONFIG.read().unwrap(); let cache = CACHED_CONFIG.read().unwrap();
if stat.st_mtime == cache.last_mtime && stat.st_mtime_nsec == cache.last_mtime_nsec { if stat.st_mtime == cache.last_mtime && stat.st_mtime_nsec == cache.last_mtime_nsec {
if let Some((ref config, ref digest)) = cache.data { if let Some(ref config) = cache.data {
return Ok((config.clone(), *digest)); return Ok(config.clone());
} }
} }
} }
let (config, digest) = config()?; let (config, _digest) = config()?;
let config = Arc::new(config); let config = Arc::new(config);
let mut cache = CACHED_CONFIG.write().unwrap(); let mut cache = CACHED_CONFIG.write().unwrap();
cache.last_mtime = stat.st_mtime; cache.last_mtime = stat.st_mtime;
cache.last_mtime_nsec = stat.st_mtime_nsec; cache.last_mtime_nsec = stat.st_mtime_nsec;
cache.data = Some((config.clone(), digest.clone())); cache.data = Some(config.clone());
Ok((config, digest)) Ok(config)
} }
pub fn save_config(config: &SectionConfigData) -> Result<(), Error> { pub fn save_config(config: &SectionConfigData) -> Result<(), Error> {