fetch salt only once
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2019-09-17 21:44:51 +02:00
parent 1a262c17cb
commit c9d8d24eec
2 changed files with 14 additions and 10 deletions

View File

@@ -8,36 +8,36 @@ use std::collections::HashMap;
use std::env;
use std::fs::File;
use std::io::Read;
use std::path::{PathBuf, Path};
use std::path::{Path, PathBuf};
use std::process::Command;
#[derive(Debug, Deserialize, Serialize)]
pub struct EnvConfig {
credential_id: String,
uuid: String,
salt: String,
mapper_name: String,
password_helper: String
password_helper: String,
}
impl Into<Config> for EnvConfig {
fn into(self) -> Config {
Config{
Config {
credential_id: self.credential_id,
device: format!("/dev/disk/by-uuid/{}", self.uuid).into(),
mapper_name: self.mapper_name,
password_helper: PasswordHelper::Script(self.password_helper),
input_salt: if PathBuf::from(&self.salt).exists() {
InputSalt::File { path: self.salt.into() }
InputSalt::File {
path: self.salt.into(),
}
} else {
InputSalt::AskPassword
}
},
}
}
}
#[derive(Debug, Deserialize, Serialize)]
pub struct Config {
pub credential_id: String,