Load passfile content on apply_pgpass

Author: V02460

sqlx-postgres/src/options/mod.rs

@@ -5,6 +5,7 @@ use std::path::{Path, PathBuf};
 
 pub use ssl_mode::PgSslMode;
 
+use crate::options::pgpass::PGPassFile;
 use crate::{connection::LogSettings, net::tls::CertificateInput};
 
 mod connect;
@@ -20,6 +21,7 @@ pub struct PgConnectOptions {
     pub(crate) socket: Option<PathBuf>,
     pub(crate) username: String,
     pub(crate) password: Option<String>,
+    pub(crate) passfile: PGPassFile,
     pub(crate) database: Option<String>,
     pub(crate) ssl_mode: PgSslMode,
     pub(crate) ssl_root_cert: Option<CertificateInput>,
@@ -74,6 +76,7 @@ impl PgConnectOptions {
             socket: None,
             username,
             password: var("PGPASSWORD").ok(),
+            passfile: PGPassFile::default(),
             database,
             ssl_root_cert: var("PGSSLROOTCERT").ok().map(CertificateInput::from),
             ssl_client_cert: var("PGSSLCERT").ok().map(CertificateInput::from),
@@ -94,14 +97,7 @@ impl PgConnectOptions {
     }
 
     pub(crate) fn apply_pgpass(mut self) -> Self {
-        if self.password.is_none() {
-            self.password = pgpass::load_password(
-                &self.host,
-                self.port,
-                &self.username,
-                self.database.as_deref(),
-            );
-        }
+        self.passfile = PGPassFile::load().unwrap_or_default();
 
         self
     }
@@ -531,7 +527,14 @@ impl PgConnectOptions {
         if self.password.is_some() {
             return self.password.as_deref().map(Cow::Borrowed);
         }
-        None
+        self.passfile
+            .password_if_matching(
+                &self.host,
+                self.port,
+                self.database.as_deref(),
+                &self.username,
+            )
+            .map(Cow::Owned)
     }
 
     /// Get the current database name.

sqlx-postgres/src/options/pgpass.rs

@@ -1,86 +1,100 @@
 use std::borrow::Cow;
 use std::env::var_os;
 use std::fs::File;
-use std::io::{BufRead, BufReader};
+use std::io::{BufRead, Read};
 use std::path::PathBuf;
 
-/// try to load a password from the various pgpass file locations
-pub fn load_password(
-    host: &str,
-    port: u16,
-    username: &str,
-    database: Option<&str>,
-) -> Option<String> {
-    let custom_file = var_os("PGPASSFILE");
-    if let Some(file) = custom_file {
-        if let Some(password) =
-            load_password_from_file(PathBuf::from(file), host, port, username, database)
-        {
-            return Some(password);
+/// PostgreSQL passfile content.
+#[derive(Clone, Debug, Default)]
+pub struct PGPassFile(String);
+
+impl PGPassFile {
+    /// Loads the first valid passfile discovered.
+    ///
+    /// Loading is attempted in the following order:
+    /// 1. Path given via the `PGPASSFILE` environment variable.
+    /// 2. Default path (`~/.pgpass` on Linux and
+    ///    `%APPDATA%/postgres/pgpass.conf` on Windows)
+    ///
+    /// If loading of any file fails, the function proceeds to the next.
+    /// Returns `None` in case no file can be loaded.
+    pub fn load() -> Option<Self> {
+        let custom_file = var_os("PGPASSFILE");
+        if let Some(file) = custom_file {
+            if let Some(password) = Self::load_from_file(PathBuf::from(file)) {
+                return Some(password);
+            }
         }
-    }
 
-    #[cfg(not(target_os = "windows"))]
-    let default_file = home::home_dir().map(|path| path.join(".pgpass"));
-    #[cfg(target_os = "windows")]
-    let default_file = {
-        use etcetera::BaseStrategy;
-
-        etcetera::base_strategy::Windows::new()
-            .ok()
-            .map(|basedirs| basedirs.data_dir().join("postgres").join("pgpass.conf"))
-    };
-    load_password_from_file(default_file?, host, port, username, database)
-}
+        #[cfg(not(target_os = "windows"))]
+        let default_file = home::home_dir().map(|path| path.join(".pgpass"));
+        #[cfg(target_os = "windows")]
+        let default_file = {
+            use etcetera::BaseStrategy;
+
+            etcetera::base_strategy::Windows::new()
+                .ok()
+                .map(|basedirs| basedirs.data_dir().join("postgres").join("pgpass.conf"))
+        };
+        Self::load_from_file(default_file?)
+    }
 
-/// try to extract a password from a pgpass file
-fn load_password_from_file(
-    path: PathBuf,
-    host: &str,
-    port: u16,
-    username: &str,
-    database: Option<&str>,
-) -> Option<String> {
-    let file = File::open(&path)
-        .map_err(|e| {
-            match e.kind() {
-                std::io::ErrorKind::NotFound => {
-                    tracing::debug!(
-                        path = %path.display(),
-                        "`.pgpass` file not found",
-                    );
-                }
-                _ => {
-                    tracing::warn!(
-                        path = %path.display(),
-                        "Failed to open `.pgpass` file: {e:?}",
-                    );
-                }
-            };
-        })
-        .ok()?;
-
-    #[cfg(target_os = "linux")]
-    {
-        use std::os::unix::fs::PermissionsExt;
-
-        // check file permissions on linux
-
-        let metadata = file.metadata().ok()?;
-        let permissions = metadata.permissions();
-        let mode = permissions.mode();
-        if mode & 0o77 != 0 {
-            tracing::warn!(
-                path = %path.display(),
-                permissions = format!("{mode:o}"),
-                "Ignoring path. Permissions are not strict enough",
-            );
-            return None;
+    /// Returns the PostgreSQL passfile loaded from the given path.
+    fn load_from_file(path: PathBuf) -> Option<Self> {
+        let mut file = File::open(&path)
+            .map_err(|e| {
+                match e.kind() {
+                    std::io::ErrorKind::NotFound => {
+                        tracing::debug!(
+                            path = %path.display(),
+                            "`.pgpass` file not found",
+                        );
+                    }
+                    _ => {
+                        tracing::warn!(
+                            path = %path.display(),
+                            "Failed to open `.pgpass` file: {e:?}",
+                        );
+                    }
+                };
+            })
+            .ok()?;
+
+        #[cfg(target_os = "linux")]
+        {
+            use std::os::unix::fs::PermissionsExt;
+
+            // check file permissions on linux
+
+            let metadata = file.metadata().ok()?;
+            let permissions = metadata.permissions();
+            let mode = permissions.mode();
+            if mode & 0o77 != 0 {
+                tracing::warn!(
+                    path = %path.display(),
+                    permissions = format!("{mode:o}"),
+                    "Ignoring path. Permissions are not strict enough",
+                );
+                return None;
+            }
         }
+
+        let mut passfile = Self::default();
+        file.read_to_string(&mut passfile.0).ok()?;
+
+        Some(passfile)
     }
 
-    let reader = BufReader::new(file);
-    load_password_from_reader(reader, host, port, username, database)
+    /// Returns the password matched by the given parameters.
+    pub fn password_if_matching(
+        &self,
+        hostname: &str,
+        port: u16,
+        database: Option<&str>,
+        username: &str,
+    ) -> Option<String> {
+        load_password_from_reader(self.0.as_bytes(), hostname, port, username, database)
+    }
 }
 
 fn load_password_from_reader(