fix(api): Fix panic that occurred when sentry-cli login called with --auth-token (#1893)

This PR fixes the bug in #1885 that led us to revert that commit. The bug, reported in #1888, caused the CLI to panic when the sentry-cli login command was called with the --auth-token argument.

We determined that the CLI panicked because the auth_token was being downcast to a String instead of to an AuthToken type when being read from the matches within the login command. This PR corrects the login command, so that the auth_token is correctly obtained from the matches as an AuthToken. We also checked whether the auth_token argument was being read as a String anywhere else in the code, and found that the login command was the only place the argument was being read as a String. Therefore, we would expect this PR to fix this class of bug completely.

Fixes GH-1859
Fixes GH-1888

Author: szokeasaurusrex

Cargo.lock

@@ -54,7 +54,7 @@ prettytable-rs = "0.10.0"
 proguard = { version = "5.0.0", features = ["uuid"] }
 r2d2 = "0.8.10"
 rayon = "1.6.1"
-regex = "1.7.1"
+regex = "1.7.3"
 runas = "1.0.0"
 rust-ini = "0.18.0"
 semver = "1.0.16"
@@ -83,7 +83,9 @@ chrono-tz = "0.8.4"
 insta = { version = "1.26.0", features = ["redactions", "yaml"] }
 mockito = "0.31.1"
 predicates = "2.1.5"
+rstest = "0.18.2"
 tempfile = "3.8.1"
+testing_logger = "0.1.1"
 trycmd = "0.14.11"
 
 [features]

Cargo.toml

@@ -6,6 +6,7 @@ use url::Url;
 
 use crate::api::Api;
 use crate::config::{Auth, Config};
+use crate::utils::auth_token::AuthToken;
 use crate::utils::ui::{prompt, prompt_to_continue};
 
 pub fn make_command(command: Command) -> Command {
@@ -18,9 +19,9 @@ pub fn make_command(command: Command) -> Command {
     )
 }
 
-fn update_config(config: &Config, token: &str) -> Result<()> {
+fn update_config(config: &Config, token: AuthToken) -> Result<()> {
     let mut new_cfg = config.clone();
-    new_cfg.set_auth(Auth::Token(token.to_string()))?;
+    new_cfg.set_auth(Auth::Token(token))?;
     new_cfg.save()?;
     Ok(())
 }
@@ -31,7 +32,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
         "{}/orgredirect/organizations/:orgslug/settings/auth-tokens/",
         config.get_base_url()?
     );
-    let predefined_token = matches.get_one::<String>("auth_token");
+    let predefined_token = matches.get_one::<AuthToken>("auth_token");
     let has_predefined_token = predefined_token.is_some();
 
     println!("This helps you signing in your sentry-cli with an authentication token.");
@@ -62,13 +63,13 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
     let mut token;
     loop {
         token = if let Some(token) = predefined_token {
-            token.to_string()
+            token.to_owned()
         } else {
-            prompt("Enter your token")?
+            prompt("Enter your token")?.into()
         };
 
         let test_cfg = config.make_copy(|cfg| {
-            cfg.set_auth(Auth::Token(token.to_string()))?;
+            cfg.set_auth(Auth::Token(token.clone()))?;
             Ok(())
         })?;
 
@@ -103,7 +104,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
         Config::from_cli_config()?
     };
 
-    update_config(&config_to_update, &token)?;
+    update_config(&config_to_update, token)?;
     println!();
     println!(
         "Stored token in {}",

src/commands/login.rs

@@ -12,6 +12,7 @@ use log::{debug, info, set_logger, set_max_level, LevelFilter};
 use crate::api::Api;
 use crate::config::{Auth, Config};
 use crate::constants::{ARCH, PLATFORM, VERSION};
+use crate::utils::auth_token::AuthToken;
 use crate::utils::logging::set_quiet_mode;
 use crate::utils::logging::Logger;
 use crate::utils::system::{init_backtrace, load_dotenv, print_error, QuietExit};
@@ -107,7 +108,7 @@ fn configure_args(config: &mut Config, matches: &ArgMatches) -> Result<()> {
         config.set_auth(Auth::Key(api_key.to_owned()))?;
     }
 
-    if let Some(auth_token) = matches.get_one::<String>("auth_token") {
+    if let Some(auth_token) = matches.get_one::<AuthToken>("auth_token") {
         config.set_auth(Auth::Token(auth_token.to_owned()))?;
     }
 
@@ -161,6 +162,7 @@ fn app() -> Command {
                 .value_name("AUTH_TOKEN")
                 .long("auth-token")
                 .global(true)
+                .value_parser(value_parser!(AuthToken))
                 .help("Use the given Sentry auth token."),
         )
         .arg(