sign

Signed-off-by: Tilo Wiklund <tilo.wiklund@sensmetry.com>

Author: tilowiklundSensmetry

core/src/auth.rs

@@ -47,18 +47,6 @@ impl HTTPAuthentication for Unauthenticated {
     {
         request.send().await
     }
-
-    async fn with_authentication<F>(
-        &self,
-        client: &ClientWithMiddleware,
-        renew_request: &F,
-    ) -> Result<Response, reqwest_middleware::Error>
-    where
-        F: Fn(&ClientWithMiddleware) -> RequestBuilder + 'static,
-    {
-        self.request_with_authentication(renew_request(client), renew_request)
-            .await
-    }
 }
 
 /// Authentication policy that *always* sends a username/password pair

core/src/config/local_fs.rs

@@ -77,7 +77,7 @@ mod tests {
                 url: "http://www.example.com".to_string(),
                 ..Default::default()
             }]),
-            auth: None,
+            // auth: None,
         };
         config_file
             .write_all(toml::to_string_pretty(&config).unwrap().as_bytes())

core/src/config/mod.rs

@@ -12,7 +12,7 @@ pub struct Config {
     pub quiet: Option<bool>,
     pub verbose: Option<bool>,
     pub index: Option<Vec<Index>>,
-    pub auth: Option<Vec<AuthSource>>,
+    // pub auth: Option<Vec<AuthSource>>,
 }
 
 impl Config {
@@ -21,9 +21,9 @@ impl Config {
         self.verbose = self.verbose.or(config.verbose);
         extend_option_vec(&mut self.index, config.index);
 
-        if let Some(auth) = config.auth {
-            self.auth = Some(auth.clone());
-        }
+        // if let Some(auth) = config.auth {
+        //     self.auth = Some(auth.clone());
+        // }
     }
 
     pub fn index_urls(
@@ -144,7 +144,7 @@ mod tests {
                 url: "http://www.example.com".to_string(),
                 ..Default::default()
             }]),
-            auth: None,
+            // auth: None,
         };
         defaults.merge(config.clone());
 

sysand/tests/cfg_base.rs

@@ -32,7 +32,7 @@ fn cfg_set_quiet() -> Result<(), Box<dyn std::error::Error>> {
         quiet: Some(true),
         verbose: None,
         index: None,
-        auth: None,
+        // auth: None,
     })?;
 
     let out_quiet_local_config =

sysand/tests/cli_info.rs

@@ -330,18 +330,9 @@ fn info_basic_http_url_auth() -> Result<(), Box<dyn Error>> {
         ["info", "--iri", &server.url()],
         None,
         &IndexMap::from([
-            (
-                "SYSAND_CRED_TEST".to_string(),
-                "http://127.0.0.1:*/**".to_string(),
-            ),
-            (
-                "SYSAND_CRED_TEST_BASIC_USER".to_string(),
-                "user_1234".to_string(),
-            ),
-            (
-                "SYSAND_CRED_TEST_BASIC_PASS".to_string(),
-                "pass_4321".to_string(),
-            ),
+            ("SYSAND_CRED_TEST", "http://127.0.0.1:*/**"),
+            ("SYSAND_CRED_TEST_BASIC_USER", "user_1234"),
+            ("SYSAND_CRED_TEST_BASIC_PASS", "pass_4321"),
         ]),
     )?;
 
@@ -870,19 +861,11 @@ fn info_multi_index_url_auth() -> Result<(), Box<dyn Error>> {
         .expect(2) // TODO: Reduce this to 1
         .create();
 
+    let server_pattern = format!("http://{}/**", server.host_with_port());
     let auth_env = IndexMap::from([
-        (
-            "SYSAND_CRED_TEST".to_string(),
-            format!("http://{}/**", server.host_with_port()),
-        ),
-        (
-            "SYSAND_CRED_TEST_BASIC_USER".to_string(),
-            "user_1234".to_string(),
-        ),
-        (
-            "SYSAND_CRED_TEST_BASIC_PASS".to_string(),
-            "pass_4321".to_string(),
-        ),
+        ("SYSAND_CRED_TEST", server_pattern.as_ref()),
+        ("SYSAND_CRED_TEST_BASIC_USER", "user_1234"),
+        ("SYSAND_CRED_TEST_BASIC_PASS", "pass_4321"),
     ]);
 
     let (_, _, out) = run_sysand_with(

sysand/tests/common/mod.rs

@@ -6,13 +6,13 @@ use camino_tempfile::Utf8TempDir;
 use indexmap::IndexMap;
 #[cfg(not(target_os = "windows"))]
 use rexpect::session::{PtySession, spawn_command};
-#[cfg(not(target_os = "windows"))]
-use std::os::unix::process::ExitStatusExt;
 use std::{
     error::Error,
     io::Write,
     process::{Command, Output},
 };
+#[cfg(not(target_os = "windows"))]
+use std::{ffi::OsStr, os::unix::process::ExitStatusExt};
 
 pub fn fixture_path(name: &str) -> Utf8PathBuf {
     let mut path = Utf8PathBuf::from(env!("CARGO_MANIFEST_DIR"));
@@ -26,7 +26,7 @@ pub fn sysand_cmd_in_with<'a, I: IntoIterator<Item = &'a str>>(
     cwd: &Utf8Path,
     args: I,
     cfg: Option<&str>,
-    env: &IndexMap<String, String>,
+    env: &IndexMap<impl AsRef<OsStr>, impl AsRef<OsStr>>,
 ) -> Result<Command, Box<dyn Error>> {
     let cfg_args = if let Some(config) = cfg {
         let config_path = cwd.join("sysand.toml");
@@ -60,7 +60,7 @@ pub fn sysand_cmd_in<'a, I: IntoIterator<Item = &'a str>>(
     args: I,
     cfg: Option<&str>,
 ) -> Result<Command, Box<dyn Error>> {
-    sysand_cmd_in_with(cwd, args, cfg, &IndexMap::default())
+    sysand_cmd_in_with(cwd, args, cfg, &IndexMap::<&str, &str>::default())
 }
 
 /// Creates a temporary directory and returns the tuple of the temporary
@@ -78,7 +78,7 @@ pub fn new_temp_cwd() -> Result<(Utf8TempDir, Utf8PathBuf), Box<dyn Error>> {
 pub fn sysand_cmd<'a, I: IntoIterator<Item = &'a str>>(
     args: I,
     cfg: Option<&str>,
-    env: &IndexMap<String, String>,
+    env: &IndexMap<impl AsRef<OsStr>, impl AsRef<OsStr>>,
 ) -> Result<(Utf8TempDir, Utf8PathBuf, Command), Box<dyn Error>> {
     // NOTE had trouble getting test-temp-dir crate working, but would be better
     let (temp_dir, cwd) = new_temp_cwd()?;
@@ -91,7 +91,7 @@ pub fn run_sysand_in_with<'a, I: IntoIterator<Item = &'a str>>(
     cwd: &Utf8Path,
     args: I,
     cfg: Option<&str>,
-    env: &IndexMap<String, String>,
+    env: &IndexMap<impl AsRef<OsStr>, impl AsRef<OsStr>>,
 ) -> Result<Output, Box<dyn Error>> {
     Ok(sysand_cmd_in_with(cwd, args, cfg, env)?.output()?)
 }
@@ -107,7 +107,7 @@ pub fn run_sysand_in<'a, I: IntoIterator<Item = &'a str>>(
 pub fn run_sysand_with<'a, I: IntoIterator<Item = &'a str>>(
     args: I,
     cfg: Option<&str>,
-    env: &IndexMap<String, String>,
+    env: &IndexMap<impl AsRef<OsStr>, impl AsRef<OsStr>>,
 ) -> Result<(Utf8TempDir, Utf8PathBuf, Output), Box<dyn Error>> {
     let (temp_dir, cwd, mut cmd) = sysand_cmd(args /*, stdin*/, cfg, env)?;
 
@@ -118,7 +118,7 @@ pub fn run_sysand<'a, I: IntoIterator<Item = &'a str>>(
     args: I,
     cfg: Option<&str>,
 ) -> Result<(Utf8TempDir, Utf8PathBuf, Output), Box<dyn Error>> {
-    run_sysand_with(args, cfg, &IndexMap::default())
+    run_sysand_with(args, cfg, &IndexMap::<&str, &str>::default())
 }
 
 // TODO: Figure out how to do interactive tests on Windows.
@@ -140,7 +140,7 @@ pub fn run_sysand_interactive_with<'a, I: IntoIterator<Item = &'a str>>(
     args: I,
     timeout_ms: Option<u64>,
     cfg: Option<&str>,
-    env: &IndexMap<String, String>,
+    env: &IndexMap<impl AsRef<OsStr>, impl AsRef<OsStr>>,
 ) -> Result<(Utf8TempDir, Utf8PathBuf, PtySession), Box<dyn Error>> {
     let (temp_dir, cwd, cmd) = sysand_cmd(args, cfg, env)?;
 
@@ -153,7 +153,7 @@ pub fn run_sysand_interactive<'a, I: IntoIterator<Item = &'a str>>(
     timeout_ms: Option<u64>,
     cfg: Option<&str>,
 ) -> Result<(Utf8TempDir, Utf8PathBuf, PtySession), Box<dyn Error>> {
-    run_sysand_interactive_with(args, timeout_ms, cfg, &IndexMap::default())
+    run_sysand_interactive_with(args, timeout_ms, cfg, &IndexMap::<&str, &str>::default())
 }
 
 // TODO: Figure out how to do interactive tests on Windows.