Added host argument to all exceptions - resolves #116.

Updated copyright info.
Updated requirements, setup.py.
Updated manylinux wheel build, travis cfg.
Added tests for import backwards compatibility post refactor.

Author: Pan

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "libssh2"]
 	path = libssh2
-	url = https://github.com/libssh2/libssh2.git
+	url = https://github.com/ParallelSSH/libssh2.git

.travis.yml

@@ -24,6 +24,8 @@ install:
   - pip install -r requirements_dev.txt
 script:
   - export LD_LIBRARY_PATH=/usr/local/lib/x86_64-linux-gnu
+  # For testing SSH agent related functionality
+  - eval `ssh-agent -s`
   - nosetests --with-coverage --cover-package=pssh
   - flake8 pssh
   - cd doc; make html; cd ..
@@ -140,8 +142,7 @@ jobs:
     #       on:
     #         repo: ParallelSSH/parallel-ssh
     #         tags: true
-    - stage: build and deploy source and wheels
-      if: tag IS present
+    - stage: build wheels
       os: linux
       python: 3.6
       before_install: skip

Changelog.rst

@@ -1,6 +1,26 @@
 Change Log
 ============
 
+1.6.0
+++++++
+
+Changes
+--------
+
+* Upgrade embedded ``libssh2`` in binary wheels to latest version plus enhancements.
+* Adds support for ECDSA host keys for native client.
+* Adds support for SHA-256 host key fingerprints for native client.
+* Added SSH agent forwarding to native client, defaults to on as per paramiko client - ``forward_ssh_agent`` keyword parameter.
+* Windows wheels switched to OpenSSL back end for native client.
+* Windows wheels include zlib and have compression enabled for native client.
+
+Fixes
+------
+
+* Windows native client could not connect to newer SSH servers - thanks Pavel.
+
+Note - changes apply to binary wheels only. See building from source instructions to make system packages.
+
 1.5.5
 ++++++
 

ci/docker/manylinux/Dockerfile

@@ -1,29 +1,30 @@
 FROM quay.io/pypa/manylinux1_x86_64
 
-ENV CMAKE cmake-2.8.12.2-Linux-i386
-ENV OPENSSL openssl-1.0.2o
-ENV LIBSSH2 libssh2-1.8.0
+ENV CMAKE cmake-2.8.11.1-5.4.x86_64
+ENV OPENSSL openssl-1.0.2l
+ENV LIBSSH2_VER agent_fwd
 
 RUN yum install zlib-devel -y
 
-# Cmake
-RUN wget --no-check-certificate https://cmake.org/files/v2.8/${CMAKE}.tar.gz && \
-    tar -xzf ${CMAKE}.tar.gz && cp -af ${CMAKE}/share/* /usr/share/ && \
-    cp -af ${CMAKE}/bin/* /usr/bin/
+ADD https://github.com/ParallelSSH/libssh2/archive/${LIBSSH2_VER}.tar.gz libssh2.tar.gz
+ADD ${CMAKE}.rpm cmake.rpm
+ADD http://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz
+
+RUN rpm -i cmake.rpm
 
 # Openssl
-RUN wget --no-check-certificate http://www.openssl.org/source/${OPENSSL}.tar.gz && \
-    tar -xzf ${OPENSSL}.tar.gz && \
+RUN tar -xzf ${OPENSSL}.tar.gz && \
     cd ${OPENSSL} && \
     ./config --prefix=/usr --openssldir=/usr/openssl threads shared && \
     make -j4 && make install
 
 # Libssh2
-RUN wget --no-check-certificate https://www.libssh2.org/download/${LIBSSH2}.tar.gz && \
-    tar -xzf ${LIBSSH2}.tar.gz
+RUN tar -xzf libssh2.tar.gz && \
+    mkdir -p build_libssh2 && cd build_libssh2 && \
+    cmake ../libssh2-${LIBSSH2_VER} -DBUILD_SHARED_LIBS=ON -DENABLE_ZLIB_COMPRESSION=ON \
+    -DENABLE_CRYPT_NONE=ON -DENABLE_MAC_NONE=ON -DCMAKE_INSTALL_PREFIX=/usr && \
+    cmake --build . --config Release --target install
 
-RUN cd ${LIBSSH2} && cmake ../${LIBSSH2} -DBUILD_SHARED_LIBS=ON -DENABLE_ZLIB_COMPRESSION=ON \
-    -DENABLE_CRYPT_NONE=ON -DENABLE_MAC_NONE=ON -DCMAKE_INSTALL_PREFIX=/usr \
-    && cmake --build . --config Release --target install
+RUN rm -rf ${OPENSSL}* libssh2-agent_fwd build_libssh2
 
-RUN rm -rf ${CMAKE}* ${OPENSSL}* ${LIBSSH2}*
+VOLUME /var/cache

ci/docker/manylinux/cmake-2.8.11.1-5.4.x86_64.rpm

@@ -1,6 +1,6 @@
 # This file is part of parallel-ssh.
 
-# Copyright (C) 2014-2017 Panos Kittenis
+# Copyright (C) 2014-2018 Panos Kittenis.
 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

libssh2

@@ -1,6 +1,6 @@
 # This file is part of parallel-ssh.
 
-# Copyright (C) 2014-2017 Panos Kittenis
+# Copyright (C) 2014-2018 Panos Kittenis.
 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,32 +15,16 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-"""SSH agent module of ParallelSSH"""
+"""SSH agent module of parallel-ssh"""
 
 import paramiko.agent
 
 
 class SSHAgent(paramiko.agent.AgentSSH):
     """:py:class:`paramiko.agent.Agent` compatible class for programmatically
-    supplying an SSH agent"""
+    supplying an SSH agent."""
 
     def __init__(self):
-        """**Example Usage**
-
-        .. code-block:: python
-
-          from pssh.agent import SSHAgent
-          from pssh.utils import load_private_key
-          from pssh import ParallelSSHClient
-
-          agent = SSHAgent()
-          agent.add_key(load_private_key('my_private_key_filename'))
-          agent.add_key(load_private_key('my_other_private_key_filename'))
-          hosts = ['my_host', 'my_other_host']
-
-          client = ParallelSSHClient(hosts, agent=agent)
-          client.run_command('uname')
-        """
         paramiko.agent.AgentSSH.__init__(self)
         self._conn = None
         self.keys = []

pssh/__init__.py

@@ -1,4 +1,20 @@
-# flake8: noqa: F401
+# This file is part of parallel-ssh.
+
+# Copyright (C) 2014-2018 Panos Kittenis.
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation, version 2.1.
 
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# flake8: noqa: F401
 from .native.parallel import ParallelSSHClient
 from .native.single import SSHClient

pssh/agent.py

@@ -1,6 +1,6 @@
 # This file is part of parallel-ssh.
 
-# Copyright (C) 2014-2018 Panos Kittenis
+# Copyright (C) 2014-2018 Panos Kittenis and contributors.
 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -135,12 +135,7 @@ def get_output(self, cmd, output):
         try:
             (channel, host, stdout, stderr, stdin) = cmd.get()
         except Exception as ex:
-            try:
-                host = ex.args[1]
-            except IndexError:
-                logger.error("Got exception with no host argument - "
-                             "cannot update output data with %s", ex)
-                raise ex
+            host = ex.host
             self._update_host_output(
                 output, host, None, None, None, None, None, cmd, exception=ex)
             raise
@@ -264,9 +259,13 @@ def copy_file(self, local_file, remote_file, recurse=False, copy_args=None):
 
     def _copy_file(self, host, local_file, remote_file, recurse=False):
         """Make sftp client, copy file"""
-        self._make_ssh_client(host)
-        return self.host_clients[host].copy_file(local_file, remote_file,
-                                                 recurse=recurse)
+        try:
+            self._make_ssh_client(host)
+            return self.host_clients[host].copy_file(local_file, remote_file,
+                                                     recurse=recurse)
+        except Exception as ex:
+            ex.host = host
+            raise ex
 
     def copy_remote_file(self, remote_file, local_file, recurse=False,
                          suffix_separator='_', copy_args=None, **kwargs):
@@ -351,7 +350,11 @@ def copy_remote_file(self, remote_file, local_file, recurse=False,
     def _copy_remote_file(self, host, remote_file, local_file, recurse,
                           **kwargs):
         """Make sftp client, copy file to local"""
-        self._make_ssh_client(host)
-        return self.host_clients[host].copy_remote_file(
-            remote_file, local_file, recurse=recurse,
-            **kwargs)
+        try:
+            self._make_ssh_client(host)
+            return self.host_clients[host].copy_remote_file(
+                remote_file, local_file, recurse=recurse,
+                **kwargs)
+        except Exception as ex:
+            ex.host = host
+            raise ex