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

src/section_config.rs - convert_to_array: optionally add digest

Browse Source 
datastore::config() -> also return digest
remotes::config() -> also return digest
This commit is contained in:
Dietmar Maurer
2020-01-14 12:57:03 +01:00
parent 4566303b05
commit d0187a51a9
8 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/config/datastore.rs
View File

@ -51,7 +51,7 @@ fn init() -> SectionConfig {
const DATASTORE_CFG_FILENAME: &str = "/etc/proxmox-backup/datastore.cfg";
pub fn config() -> Result<SectionConfigData, Error> {
pub fn config() -> Result<(SectionConfigData, [u8;32]), Error> {
let content = match std::fs::read_to_string(DATASTORE_CFG_FILENAME) {
Ok(c) => c,
Err(err) => {
@ -63,7 +63,9 @@ pub fn config() -> Result<SectionConfigData, Error> {
}
};
CONFIG.parse(DATASTORE_CFG_FILENAME, &content)
let digest = openssl::sha::sha256(content.as_bytes());
let data = CONFIG.parse(DATASTORE_CFG_FILENAME, &content)?;
Ok((data, digest))
}
pub fn save_config(config: &SectionConfigData) -> Result<(), Error> {
@ -86,7 +88,7 @@ pub fn save_config(config: &SectionConfigData) -> Result<(), Error> {
// shell completion helper
pub fn complete_datastore_name(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
match config() {
Ok(data) => data.sections.iter().map(|(id, _)| id.to_string()).collect(),
Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(),
Err(_) => return vec![],
}
}

8
src/config/remotes.rs
View File

@ -62,7 +62,7 @@ fn init() -> SectionConfig {
const REMOTES_CFG_FILENAME: &str = "/etc/proxmox-backup/remotes.cfg";
pub fn config() -> Result<SectionConfigData, Error> {
pub fn config() -> Result<(SectionConfigData, [u8;32]), Error> {
let content = match std::fs::read_to_string(REMOTES_CFG_FILENAME) {
Ok(c) => c,
Err(err) => {
@ -74,7 +74,9 @@ pub fn config() -> Result<SectionConfigData, Error> {
}
};
CONFIG.parse(REMOTES_CFG_FILENAME, &content)
let digest = openssl::sha::sha256(content.as_bytes());
let data = CONFIG.parse(REMOTES_CFG_FILENAME, &content)?;
Ok((data, digest))
}
pub fn save_config(config: &SectionConfigData) -> Result<(), Error> {
@ -97,7 +99,7 @@ pub fn save_config(config: &SectionConfigData) -> Result<(), Error> {
// shell completion helper
pub fn complete_remote_name(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
match config() {
Ok(data) => data.sections.iter().map(|(id, _)| id.to_string()).collect(),
Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(),
Err(_) => return vec![],
}
}