diff options
| author | Trinity Pointard <trinity.pointard@gmail.com> | 2021-05-29 21:22:15 +0200 |
|---|---|---|
| committer | Trinity Pointard <trinity.pointard@gmail.com> | 2021-05-29 21:37:49 +0200 |
| commit | 289521886bc5819790c92da6cdf24898aacbaf58 (patch) | |
| tree | ad79abec207e11de5c860d23c871b884aaada909 /src | |
| parent | ebd21b325e7c30b58d6b3ab621f08cd1bffb0c6d (diff) | |
| download | garage-289521886bc5819790c92da6cdf24898aacbaf58.tar.gz garage-289521886bc5819790c92da6cdf24898aacbaf58.zip | |
make most changes suggested during install-party
Diffstat (limited to 'src')
| -rw-r--r-- | src/garage/cli.rs | 2 | ||||
| -rw-r--r-- | src/rpc/rpc_client.rs | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/garage/cli.rs b/src/garage/cli.rs index 0ddb5a1c..d44256b9 100644 --- a/src/garage/cli.rs +++ b/src/garage/cli.rs @@ -125,7 +125,7 @@ pub enum BucketOperation { #[structopt(name = "allow")] Allow(PermBucketOpt), - /// Allow key to read or write to bucket + /// Deny key from reading or writing to bucket #[structopt(name = "deny")] Deny(PermBucketOpt), diff --git a/src/rpc/rpc_client.rs b/src/rpc/rpc_client.rs index 5ed43d44..806c7e69 100644 --- a/src/rpc/rpc_client.rs +++ b/src/rpc/rpc_client.rs @@ -279,9 +279,13 @@ impl RpcHttpClient { tls_config: &Option<TlsConfig>, ) -> Result<Self, Error> { let method = if let Some(cf) = tls_config { - let ca_certs = tls_util::load_certs(&cf.ca_cert)?; - let node_certs = tls_util::load_certs(&cf.node_cert)?; - let node_key = tls_util::load_private_key(&cf.node_key)?; + let ca_certs = tls_util::load_certs(&cf.ca_cert).map_err(|e| { + Error::Message(format!("Failed to open CA certificate file: {:?}", e)) + })?; + let node_certs = tls_util::load_certs(&cf.node_cert) + .map_err(|e| Error::Message(format!("Failed to open certificate file: {:?}", e)))?; + let node_key = tls_util::load_private_key(&cf.node_key) + .map_err(|e| Error::Message(format!("Failed to open private key file: {:?}", e)))?; let mut config = rustls::ClientConfig::new(); |