Read password from PassFile when connecting.

Use PassFile to retrieve a password when one is not retrieved by other means.
The PassFile setting was already passed to connect() but was never read.

Author: m000

web/pgadmin/utils/driver/psycopg3/connection.py

@@ -17,8 +17,8 @@
 import secrets
 import datetime
 import asyncio
-import copy
 from collections import deque
+from pathlib import Path
 import psycopg
 from flask import g, current_app
 from flask_babel import gettext
@@ -281,7 +281,6 @@ def connect(self, **kwargs):
         password, encpass, is_update_password = \
             self._check_user_password(kwargs)
 
-        passfile = kwargs['passfile'] if 'passfile' in kwargs else None
         tunnel_password = kwargs['tunnel_password'] if 'tunnel_password' in \
                                                        kwargs else ''
 
@@ -313,6 +312,17 @@ def connect(self, **kwargs):
         if is_error:
             return False, errmsg
 
+        # Retrieve password from passfile if one has not been set yet.
+        passfile = Path(kwargs['passfile']) if 'passfile' in kwargs else None
+        if not password and passfile:
+            try:
+                password = passfile.read_text(encoding='utf-8').strip()
+            except (OSError, UnicodeDecodeError) as e:
+                return False, \
+                    _(
+                        "Failed to read PassFile.\nError: {0}"\
+                    ).format(str(e)
+
         # If no password credential is found then connect request might
         # come from Query tool, ViewData grid, debugger etc tools.
         # we will check for pgpass file availability from connection manager