From 784b5fd79b071937ca1ade12caf9be291b53dff6 Mon Sep 17 00:00:00 2001
From: khai96_ <hvksmr1996@gmail.com>
Date: Thu, 16 May 2019 16:53:27 +0700
Subject: Make some changes

---
 src/args.rs | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'src/args.rs')

diff --git a/src/args.rs b/src/args.rs
index 4851b41..0ec8a22 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -41,7 +41,7 @@ struct CLIArgs {
     /// Set authentication. Currently supported formats:
     /// username:password, username:sha256:hash, username:sha512:hash
     #[structopt(short = "a", long = "auth", parse(try_from_str = "parse_auth"))]
-    auth: Option<auth::RequiredAuth>,
+    auth: Vec<auth::RequiredAuth>,
 
     /// Generate a random 6-hexdigit route
     #[structopt(long = "random-route")]
@@ -77,21 +77,8 @@ fn parse_interface(src: &str) -> Result<IpAddr, std::net::AddrParseError> {
     src.parse::<IpAddr>()
 }
 
-/// Parse a string of multiple authentication requirements
+/// Parse authentication requirement
 fn parse_auth(src: &str) -> Result<auth::RequiredAuth, ContextualError> {
-    let required_auth = src
-        .split_whitespace()
-        .map(parse_single_auth)
-        .collect::<Result<Vec<_>, ContextualError>>()?
-        .iter()
-        .cloned()
-        .collect::<auth::RequiredAuth>();
-
-    Ok(required_auth)
-}
-
-/// Parse a single authentication requirement
-fn parse_single_auth(src: &str) -> Result<(String, auth::RequiredAuthPassword), ContextualError> {
     let mut split = src.splitn(3, ':');
     let invalid_auth_format = Err(ContextualError::InvalidAuthFormat);
 
@@ -132,7 +119,10 @@ fn parse_single_auth(src: &str) -> Result<(String, auth::RequiredAuthPassword),
         auth::RequiredAuthPassword::Plain(second_part.to_owned())
     };
 
-    Ok((username.to_owned(), password))
+    Ok(auth::RequiredAuth {
+        username: username.to_owned(),
+        password,
+    })
 }
 
 /// Parses the command line arguments
-- 
cgit v1.2.3