Change AuthPassthrough::fetch_hah to use Address username

Author: magec

src/auth_passthrough.rs

@@ -54,33 +54,28 @@ impl AuthPassthrough {
         None
     }
 
-    /// Connects to server and executes auth_query for the specidief user.
-    /// If the response is a row with two columns containing the user
-    /// and its MD5 hash, the hash returned.
+    /// Connects to server and executes auth_query for the specified address.
+    /// If the response is a row with two columns containing the username set in the address.
+    /// and its MD5 hash, the MD5 hash returned.
     ///
     /// Note that the query is executed, changing $1 with the name of the user
     /// this is so we only hold in memory (and transfer) the least amount of 'sensitive' data.
     /// Also, it is compatible with pgbouncer.
     ///
     /// # Arguments
     ///
-    /// * `address` - An Address of the server we want to connect to.
-    /// * `user`    - A user that will be used to obtain the hash.
+    /// * `address` - An Address of the server we want to connect to. The username for the hash will be obtained from this value.
     ///
     /// # Examples
     ///
     /// ```
     /// use pgcat::auth_passthrough::AuthPassthrough;
     /// use pgcat::config::Address;
     /// let auth_passthrough = AuthPassthrough::new("SELECT * FROM public.user_lookup('$1');", "postgres", "postgres", "postgres");
-    /// auth_passthrough.fetch_hash(&Address::default(), "foo");
+    /// auth_passthrough.fetch_hash(&Address::default());
     /// ```
     ///
-    pub async fn fetch_hash(
-        &self,
-        address: &crate::config::Address,
-        user: &str,
-    ) -> Result<String, Error> {
+    pub async fn fetch_hash(&self, address: &crate::config::Address) -> Result<String, Error> {
         let auth_user = crate::config::User {
             username: self.user.clone(),
             password: Some(self.password.clone()),
@@ -89,6 +84,7 @@ impl AuthPassthrough {
         };
 
         let client_server_map: ClientServerMap = Arc::new(Mutex::new(HashMap::new()));
+        let user = &address.username;
 
         debug!("Connecting to server to obtain auth hashes.");
         match Server::startup(

src/pool.rs

@@ -234,7 +234,7 @@ impl ConnectionPool {
                         // TODO: Make it server dependant.
                         let mut auth_hash = None;
                         if let Some(apt) = auth_passthrough.as_ref() {
-                            match apt.fetch_hash(&address, &user.username).await {
+                            match apt.fetch_hash(&address).await {
 				Ok(ok) => {
 				    if let Some(pool_auth_hash_value) = pool_auth_hash {
 					if ok != pool_auth_hash_value {