The branch, master has been updated via 501a5bd5efc4f91ae8f5d27148cd587ba858b06b (commit) from 7c131c82ddb09a70600b6b2e0b08f09fbf540194 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 501a5bd5efc4f91ae8f5d27148cd587ba858b06b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jun 25 22:26:36 2013 +0200 Paramiko monkey patch: Hostnames with the default SSH_PORT are stored in hostname-only format to the known_hosts file. Fixes redundant requests for confirming the remote host's fingerprint if port 22 is used. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 ++++- x2go/_paramiko.py | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fe3c4aa..76b4db6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ python-x2go (0.4.0.5-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.4.0.5): + - Paramiko monkey patch: Hostnames with the default SSH_PORT are stored + in hostname-only format to the known_hosts file. Fixes redundant requests + for confirming the remote host's fingerprint if port 22 is used. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 18 Jun 2013 20:29:14 +0200 diff --git a/x2go/_paramiko.py b/x2go/_paramiko.py index dd83bd0..a7663f3 100644 --- a/x2go/_paramiko.py +++ b/x2go/_paramiko.py @@ -23,6 +23,8 @@ Monkey Patch and feature map for Python Paramiko """ import paramiko +import re +from paramiko.config import SSH_PORT import platform from utils import compare_versions @@ -117,6 +119,11 @@ def _HostKeys_add(self, hostname, keytype, key, hash_hostname=True): @type key: L{PKey} """ + # IPv4 and IPv6 addresses using the SSH default port need to be stripped off the port number + if re.match('^\[.*\]\:'+str(SSH_PORT)+'$', hostname): + # so stripping off the port and the square brackets here... + hostname = hostname.split(':')[-2].lstrip('[').rstrip(']') + for e in self._entries: if (hostname in e.hostnames) and (e.key.get_name() == keytype): e.key = key hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).