Try to grab real ssh username from system if it not used for connection directly

Author: penguinolog

exec_helpers/_ssh_client_base.py

@@ -22,10 +22,13 @@
 import concurrent.futures
 import copy
 import datetime
+import getpass
 import logging
+import os
 import shlex
 import socket
 import stat
+import sys
 import time
 import typing
 import warnings
@@ -292,9 +295,11 @@ def __init__(
 
         # Init super with host and real port and username
         mod_name = "exec_helpers" if self.__module__.startswith("exec_helpers") else self.__module__
+        log_username: typing.Optional[str] = self.__get_user_for_log(real_auth)
+
         super(SSHClientBase, self).__init__(
             logger=logging.getLogger(f"{mod_name}.{self.__class__.__name__}").getChild(
-                f"({real_auth.username}@{host}:{self.__port})"
+                f"({log_username}@{host}:{self.__port})"
             )
         )
 
@@ -310,6 +315,20 @@ def __init__(
 
         self.__connect()
 
+    @staticmethod
+    def __get_user_for_log(real_auth: ssh_auth.SSHAuth) -> typing.Optional[str]:  # pragma: no cover
+        if real_auth.username is not None:
+            return real_auth.username
+        # noinspection PyBroadException
+        try:
+            if sys.platform != "win32":
+                import pwd  # pylint: disable=import-outside-toplevel
+
+                return pwd.getpwuid(os.getuid()).pw_name  # Correct for not windows only
+            return getpass.getuser()
+        except Exception:
+            return None
+
     def __rebuild_ssh_config(self) -> None:
         """Rebuild main ssh config from available information."""
         self.__ssh_config[self.hostname] = self.__ssh_config[self.hostname].overridden_by(
@@ -514,6 +533,7 @@ def __del__(self) -> None:
 
     def __enter__(self) -> "SSHClientBase":  # pylint: disable=useless-super-delegation
         """Get context manager."""
+        # noinspection PyTypeChecker
         return super().__enter__()
 
     def __exit__(self, exc_type: typing.Any, exc_val: typing.Any, exc_tb: typing.Any) -> None:

exec_helpers/async_api/api.py

@@ -54,12 +54,14 @@ def __init__(self, conn: "ExecHelper", path: typing.Optional[typing.Union[str, p
         super().__init__(conn=conn, path=path)
 
     async def __aenter__(self) -> None:
+        # noinspection PyUnresolvedReferences
         await self._conn.__aenter__()
         self._chroot_status = self._conn._chroot_path
         self._conn._chroot_path = self._path
 
     async def __aexit__(self, exc_type: typing.Any, exc_val: typing.Any, exc_tb: typing.Any) -> None:
         self._conn._chroot_path = self._chroot_status
+        # noinspection PyUnresolvedReferences
         await self._conn.__aexit__(exc_type=exc_type, exc_val=exc_val, exc_tb=exc_tb)
 
 

exec_helpers/async_api/subprocess_runner.py

@@ -102,10 +102,12 @@ def __init__(
 
     async def __aenter__(self) -> "Subprocess":
         """Async context manager."""
+        # noinspection PyTypeChecker
         return await super().__aenter__()
 
     def __enter__(self) -> "Subprocess":  # pylint: disable=useless-super-delegation
         """Get context manager."""
+        # noinspection PyTypeChecker
         return super().__enter__()
 
     async def _exec_command(  # type: ignore

exec_helpers/subprocess_runner.py

@@ -99,6 +99,7 @@ def __init__(self, log_mask_re: typing.Optional[str] = None,) -> None:
 
     def __enter__(self) -> "Subprocess":  # pylint: disable=useless-super-delegation
         """Get context manager."""
+        # noinspection PyTypeChecker
         return super().__enter__()
 
     def _exec_command(  # type: ignore