Fix request headers and use rustls for all targets

bindings/java/Cargo.toml

@@ -31,9 +31,4 @@ url = { version = "2.5.8", default-features = false }
 tokio = { version = "1.50.0", default-features = false, features = ["rt"] }
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = { version = "1.0.149", default-features = false, features = ["preserve_order"] }
-
-# Use native TLS only on Windows and Apple OSs
-[target.'cfg(any(target_os = "windows", target_vendor = "apple"))'.dependencies]
-reqwest = { version = "0.13.2", default-features = false, features = ["native-tls", "http2", "system-proxy"] }
-[target.'cfg(not(any(target_os = "windows", target_vendor = "apple")))'.dependencies]
 reqwest = { version = "0.13.2", features = ["rustls"] }

bindings/java/src/lib.rs

@@ -20,7 +20,7 @@ use sysand_core::{
         local_src::{LocalSrcError, LocalSrcProject},
         utils::wrapfs,
     },
-    resolve::standard::standard_resolver,
+    resolve::{net_utils::create_reqwest_client, standard::standard_resolver},
     workspace::Workspace,
 };
 
@@ -190,7 +190,13 @@ pub extern "system" fn Java_com_sensmetry_sysand_Sysand_info<'local>(
     let Some(uri) = env.get_str(&uri, "uri") else {
         return JObjectArray::default();
     };
-    let client = reqwest_middleware::ClientBuilder::new(reqwest::Client::new()).build();
+    let client = match create_reqwest_client() {
+        Ok(c) => c,
+        Err(e) => {
+            env.throw_exception(ExceptionKind::SysandException, e.to_string());
+            return JObjectArray::default();
+        }
+    };
 
     let runtime = {
         let r = match tokio::runtime::Builder::new_current_thread().build() {

bindings/py/Cargo.toml

@@ -29,13 +29,8 @@ pyo3-log = "0.13.3"
 semver = { version = "1.0.27", default-features = false }
 typed-path = { version = "0.12.3", default-features = false, features= ["std"] }
 url = { version = "2.5.8", default-features = false }
-reqwest-middleware = "0.5.1"
 tokio = { version = "1.50.0", default-features = false, features = ["rt"] }
-
-# Use native TLS only on Windows and Apple OSs
-[target.'cfg(any(target_os = "windows", target_vendor = "apple"))'.dependencies]
-reqwest = { version = "0.13.2", default-features = false, features = ["native-tls", "http2", "system-proxy"] }
-[target.'cfg(not(any(target_os = "windows", target_vendor = "apple")))'.dependencies]
+reqwest-middleware = "0.5.1"
 reqwest = { version = "0.13.2", features = ["rustls"] }
 
 [dev-dependencies]

bindings/py/src/lib.rs

@@ -36,7 +36,7 @@ use sysand_core::{
         utils::wrapfs,
     },
     remove::do_remove,
-    resolve::standard::standard_resolver,
+    resolve::{net_utils::create_reqwest_client, standard::standard_resolver},
     sources::{do_sources_local_src_project_no_deps, find_project_dependencies},
     stdlib::known_std_libs,
     symbols::Language,
@@ -141,7 +141,7 @@ fn do_info_py(
 
     py.detach(|| {
         let mut results = vec![];
-        let client = reqwest_middleware::ClientBuilder::new(reqwest::Client::new()).build();
+        let client = create_reqwest_client().map_err(|e| PyRuntimeError::new_err(e.to_string()))?;
 
         let runtime = Arc::new(
             tokio::runtime::Builder::new_current_thread()

core/Cargo.toml

@@ -67,11 +67,6 @@ tokio = { version = "1.50.0", default-features = false, features = ["rt", "io-ut
 bytes = { version = "1.11.1", default-features = false }
 toml_edit = { version = "0.25.4", features = ["serde"] }
 globset = { version = "0.4.18", default-features = false }
-
-# Use native TLS only on Windows and Apple OSs
-[target.'cfg(any(target_os = "windows", target_vendor = "apple"))'.dependencies]
-reqwest = { version = "0.13.2", optional = true, default-features = false, features = ["native-tls", "http2", "system-proxy", "stream"] }
-[target.'cfg(not(any(target_os = "windows", target_vendor = "apple")))'.dependencies]
 reqwest = { version = "0.13.2", optional = true, features = ["rustls", "stream"] }
 
 [dev-dependencies]

core/src/auth.rs

@@ -66,7 +66,7 @@ impl HTTPAuthentication for ForceHTTPBasicAuth {
         F: Fn(&ClientWithMiddleware) -> RequestBuilder + 'static,
     {
         request
-            .basic_auth(self.username.clone(), Some(self.password.clone()))
+            .basic_auth(&self.username, Some(&self.password))
             .send()
             .await
     }
@@ -99,7 +99,7 @@ pub struct ForceBearerAuth(HeaderAuth);
 impl ForceBearerAuth {
     pub fn new<S: AsRef<str>>(token: S) -> ForceBearerAuth {
         ForceBearerAuth(HeaderAuth {
-            header: "Authorization".to_string(),
+            header: "Authorization".to_owned(),
             value: format!("Bearer {}", token.as_ref()),
         })
     }
@@ -234,7 +234,7 @@ impl<T> GlobMap<T> {
         if outcome.is_empty() {
             GlobMapResult::NotFound
         } else if outcome.len() == 1 {
-            GlobMapResult::Found(self.keys[0].clone(), &self.values[outcome[0]])
+            GlobMapResult::Found(key.to_owned(), &self.values[outcome[0]])
         } else {
             // Need to do some magic to keep multiple (disjoint) references into a mutable array
             let mut result = Vec::with_capacity(outcome.len());
@@ -255,7 +255,7 @@ impl<T> GlobMap<T> {
         if outcome.is_empty() {
             GlobMapResultMut::NotFound
         } else if outcome.len() == 1 {
-            GlobMapResultMut::Found(self.keys[0].clone(), &mut self.values[outcome[0]])
+            GlobMapResultMut::Found(key.to_owned(), &mut self.values[outcome[0]])
         } else {
             // Need to do some magic to keep multiple (disjoint) references into a mutable array
             let mut result = Vec::with_capacity(outcome.len());
@@ -478,13 +478,17 @@ mod tests {
             panic!("Expected ambiguous result.");
         }
 
-        if let GlobMapResultMut::Found(_, val) = globmap.lookup_mut("axx.com/xxx/xxx/xxx") {
+        let key = "axx.com/xxx/xxx/xxx";
+        if let GlobMapResultMut::Found(k, val) = globmap.lookup_mut(key) {
+            assert_eq!(k, key);
             assert_eq!(*val, 2);
         } else {
             panic!("Expected unambiguous result.");
         }
 
-        if let GlobMapResultMut::Found(_, val) = globmap.lookup_mut("b.com/xxx") {
+        let key = "b.com/xxx";
+        if let GlobMapResultMut::Found(k, val) = globmap.lookup_mut(key) {
+            assert_eq!(k, key);
             assert_eq!(*val, 3);
         } else {
             panic!("Expected unambiguous result.");