diff --git a/Cargo.lock b/Cargo.lock index 8ca91de..78a2268 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -383,7 +383,7 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "corkboard" -version = "0.4.6" +version = "0.4.7" dependencies = [ "askama", "axum", @@ -392,6 +392,7 @@ dependencies = [ "curl-sys", "gix", "headless_chrome", + "openssl-probe", "openssl-sys", "pulldown-cmark", "serde", @@ -2357,6 +2358,12 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "openssl-probe" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" + [[package]] name = "openssl-src" version = "300.6.1+3.6.3" diff --git a/Cargo.toml b/Cargo.toml index cce33f4..46f99ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "corkboard" -version = "0.4.6" +version = "0.4.7" edition = "2024" default-run = "corkboard" [features] -git = ["dep:gix", "dep:tempfile", "dep:curl-sys", "dep:openssl-sys"] +git = ["dep:gix", "dep:tempfile", "dep:curl-sys", "dep:openssl-sys", "dep:openssl-probe"] [dependencies] askama = "0.16.0" @@ -28,6 +28,7 @@ gix = { version = "0.84", features = ["blocking-network-client", "blocking-http- tempfile = { version = "3.27.0", optional = true } curl-sys = { version = "0.4", features = ["ssl"], optional = true } openssl-sys = { version = "0.9", features = ["vendored"], optional = true } +openssl-probe = { version = "0.1.6", optional = true } diff --git a/src/data/data_source/markdown/git_markdown_data_source.rs b/src/data/data_source/markdown/git_markdown_data_source.rs index e5852b7..df8b0e8 100644 --- a/src/data/data_source/markdown/git_markdown_data_source.rs +++ b/src/data/data_source/markdown/git_markdown_data_source.rs @@ -19,6 +19,15 @@ impl GitMarkdownDataSource { password: Option<&str>, _branch: &str, ) -> Result { + unsafe { + openssl_probe::init_openssl_env_vars(); + if let Ok(cert_file) = std::env::var("SSL_CERT_FILE") { + if std::env::var("CURL_CA_BUNDLE").is_err() { + std::env::set_var("CURL_CA_BUNDLE", &cert_file); + } + } + } + let temp_dir = tempfile::Builder::new() .prefix("corkboard-git-") .tempdir()