password prompt, base-url doesn't need a flag anymore

Author: dylemma

Cargo.lock

@@ -12,6 +12,7 @@ serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
 reqwest = "0.8"
+rpassword = "2.0.0"
 
 [dependencies.nom]
 version = "3.2"

Cargo.toml

@@ -4,6 +4,7 @@ extern crate url;
 
 use clap::{Arg, ArgMatches, App};
 use reqwest::{RequestBuilder};
+use rpassword;
 use url::Url;
 
 /// Connection information for Code Dx.
@@ -63,10 +64,11 @@ impl ClientConfig {
             .arg(Arg::with_name("base-url")
                 .short("b")
                 .long("base-url")
-                .value_name("VALUE")
+                .value_name("BASE URL")
                 .help("Code Dx base url (e.g. 'https://localhost/codedx')")
                 .takes_value(true)
                 .required(true)
+                .index(1)
             )
             .arg(Arg::with_name("username")
                 .short("u")
@@ -101,29 +103,45 @@ impl ClientConfig {
             );
         let matches = get_matches(app);
 
+        // parse the base-url as a URI, then attempt to access the `path_segments_mut` to
+        // ensure that will work once we pass the base url to the api client code.
         let base_uri = match matches.value_of("base-url") {
             None => Err(ConfigError::MissingUrl),
-            Some(raw) => Url::parse(raw).map_err(|_| ConfigError::InvalidUrl),
+            Some(raw) => Url::parse(raw).map_err(|_| ConfigError::InvalidUrl).and_then(|mut url| {
+                let url_seems_ok = {
+                    let url_segments = url.path_segments_mut();
+                    match url_segments {
+                        Ok(_) => Ok(()),
+                        Err(_) => Err(ConfigError::InvalidUrl),
+                    }
+                };
+                url_seems_ok.map(|_| url)
+            }),
         };
 
-        let client_auth_info = match matches.value_of("api-key") {
-            Some(key) => Ok(ClientAuth::ApiKey(String::from(key))),
-            None => {
-                let username = matches.value_of("username").map(String::from);
-                let password = matches.value_of("password").map(String::from);
-                let foo = username.and_then(|u| {
-                    password.map(|p| {
-                        ClientAuth::Basic{ username: u, password: p }
-                    })
-                });
-                foo.ok_or_else(|| ConfigError::MissingAuth)
-            },
-        };
+        base_uri.and_then(|uri| {
 
-        let insecure = matches.is_present("insecure");
-        let no_prompt = matches.is_present("no-prompt");
+            // interpret the authentication values
+            let client_auth_info = match matches.value_of("api-key") {
+                Some(key) => Ok(ClientAuth::ApiKey(String::from(key))),
+                None => {
+                    let username = matches.value_of("username").map(String::from);
+                    let password = matches.value_of("password").map(String::from);
+                    let foo = username.and_then(|u| {
+                        password.or_else(|| {
+                            // prompt for the password without actually showing what the user types
+                            rpassword::prompt_password_stdout("password: ").ok()
+                        }).map(|p| {
+                            ClientAuth::Basic{ username: u, password: p }
+                        })
+                    });
+                    foo.ok_or_else(|| ConfigError::MissingAuth)
+                },
+            };
+
+            let insecure = matches.is_present("insecure");
+            let no_prompt = matches.is_present("no-prompt");
 
-        base_uri.and_then(|uri| {
             client_auth_info.map(|auth| {
                 ClientConfig {
                     base_url: uri,

src/config.rs

@@ -1,4 +1,5 @@
 extern crate reqwest;
+extern crate rpassword;
 extern crate serde;
 extern crate url;
 
@@ -32,7 +33,7 @@ fn main(){
         },
         Err(ConfigError::MissingAuth) => println!("Authorization info missing or incomplete. Either an API Key or a Username + Password must be provided"),
         Err(ConfigError::MissingUrl) => println!("Missing the Base URL"),
-        Err(ConfigError::InvalidUrl) => println!("Invalid Base URL"),
+        Err(ConfigError::InvalidUrl) => println!("Invalid Base URL. Did you forget 'http://' or 'https://' ?"),
     }
 }