Skip to content
Closed
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
54 changes: 28 additions & 26 deletions crates/uv-client/src/base_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -420,33 +420,35 @@ impl<'a> BaseClientBuilder<'a> {
// Checks for the presence of `SSL_CERT_FILE`.
// Certificate loading support is delegated to `rustls-native-certs`.
// See https://github.com/rustls/rustls-native-certs/blob/813790a297ad4399efe70a8e5264ca1b420acbec/src/lib.rs#L118-L125
let ssl_cert_file_exists = env::var_os(EnvVars::SSL_CERT_FILE).is_some_and(|path| {
let path = Path::new(&path);
match path.metadata() {
Ok(metadata) if metadata.is_file() => true,
Ok(_) => {
warn_user_once!(
"Ignoring invalid `SSL_CERT_FILE`. Path is not a file: {}.",
path.simplified_display().cyan()
);
false
}
Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
warn_user_once!(
"Ignoring invalid `SSL_CERT_FILE`. Path does not exist: {}.",
path.simplified_display().cyan()
);
false
}
Err(err) => {
warn_user_once!(
"Ignoring invalid `SSL_CERT_FILE`. Path is not accessible: {} ({err}).",
path.simplified_display().cyan()
);
false
let ssl_cert_file_exists = env::var_os(EnvVars::SSL_CERT_FILE)
.filter(|v| !v.is_empty())
.is_some_and(|path| {
let path = Path::new(&path);
match path.metadata() {
Ok(metadata) if metadata.is_file() => true,
Ok(_) => {
warn_user_once!(
"Ignoring invalid `SSL_CERT_FILE`. Path is not a file: {}.",
path.simplified_display().cyan()
);
false
}
Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
warn_user_once!(
"Ignoring invalid `SSL_CERT_FILE`. Path does not exist: {}.",
path.simplified_display().cyan()
);
false
}
Err(err) => {
warn_user_once!(
"Ignoring invalid `SSL_CERT_FILE`. Path is not accessible: {} ({err}).",
path.simplified_display().cyan()
);
false
}
}
}
});
});

// Checks for the presence of `SSL_CERT_DIR`.
// Certificate loading support is delegated to `rustls-native-certs`.
Expand Down
Loading