Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add ability to configure trusted root ca [CTDL-229] #46

Merged
merged 1 commit into from
Oct 25, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions object_store/src/client/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ pub enum ClientConfigKey {
Timeout,
/// User-Agent header to be used by this client
UserAgent,
/// PEM-formatted CA certificate
RootCa
}

impl AsRef<str> for ClientConfigKey {
Expand All @@ -129,6 +131,7 @@ impl AsRef<str> for ClientConfigKey {
Self::ProxyUrl => "proxy_url",
Self::Timeout => "timeout",
Self::UserAgent => "user_agent",
Self::RootCa => "root_ca",
}
}
}
Expand Down Expand Up @@ -156,6 +159,7 @@ impl FromStr for ClientConfigKey {
store: "HTTP",
key: s.into(),
}),
"root_ca" => Ok(Self::RootCa),
}
}
}
Expand All @@ -179,6 +183,7 @@ pub struct ClientOptions {
http2_keep_alive_while_idle: ConfigValue<bool>,
http1_only: ConfigValue<bool>,
http2_only: ConfigValue<bool>,
root_ca: Option<String>,
}

impl ClientOptions {
Expand Down Expand Up @@ -222,6 +227,9 @@ impl ClientOptions {
ClientConfigKey::UserAgent => {
self.user_agent = Some(ConfigValue::Deferred(value.into()))
}
ClientConfigKey::RootCa => {
self.root_ca = Some(value.into())
}
}
self
}
Expand Down Expand Up @@ -261,6 +269,9 @@ impl ClientOptions {
.as_ref()
.and_then(|v| v.get().ok())
.and_then(|v| v.to_str().ok().map(|s| s.to_string())),
ClientConfigKey::RootCa => self
.root_ca
.clone(),
}
}

Expand Down Expand Up @@ -398,6 +409,13 @@ impl ClientOptions {
self
}


/// Set a trusted CA certificate
pub fn with_root_ca(mut self, root_ca: impl Into<String>) -> Self {
self.root_ca = Some(root_ca.into());
self
}

/// Get the mime type for the file in `path` to be uploaded
///
/// Gets the file extension from `path`, and returns the
Expand Down Expand Up @@ -473,6 +491,13 @@ impl ClientOptions {
builder = builder.danger_accept_invalid_certs(true)
}

if let Some(cert) = &self.root_ca {
let certificate = reqwest::tls::Certificate::from_pem(cert.as_bytes())
.map_err(map_client_error)?;

builder = builder.add_root_certificate(certificate);
}

builder
.https_only(!self.allow_http.get()?)
.build()
Expand Down Expand Up @@ -623,6 +648,7 @@ mod tests {
let proxy_url = "https://fake_proxy_url".to_string();
let timeout = "95 seconds".to_string();
let user_agent = "object_store:fake_user_agent".to_string();
let root_ca = "fake_certificate".to_string();

let options = HashMap::from([
("allow_http", allow_http.clone()),
Expand All @@ -648,6 +674,7 @@ mod tests {
("proxy_url", proxy_url.clone()),
("timeout", timeout.clone()),
("user_agent", user_agent.clone()),
("root_ca", root_ca.clone()),
]);

let builder = options
Expand Down Expand Up @@ -739,5 +766,11 @@ mod tests {
.unwrap(),
user_agent
);
assert_eq!(
builder
.get_config_value(&ClientConfigKey::RootCa)
.unwrap(),
root_ca
);
}
}
Loading