Skip to content

refactor: unify internal naming of allow_invalid_certificates #718

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.

Sign up for GitHub

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

Open
CommanderStorm wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −7
Open

refactor: unify internal naming of allow_invalid_certificates #718

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions src/client/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ pub struct ClientOptions {
proxy_ca_certificate: Option<String>,
proxy_excludes: Option<String>,
allow_http: ConfigValue<bool>,
allow_insecure: ConfigValue<bool>,
allow_invalid_certificates: ConfigValue<bool>,
timeout: Option<ConfigValue<Duration>>,
connect_timeout: Option<ConfigValue<Duration>>,
read_timeout: Option<ConfigValue<Duration>>,
Expand Down Expand Up @@ -366,7 +366,7 @@ impl Default for ClientOptions {
proxy_ca_certificate: None,
proxy_excludes: None,
allow_http: Default::default(),
allow_insecure: Default::default(),
allow_invalid_certificates: Default::default(),
timeout: Some(Duration::from_secs(30).into()),
connect_timeout: Some(Duration::from_secs(5).into()),
read_timeout: None,
Expand Down Expand Up @@ -396,7 +396,7 @@ impl ClientOptions {
pub fn with_config(mut self, key: ClientConfigKey, value: impl Into<String>) -> Self {
match key {
ClientConfigKey::AllowHttp => self.allow_http.parse(value),
ClientConfigKey::AllowInvalidCertificates => self.allow_insecure.parse(value),
ClientConfigKey::AllowInvalidCertificates => self.allow_invalid_certificates.parse(value),
ClientConfigKey::ConnectTimeout => {
self.connect_timeout = Some(ConfigValue::Deferred(value.into()))
}
Expand Down Expand Up @@ -442,7 +442,7 @@ impl ClientOptions {
pub fn get_config_value(&self, key: &ClientConfigKey) -> Option<String> {
match key {
ClientConfigKey::AllowHttp => Some(self.allow_http.to_string()),
ClientConfigKey::AllowInvalidCertificates => Some(self.allow_insecure.to_string()),
ClientConfigKey::AllowInvalidCertificates => Some(self.allow_invalid_certificates.to_string()),
ClientConfigKey::ConnectTimeout => self.connect_timeout.as_ref().map(fmt_duration),
ClientConfigKey::ReadTimeout => self.read_timeout.as_ref().map(fmt_duration),
ClientConfigKey::DefaultContentType => self.default_content_type.clone(),
Expand Down Expand Up @@ -543,8 +543,8 @@ impl ClientOptions {
/// as a last resort or for testing
///
/// </div>
pub fn with_allow_invalid_certificates(mut self, allow_insecure: bool) -> Self {
self.allow_insecure = allow_insecure.into();
pub fn with_allow_invalid_certificates(mut self, allow_invalid_certificates: bool) -> Self {
self.allow_invalid_certificates = allow_invalid_certificates.into();
self
}

Expand Down Expand Up @@ -870,7 +870,7 @@ impl ClientOptions {
builder = builder.http2_prior_knowledge()
}

if self.allow_insecure.get()? {
if self.allow_invalid_certificates.get()? {
builder = builder.danger_accept_invalid_certs(true)
}

Expand Down