Merge pull request #530 from wolfv/fix_starlette

fix compatibility with latest starlette
mamba-org · May 11, 2022 · f094ab2 · f094ab2
2 parents 59adbfd + f40ab6f
commit f094ab2
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/quetz/authentication/pam.py b/quetz/authentication/pam.py
@@ -147,6 +147,10 @@ async def authenticate(
             if data is None:
                 return None
 
+            host = None
+            if request.client:
+                host = request.client.host
+
             username = data['username']
             try:
                 pamela.authenticate(
@@ -156,12 +160,7 @@ async def authenticate(
                     encoding=self.encoding,
                 )
             except pamela.PAMError as e:
-                logger.warning(
-                    "PAM Authentication failed (%s@%s): %s",
-                    username,
-                    request.client.host,
-                    e,
-                )
+                logger.warning(f"PAM Authentication failed ({username}@{host}): {e}")
                 return None
 
             if self.check_account:
@@ -170,12 +169,7 @@ async def authenticate(
                         username, service=self.service, encoding=self.encoding
                     )
                 except pamela.PAMError as e:
-                    logger.warning(
-                        "PAM Account Check failed (%s@%s): %s",
-                        username,
-                        request.client.host,
-                        e,
-                    )
+                    logger.warning(f"PAM Account Check failed ({username}@{host}): {e}")
                     return None
 
             return username