Moved openssh config parsing to utils. Added key file and port to config parsing.

Author: Dan

pssh/pssh_client.py

@@ -116,7 +116,7 @@ def __init__(self, hosts,
         Exit code(s) will not be available immediately.
         
         >>> print output
-
+        
         ::
         
             {'myhost1': {'exit_code': None,

pssh/ssh_client.py

@@ -27,6 +27,7 @@
 from .exceptions import UnknownHostException, AuthenticationException, \
      ConnectionErrorException, SSHException
 from .constants import DEFAULT_RETRIES
+from .utils import read_openssh_config
 import logging
 
 host_logger = logging.getLogger('pssh.host_logger')
@@ -92,29 +93,17 @@ def __init__(self, host,
         the SSH agent
         :type allow_agent: bool
         """
-        ssh_config = paramiko.SSHConfig()
-        _ssh_config_file = os.path.sep.join([os.path.expanduser('~'),
-                                             '.ssh',
-                                             'config'])
-        # Load ~/.ssh/config if it exists to pick up username
-        # and host address if set
-        if os.path.isfile(_ssh_config_file):
-            ssh_config.parse(open(_ssh_config_file))
-        host_config = ssh_config.lookup(host)
-        resolved_address = (host_config['hostname'] if
-                            'hostname' in host_config
-                            else host)
-        _user = host_config['user'] if 'user' in host_config else None
+        host, _user, _port, _pkey = read_openssh_config(host)
         user = user if user else _user
         client = paramiko.SSHClient()
         client.set_missing_host_key_policy(paramiko.MissingHostKeyPolicy())
         self.forward_ssh_agent = forward_ssh_agent
         self.client = client
         self.user = user
         self.password = password
-        self.pkey = pkey
-        self.port = port if port else 22
-        self.host = resolved_address
+        self.pkey = pkey if pkey else _pkey
+        self.port = port if port else _port
+        self.host = host
         self.allow_agent = allow_agent
         if agent:
             self.client._agent = agent

pssh/utils.py

@@ -21,10 +21,11 @@
 
 import logging
 import gevent
+import os
 from paramiko.rsakey import RSAKey
 from paramiko.dsskey import DSSKey
 from paramiko.ecdsakey import ECDSAKey
-from paramiko import SSHException
+from paramiko import SSHException, SSHConfig
 
 host_logger = logging.getLogger('pssh.host_logger')
 logger = logging.getLogger('pssh')
@@ -64,6 +65,34 @@ def load_private_key(_pkey):
             return pkey
     logger.error("Failed to load private key using all available key types - giving up..")
 
+def read_openssh_config(_host, config_file=None):
+    """Parses user's OpenSSH config for per hostname configuration for
+    hostname, user, port and private key values
+
+    :param _host: Hostname to lookup in config"""
+    ssh_config = SSHConfig()
+    _ssh_config_file = config_file if config_file else \
+      os.path.sep.join([os.path.expanduser('~'),
+                        '.ssh', 'config'])
+    # Load ~/.ssh/config if it exists to pick up username
+    # and host address if set
+    if os.path.isfile(_ssh_config_file):
+        ssh_config.parse(open(_ssh_config_file))
+    host_config = ssh_config.lookup(_host)
+    host = (host_config['hostname'] if
+            'hostname' in host_config
+            else _host)
+    user = host_config['user'] if 'user' in host_config else None
+    port = int(host_config['port']) if 'port' in host_config else 22
+    pkey = None
+    # Try configured keys, pick first one that loads
+    if 'identityfile' in host_config:
+        for file_name in host_config['identityfile']:
+            pkey = load_private_key(file_name)
+            if pkey:
+                break
+    return host, user, port, pkey
+
 # def enable_pssh_logger():
 #     """Enable parallel-ssh's logger to stdout"""
 #     enable_logger(logger)

tests/test_ssh_client.py

@@ -286,5 +286,8 @@ def test_ssh_client_pty(self):
                             exit_code,))
         del client
 
+    def test_openssh_config(self):
+        pass
+
 if __name__ == '__main__':
     unittest.main()