Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

Implement rpc_secret_file #466

Merged
lx merged 3 commits from felix.scheinost/garage:feature/implement-rpc-secret-file into main 2023-01-11 16:04:36 +00:00
Conversation 2 Commits 3 Files changed 12 +7 -1
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7b62fe3f0b - Show all commits

8
src/util/config.rs
View file

@ -34,6 +34,7 @@ pub struct Config {
pub compression_level: Option<i32>, pub compression_level: Option<i32>,
/// RPC secret key: 32 bytes hex encoded /// RPC secret key: 32 bytes hex encoded
/// Note: When using `read_config` this should never be `None`
pub rpc_secret: Option<String>, pub rpc_secret: Option<String>,
/// Optional file where RPC secret key is read from /// Optional file where RPC secret key is read from
@ -183,7 +184,12 @@ pub fn read_config(config_file: PathBuf) -> Result<Config, Error> {
let mut parsed_config: Config = toml::from_str(&config)?; let mut parsed_config: Config = toml::from_str(&config)?;
lx commented 2023-01-05 10:46:10 +00:00
Review
Copy link

I think in case we have both rpc_secret and rpc_secret_file, we should at least warn the user that something is wrong (probably just throw an Err)

I think in case we have both `rpc_secret` and `rpc_secret_file`, we should at least warn the user that something is wrong (probably just throw an Err)
match (&parsed_config.rpc_secret, &parsed_config.rpc_secret_file) { match (&parsed_config.rpc_secret, &parsed_config.rpc_secret_file) {
(Some(_), _) => {} (Some(_), None) => {
// no-op
}
(Some(_), Some(_)) => {
return Err("only one of `rpc_secret` and `rpc_secret_file` can be set".into())
}
(None, Some(rpc_secret_file_path_string)) => { (None, Some(rpc_secret_file_path_string)) => {
let mut rpc_secret_file = std::fs::OpenOptions::new() let mut rpc_secret_file = std::fs::OpenOptions::new()
.read(true) .read(true)