octoleo/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-11-14 01:14:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Save config

Browse Source
This commit is contained in:
Daniel García 2019-02-02 17:45:25 +01:00
parent 877408b808
commit ade293cf52
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/admin.rs
View File

@ -98,7 +98,7 @@ impl AdminTemplateData {
Self { Self {
users, users,
page_content: String::from("admin/page"), page_content: String::from("admin/page"),
config: serde_json::to_string_pretty(&CONFIG.get_config()).unwrap(), config: CONFIG.get_config(),
} }
} }

19
src/config.rs
View File

@ -10,6 +10,7 @@ lazy_static! {
println!("Error loading config:\n\t{:?}\n", e); println!("Error loading config:\n\t{:?}\n", e);
exit(12) exit(12)
}); });
pub static ref CONFIG_PATH: String = "data/config.json".into();
} }
macro_rules! make_config { macro_rules! make_config {
@ -86,7 +87,7 @@ macro_rules! make_config {
// TODO: Get config.json from CONFIG_PATH env var or -c <CONFIG> console option // TODO: Get config.json from CONFIG_PATH env var or -c <CONFIG> console option
// Loading from file // Loading from file
let mut builder = match ConfigBuilder::from_file("data/config.json") { let mut builder = match ConfigBuilder::from_file(&CONFIG_PATH) {
Ok(builder) => builder, Ok(builder) => builder,
Err(_) => ConfigBuilder::default() Err(_) => ConfigBuilder::default()
}; };
@ -200,17 +201,23 @@ fn validate_config(cfg: &ConfigItems) -> Result<(), Error> {
} }
impl Config { impl Config {
pub fn get_config(&self) -> ConfigItems { pub fn get_config(&self) -> String {
self.inner.read().unwrap().config.clone() let cfg = &self.inner.read().unwrap().config;
serde_json::to_string_pretty(cfg).unwrap()
} }
pub fn update_config(&self, other: ConfigBuilder) -> Result<(), Error> { pub fn update_config(&self, other: ConfigBuilder) -> Result<(), Error> {
let config = other.build(); let config = other.build();
validate_config(&config)?; validate_config(&config)?;
self.inner.write().unwrap().config = config; let config_str = serde_json::to_string_pretty(&config)?;
// TODO: Save to file self.inner.write().unwrap().config = config.clone();
//Save to file
use std::{fs::File, io::Write};
let mut file = File::create(&*CONFIG_PATH)?;
file.write_all(config_str.as_bytes())?;
Ok(()) Ok(())
} }