Add support for reading passwords from .pgpass

This largely mirrors libpq's behaviour with respect to ~/.pgpass.

Fixes: #267.

Author: elprans

asyncpg/__init__.py

@@ -15,4 +15,4 @@
 __all__ = ('connect', 'create_pool', 'Record', 'Connection') + \
           exceptions.__all__  # NOQA
 
-__version__ = '0.15.0'
+__version__ = '0.16.0.dev0'

asyncpg/compat.py

@@ -7,10 +7,13 @@
 
 import functools
 import os
+import pathlib
+import platform
 import sys
 
 
 PY_36 = sys.version_info >= (3, 6)
+SYSTEM = platform.uname().system
 
 
 if sys.version_info < (3, 5, 2):
@@ -45,3 +48,21 @@ def fspath(path):
                     type(path).__name__
                 )
             )
+
+
+if SYSTEM == 'Windows':
+    import ctypes.wintypes
+
+    CSIDL_APPDATA = 0x001a
+
+    def get_pg_home_directory() -> pathlib.Path:
+        buf = ctypes.create_unicode_buffer(ctypes.wintypes.MAX_PATH)
+        r = ctypes.windll.shell32.SHGetFolderPathW(0, CSIDL_APPDATA, 0, 0, buf)
+        if not r:
+            return None
+        else:
+            return pathlib.Path(buf.value)
+
+else:
+    def get_pg_home_directory() -> pathlib.Path:
+        return pathlib.Path.home()

asyncpg/connect_utils.py

@@ -9,12 +9,18 @@
 import collections
 import getpass
 import os
+import pathlib
 import platform
+import re
 import socket
+import stat
 import struct
 import time
+import typing
 import urllib.parse
+import warnings
 
+from . import compat
 from . import exceptions
 from . import protocol
 
@@ -44,9 +50,92 @@
 _system = platform.uname().system
 
 
+if _system == 'Windows':
+    PGPASSFILE = 'pgpass.conf'
+else:
+    PGPASSFILE = '.pgpass'
+
+
+def _read_password_file(passfile: pathlib.Path) \
+        -> typing.List[typing.Tuple[str, ...]]:
+
+    if not passfile.is_file():
+        warnings.warn(
+            'password file {!r} is not a plain file'.format(passfile))
+
+        return None
+
+    if _system != 'Windows':
+        if passfile.stat().st_mode & (stat.S_IRWXG | stat.S_IRWXO):
+            warnings.warn(
+                'password file {!r} has group or world access; '
+                'permissions should be u=rw (0600) or less'.format(passfile))
+
+            return None
+
+    passtab = []
+
+    try:
+        with passfile.open('rt') as f:
+            for line in f:
+                line = line.strip()
+                if not line or line.startswith('#'):
+                    # Skip empty lines and comments.
+                    continue
+                # Backslash escapes both itself and the colon,
+                # which is a record separator.
+                line = line.replace(R'\\', '\n')
+                passtab.append(tuple(
+                    p.replace('\n', R'\\')
+                    for p in re.split(r'(?<!\\):', line, maxsplit=4)
+                ))
+    except IOError:
+        pass
+
+    return passtab
+
+
+def _read_password_from_pgpass(
+        *, passfile: typing.Optional[pathlib.Path],
+        hosts: typing.List[typing.Union[str, typing.Tuple[str, int]]],
+        port: int, database: str, user: str):
+    """Parse the pgpass file and return the matching password.
+
+    :return:
+        Password string, if found, ``None`` otherwise.
+    """
+
+    if not passfile.exists():
+        return None
+
+    passtab = _read_password_file(passfile)
+    if not passtab:
+        return None
+
+    for host in hosts:
+        if host.startswith('/'):
+            # Unix sockets get normalized into 'localhost'
+            host = 'localhost'
+
+        for phost, pport, pdatabase, puser, ppassword in passtab:
+            if phost != '*' and phost != host:
+                continue
+            if pport != '*' and pport != str(port):
+                continue
+            if pdatabase != '*' and pdatabase != database:
+                continue
+            if puser != '*' and puser != user:
+                continue
+
+            # Found a match.
+            return ppassword
+
+    return None
+
+
 def _parse_connect_dsn_and_args(*, dsn, host, port, user,
-                                password, database, ssl, connect_timeout,
-                                server_settings):
+                                password, passfile, database, ssl,
+                                connect_timeout, server_settings):
     if host is not None and not isinstance(host, str):
         raise TypeError(
             'host argument is expected to be str, got {!r}'.format(
@@ -113,6 +202,11 @@ def _parse_connect_dsn_and_args(*, dsn, host, port, user,
                 if password is None:
                     password = val
 
+            if 'passfile' in query:
+                val = query.pop('passfile')
+                if passfile is None:
+                    passfile = val
+
             if query:
                 if server_settings is None:
                     server_settings = query
@@ -123,10 +217,14 @@ def _parse_connect_dsn_and_args(*, dsn, host, port, user,
     # https://www.postgresql.org/docs/current/static/libpq-envars.html
     # Note that env values may be an empty string in cases when
     # the variable is "unset" by setting it to an empty value
-    #
+    # `auth_hosts` is the version of host information for the purposes
+    # of reading the pgpass file.
+    auth_hosts = None
     if host is None:
         host = os.getenv('PGHOST')
         if not host:
+            auth_hosts = ['localhost']
+
             if _system == 'Windows':
                 host = ['localhost']
             else:
@@ -137,6 +235,9 @@ def _parse_connect_dsn_and_args(*, dsn, host, port, user,
     if not isinstance(host, list):
         host = [host]
 
+    if auth_hosts is None:
+        auth_hosts = host
+
     if port is None:
         port = os.getenv('PGPORT')
         if port:
@@ -168,6 +269,24 @@ def _parse_connect_dsn_and_args(*, dsn, host, port, user,
         raise exceptions.InterfaceError(
             'could not determine database name to connect to')
 
+    if password is None:
+        if passfile is None:
+            passfile = os.getenv('PGPASSFILE')
+
+        if passfile is None:
+            homedir = compat.get_pg_home_directory()
+            if homedir:
+                passfile = homedir / PGPASSFILE
+            else:
+                passfile = None
+        else:
+            passfile = pathlib.Path(passfile)
+
+        if passfile is not None:
+            password = _read_password_from_pgpass(
+                hosts=auth_hosts, port=port, database=database, user=user,
+                passfile=passfile)
+
     addrs = []
     for h in host:
         if h.startswith('/'):
@@ -206,8 +325,9 @@ def _parse_connect_dsn_and_args(*, dsn, host, port, user,
     return addrs, params
 
 
-def _parse_connect_arguments(*, dsn, host, port, user, password, database,
-                             timeout, command_timeout, statement_cache_size,
+def _parse_connect_arguments(*, dsn, host, port, user, password, passfile,
+                             database, timeout, command_timeout,
+                             statement_cache_size,
                              max_cached_statement_lifetime,
                              max_cacheable_statement_size,
                              ssl, server_settings):
@@ -237,7 +357,7 @@ def _parse_connect_arguments(*, dsn, host, port, user, password, database,
 
     addrs, params = _parse_connect_dsn_and_args(
         dsn=dsn, host=host, port=port, user=user,
-        password=password, ssl=ssl,
+        password=password, passfile=passfile, ssl=ssl,
         database=database, connect_timeout=timeout,
         server_settings=server_settings)
 

asyncpg/connection.py

@@ -1382,7 +1382,7 @@ async def _do_execute(self, query, executor, timeout, retry=True):
 
 async def connect(dsn=None, *,
                   host=None, port=None,
-                  user=None, password=None,
+                  user=None, password=None, passfile=None,
                   database=None,
                   loop=None,
                   timeout=60,
@@ -1424,6 +1424,11 @@ async def connect(dsn=None, *,
     :param password:
         password used for authentication
 
+    :param passfile:
+        the name of the file used to store passwords
+        (defaults to ``~/.pgpass``, or ``%APPDATA%\postgresql\pgpass.conf``
+         on Windows)
+
     :param loop:
         An asyncio event loop instance.  If ``None``, the default
         event loop will be used.
@@ -1489,6 +1494,10 @@ class of the returned connection object.  Must be a subclass of
     .. versionadded:: 0.11.0
        Added ``connection_class`` parameter.
 
+    .. versionadded:: 0.16.0
+       Added ``passfile`` parameter
+       (and support for password files in general).
+
     .. _SSLContext: https://docs.python.org/3/library/ssl.html#ssl.SSLContext
     .. _create_default_context: https://docs.python.org/3/library/ssl.html#\
                                 ssl.create_default_context
@@ -1503,7 +1512,8 @@ class of the returned connection object.  Must be a subclass of
 
     return await connect_utils._connect(
         loop=loop, timeout=timeout, connection_class=connection_class,
-        dsn=dsn, host=host, port=port, user=user, password=password,
+        dsn=dsn, host=host, port=port, user=user,
+        password=password, passfile=passfile,
         ssl=ssl, database=database,
         server_settings=server_settings,
         command_timeout=command_timeout,