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

fix create_datastore parameters: 

comment was declared as optional but unwrap()ed, causing
panics when not using it

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-12-20 12:28:28 +01:00
parent 645995634a
commit 5e62d19cfb
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
use std::path::PathBuf; use std::path::PathBuf;
use failure::*; use failure::*;
use serde_json::{json, Value}; use serde_json::Value;
use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment}; use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
use proxmox::api::schema::*; use proxmox::api::schema::*;
@ -54,20 +54,21 @@ fn create_datastore(
bail!("datastore '{}' already exists.", name); bail!("datastore '{}' already exists.", name);
} }
if param["comment"].as_str().unwrap().find(|c: char| c.is_control()) != None {
bail!("comment must not contain control characters!");
}
let path: PathBuf = param["path"].as_str().unwrap().into(); let path: PathBuf = param["path"].as_str().unwrap().into();
let backup_user = crate::backup::backup_user()?; let backup_user = crate::backup::backup_user()?;
let _store = ChunkStore::create(name, path, backup_user.uid, backup_user.gid)?; let _store = ChunkStore::create(name, path, backup_user.uid, backup_user.gid)?;
let datastore = json!({ let mut datastore = serde_json::Map::new();
"path": param["path"], datastore.insert("path".to_string(), param["path"].clone());
"comment": param["comment"], if let Some(comment) = param.get("comment") {
}); if comment.as_str().unwrap().find(|c: char| c.is_control()).is_some() {
bail!("comment must not contain control characters!");
}
config.set_data(name, "datastore", datastore); datastore.insert("comment".to_string(), comment.clone());
}
config.set_data(name, "datastore", Value::Object(datastore));
datastore::save_config(&config)?; datastore::save_config(&config)?;