The branch, master has been updated via 6e04237345370000d3deda0e66b462670b626d54 (commit) from 5b8164de3596bd79e89de18e574252b2730b0916 (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 6e04237345370000d3deda0e66b462670b626d54 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Nov 5 10:12:25 2013 +0100 Properly handle (=expand) the "~" character in key filenames. (Brought to attention by Eldamir on IRC. Thanks!). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/control/_stdout.py | 3 +++ x2go/sshproxy.py | 3 +++ 3 files changed, 8 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cee5b48..538cff8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low versions. - Handle echoing ~/.*shrc files gracefully via SSH client connections. Do not allow data injections via ~/.*shrc files. (Fixes: #335). + - Properly handle (=expand) the "~" character in key filenames. (Brought to + attention by Eldamir on IRC. Thanks!). [ Orion Poplawski ] * debian/control: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index da9f9b7..78ac5bb 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -902,6 +902,9 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): if timeout and self.low_latency: timeout = timeout * 2 + if "~" in key_filename: + key_filename = os.path.expanduser(key_filename) + if key_filename or pkey or look_for_keys or allow_agent or (password and force_password_auth): try: if password and force_password_auth: diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index 74b4be0..ee1fa6f 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -192,6 +192,9 @@ class X2GoSSHProxy(paramiko.SSHClient, threading.Thread): key_filename = None pkey = None + if "~" in key_filename: + key_filename = os.path.expanduser(key_filename) + if not passphrase: passphrase = password # enforce IPv4 for localhost addresses!!! 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).