fix: fix tls not working on arm (#127) (#128)

* fix: fix tls not working on arm (#127) * Fix formatting * add change file --------- Co-authored-by: Lucas Nogueira <[email protected]>
crabnebula-dev · Jan 14, 2024 · 3b3ce76 · 3b3ce76
1 parent bffce40
commit 3b3ce76
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/.changes/fix-download-macos.md b/.changes/fix-download-macos.md
@@ -0,0 +1,6 @@
+---
+"cargo-packager": patch
+"@crabnebula/packager": patch
+---
+
+Fix file download not working on macOS and Windows (arm).
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/packager/src/util.rs b/crates/packager/src/util.rs
@@ -141,7 +141,19 @@ pub fn target_triple() -> crate::Result<String> {
 
 pub(crate) fn download(url: &str) -> crate::Result<Vec<u8>> {
     tracing::info!("Downloading {}", url);
+
+    // This is required because ureq does not bind native-tls as the default TLS implementation when rustls is not available.
+    // See <https://github.com/crabnebula-dev/cargo-packager/issues/127>
+    #[cfg(feature = "native-tls")]
+    let agent = ureq::AgentBuilder::new()
+        .tls_connector(std::sync::Arc::new(
+            native_tls::TlsConnector::new().unwrap(),
+        ))
+        .try_proxy_from_env(true)
+        .build();
+    #[cfg(not(feature = "native-tls"))]
     let agent = ureq::AgentBuilder::new().try_proxy_from_env(true).build();
+
     let response = agent.get(url).call().map_err(Box::new)?;
     let mut bytes = Vec::new();
     response.into_reader().read_to_end(&mut bytes)?;