fix: errors when using untrimmed urls

Author: tangowithfoxtrot

crates/bws/src/cli.rs

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use bitwarden_cli::Color;
-use clap::{ArgGroup, Parser, Subcommand, ValueEnum};
+use clap::{builder::ValueParser, ArgGroup, Parser, Subcommand, ValueEnum};
 use clap_complete::Shell;
 use uuid::Uuid;
 
@@ -63,10 +63,18 @@ pub(crate) struct Cli {
     #[arg(short = 'p', long, global = true, env = PROFILE_KEY_VAR_NAME, help="Profile to use from the config file")]
     pub(crate) profile: Option<String>,
 
-    #[arg(short = 'u', long, global = true, env = SERVER_URL_KEY_VAR_NAME, help="Override the server URL from the config file")]
+    #[arg(short = 'u', long, global = true, env = SERVER_URL_KEY_VAR_NAME, help="Override the server URL from the config file", value_parser = ValueParser::new(url_parser) )]
     pub(crate) server_url: Option<String>,
 }
 
+fn url_parser(value: &str) -> Result<String, String> {
+    if value.starts_with("http://") || value.starts_with("https://") {
+        Ok(value.trim_end_matches('/').into())
+    } else {
+        Err(format!("'{value}' is not a valid URL"))
+    }
+}
+
 #[derive(Subcommand, Debug)]
 pub(crate) enum Commands {
     #[command(long_about = "Configure the CLI", arg_required_else_help(true))]

crates/bws/src/config.rs

@@ -90,7 +90,12 @@ pub(crate) fn update_profile(
     let mut config = load_config(config_file, false)?;
 
     let p = config.profiles.entry(profile).or_default();
-    name.update_profile_value(p, value);
+
+    if value.starts_with("http://") || value.starts_with("https://") {
+        name.update_profile_value(p, value.trim_end_matches('/').to_string());
+    } else {
+        name.update_profile_value(p, value);
+    }
 
     write_config(config, config_file)?;
     Ok(())
@@ -172,7 +177,7 @@ impl Config {
 
 #[cfg(test)]
 mod tests {
-    use std::io::Write;
+    use std::{io::Write, process::Command};
 
     use tempfile::NamedTempFile;
 
@@ -214,4 +219,64 @@ mod tests {
             c.unwrap().profiles["default"].server_base.as_ref().unwrap()
         );
     }
+
+    #[test]
+    fn config_trims_trailing_forward_slashes_in_urls() {
+        let tmpfile = NamedTempFile::new().unwrap();
+        write!(tmpfile.as_file(), "[profiles.default]").unwrap();
+
+        let _ = update_profile(
+            Some(tmpfile.as_ref()),
+            "default".to_owned(),
+            ProfileKey::server_base,
+            "https://vault.bitwarden.com//////".to_owned(),
+        );
+
+        let _ = update_profile(
+            Some(tmpfile.as_ref()),
+            "default".to_owned(),
+            ProfileKey::server_api,
+            "https://api.bitwarden.com/".to_owned(),
+        );
+
+        let _ = update_profile(
+            Some(tmpfile.as_ref()),
+            "default".to_owned(),
+            ProfileKey::server_identity,
+            "https://identity.bitwarden.com/".to_owned(),
+        );
+
+        let c = load_config(Some(Path::new(tmpfile.as_ref())), true).unwrap();
+        assert_eq!(
+            "https://vault.bitwarden.com",
+            c.profiles["default"].server_base.as_ref().unwrap()
+        );
+        assert_eq!(
+            "https://api.bitwarden.com",
+            c.profiles["default"].server_api.as_ref().unwrap()
+        );
+        assert_eq!(
+            "https://identity.bitwarden.com",
+            c.profiles["default"].server_identity.as_ref().unwrap()
+        );
+    }
+
+    #[test]
+    fn config_does_not_trim_forward_slashes_in_non_url_values() {
+        let tmpfile = NamedTempFile::new().unwrap();
+        write!(tmpfile.as_file(), "[profiles.default]").unwrap();
+
+        let _ = update_profile(
+            Some(tmpfile.as_ref()),
+            "default".to_owned(),
+            ProfileKey::state_dir,
+            "/dev/null/".to_owned(),
+        );
+
+        let c = load_config(Some(Path::new(tmpfile.as_ref())), true).unwrap();
+        assert_eq!(
+            "/dev/null/",
+            c.profiles["default"].state_dir.as_ref().unwrap()
+        );
+    }
 }