Added trust auth to admin

Author: CommanderKeynes

src/client.rs

@@ -463,8 +463,8 @@ where
             .count()
             == 1;
 
-        // Kick any client that's not admin while we're in admin-only mode.
         if !admin && admin_only {
+        // Kick any client that's not admin while we're in admin-only mode.
             debug!(
                 "Rejecting non-admin connection to {} when in admin only mode",
                 pool_name
@@ -485,68 +485,69 @@ where
 
         // Authenticate admin user.
         let (transaction_mode, mut server_parameters) = if admin {
-            // Perform MD5 authentication.
+            let config = get_config();
             // TODO: Add SASL support.
-            let salt = md5_challenge(&mut write).await?;
-
-            let code = match read.read_u8().await {
-                Ok(p) => p,
-                Err(_) => {
-                    return Err(Error::ClientSocketError(
-                        "password code".into(),
-                        client_identifier,
-                    ))
-                }
-            };
+            // Perform MD5 authentication.
+            if let "md5" = config.general.admin_auth_type.as_str() {
+                let salt = md5_challenge(&mut write).await?;
 
-            // PasswordMessage
-            if code as char != 'p' {
-                return Err(Error::ProtocolSyncError(format!(
-                    "Expected p, got {}",
-                    code as char
-                )));
-            }
+                let code = match read.read_u8().await {
+                    Ok(p) => p,
+                    Err(_) => {
+                        return Err(Error::ClientSocketError(
+                            "password code".into(),
+                            client_identifier,
+                        ))
+                    }
+                };
 
-            let len = match read.read_i32().await {
-                Ok(len) => len,
-                Err(_) => {
-                    return Err(Error::ClientSocketError(
-                        "password message length".into(),
-                        client_identifier,
-                    ))
+                // PasswordMessage
+                if code as char != 'p' {
+                    return Err(Error::ProtocolSyncError(format!(
+                        "Expected p, got {}",
+                        code as char
+                    )));
                 }
-            };
 
-            let mut password_response = vec![0u8; (len - 4) as usize];
+                let len = match read.read_i32().await {
+                    Ok(len) => len,
+                    Err(_) => {
+                        return Err(Error::ClientSocketError(
+                            "password message length".into(),
+                            client_identifier,
+                        ))
+                    }
+                };
 
-            match read.read_exact(&mut password_response).await {
-                Ok(_) => (),
-                Err(_) => {
-                    return Err(Error::ClientSocketError(
-                        "password message".into(),
-                        client_identifier,
-                    ))
-                }
-            };
+                let mut password_response = vec![0u8; (len - 4) as usize];
 
-            let config = get_config();
+                match read.read_exact(&mut password_response).await {
+                    Ok(_) => (),
+                    Err(_) => {
+                        return Err(Error::ClientSocketError(
+                            "password message".into(),
+                            client_identifier,
+                        ))
+                    }
+                };
 
-            // Compare server and client hashes.
-            let password_hash = md5_hash_password(
-                &config.general.admin_username,
-                &config.general.admin_password,
-                &salt,
-            );
 
-            if password_hash != password_response {
-                let error = Error::ClientGeneralError("Invalid password".into(), client_identifier);
+                // Compare server and client hashes.
+                let password_hash = md5_hash_password(
+                    &config.general.admin_username,
+                    &config.general.admin_password,
+                    &salt,
+                );
 
-                warn!("{}", error);
-                wrong_password(&mut write, username).await?;
+                if password_hash != password_response {
+                    let error = Error::ClientGeneralError("Invalid password".into(), client_identifier);
 
-                return Err(error);
-            }
+                    warn!("{}", error);
+                    wrong_password(&mut write, username).await?;
 
+                    return Err(error);
+                }
+            }
             (false, generate_server_parameters_for_admin())
         }
         // Authenticate normal user.

src/config.rs

@@ -335,6 +335,7 @@ pub struct General {
 
     pub admin_username: String,
     pub admin_password: String,
+    pub admin_auth_type: String,
 
     #[serde(default = "General::default_validate_config")]
     pub validate_config: bool,
@@ -458,6 +459,7 @@ impl Default for General {
             verify_server_certificate: false,
             admin_username: String::from("admin"),
             admin_password: String::from("admin"),
+            admin_auth_type: String::from("md5"),
             validate_config: true,
             auth_query: None,
             auth_query_user: None,