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

src/api2/config: check digest

Browse Source
This commit is contained in:
Dietmar Maurer
2020-01-15 12:27:05 +01:00
parent 347834df25
commit 002a191abf
6 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/api2/config/datastore.rs
View File

@ -112,6 +112,10 @@ pub fn read_datastore(name: String) -> Result<Value, Error> {
optional: true,
schema: datastore::DIR_NAME_SCHEMA,
},
digest: {
optional: true,
schema: PROXMOX_CONFIG_DIGEST_SCHEMA,
},
},
},
)]
@ -120,12 +124,18 @@ pub fn update_datastore(
name: String,
comment: Option<String>,
path: Option<String>,
digest: Option<String>,
) -> Result<(), Error> {
let _lock = crate::tools::open_file_locked(datastore::DATASTORE_CFG_LOCKFILE, std::time::Duration::new(10, 0))?;
// pass/compare digest
let (mut config, _digest) = datastore::config()?;
let (mut config, expected_digest) = datastore::config()?;
if let Some(ref digest) = digest {
let digest = proxmox::tools::hex_to_digest(digest)?;
crate::tools::detect_modified_configuration_file(&digest, &expected_digest)?;
}
let mut data: datastore::DataStoreConfig = config.lookup("datastore", &name)?;

13
src/api2/config/remotes.rs
View File

@ -118,6 +118,10 @@ pub fn read_remote(name: String) -> Result<Value, Error> {
optional: true,
schema: remotes::REMOTE_PASSWORD_SCHEMA,
},
digest: {
optional: true,
schema: PROXMOX_CONFIG_DIGEST_SCHEMA,
},
},
},
)]
@ -128,12 +132,17 @@ pub fn update_remote(
host: Option<String>,
userid: Option<String>,
password: Option<String>,
digest: Option<String>,
) -> Result<(), Error> {
let _lock = crate::tools::open_file_locked(remotes::REMOTES_CFG_LOCKFILE, std::time::Duration::new(10, 0))?;
// pass/compare digest
let (mut config, _digest) = remotes::config()?;
let (mut config, expected_digest) = remotes::config()?;
if let Some(ref digest) = digest {
let digest = proxmox::tools::hex_to_digest(digest)?;
crate::tools::detect_modified_configuration_file(&digest, &expected_digest)?;
}
let mut data: remotes::Remote = config.lookup("remote", &name)?;