This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/0.5.0.x in repository python-x2go. from b159a5c Continue development new fc4c50c x2go/backends/control/plain.p: Fix passphrase unlocking of private keys. new 351ab49 x2go/backends/control/plain.py: Handle password based authentication failures graceful. Uncomment previously commented out code. new 5aefebf x2go/backends/profiles/httpbroker.py: Fix broker URL assembling when no port is given (i.e. convert None to '' manually). The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: x2go/backends/control/plain.py | 23 +++++++++-------------- x2go/backends/profiles/httpbroker.py | 2 ++ 2 files changed, 11 insertions(+), 14 deletions(-) -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/0.5.0.x in repository python-x2go. commit fc4c50c2e15a65fb677f2e207bcc4f4ea865b4d0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 24 19:22:36 2017 +0200 x2go/backends/control/plain.p: Fix passphrase unlocking of private keys. --- x2go/backends/control/plain.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py index 3dcc3ef..242b7e6 100644 --- a/x2go/backends/control/plain.py +++ b/x2go/backends/control/plain.py @@ -995,12 +995,12 @@ class X2GoControlSession(paramiko.SSHClient): look_for_keys=False) elif (key_filename and os.path.exists(os.path.normpath(key_filename))) or pkey: self.logger('trying SSH pub/priv key authentication with server', loglevel=log.loglevel_DEBUG) - paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=pkey, + paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=pkey, password=passphrase, key_filename=key_filename, timeout=timeout, allow_agent=False, look_for_keys=False) else: self.logger('trying SSH key discovery or agent authentication with server', loglevel=log.loglevel_DEBUG) - paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=None, + paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=None, password=passphrase, key_filename=None, timeout=timeout, allow_agent=allow_agent, look_for_keys=look_for_keys) -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/0.5.0.x in repository python-x2go. commit 351ab49aabddb32258e431561a586b224b17815f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 24 19:56:10 2017 +0200 x2go/backends/control/plain.py: Handle password based authentication failures graceful. Uncomment previously commented out code. --- x2go/backends/control/plain.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py index 242b7e6..a55a425 100644 --- a/x2go/backends/control/plain.py +++ b/x2go/backends/control/plain.py @@ -1096,19 +1096,14 @@ class X2GoControlSession(paramiko.SSHClient): if not password: password = "".join([random.choice(string.letters+string.digits) for x in range(1, 20)]) self.logger('performing SSH password authentication with server', loglevel=log.loglevel_DEBUG) - #try: - paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, + try: + paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, timeout=timeout, allow_agent=False, look_for_keys=False) - #except paramiko.AuthenticationException, e: - # self.close() - # if self.sshproxy_session: - # self.sshproxy_session.stop_thread() - # raise e - #except: - # self.close() - # if self.sshproxy_session: - # self.sshproxy_session.stop_thread() - # raise + except: + self.close() + if self.sshproxy_session: + self.sshproxy_session.stop_thread() + raise self.set_missing_host_key_policy(paramiko.RejectPolicy()) -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/0.5.0.x in repository python-x2go. commit 5aefebf4b3988d35292fd77ff52e2d5ad68b5e01 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Sep 25 12:43:12 2017 +0200 x2go/backends/profiles/httpbroker.py: Fix broker URL assembling when no port is given (i.e. convert None to '' manually). --- x2go/backends/profiles/httpbroker.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x2go/backends/profiles/httpbroker.py b/x2go/backends/profiles/httpbroker.py index 7925a5d..694bdc6 100644 --- a/x2go/backends/profiles/httpbroker.py +++ b/x2go/backends/profiles/httpbroker.py @@ -89,6 +89,8 @@ class X2GoSessionProfiles(base.X2GoSessionProfiles): p['path'] = "/{path}".format(**p) if p['port'] is not None: p['port'] = ":{port}".format(**p) + else: + p['port'] = '' self.broker_url = "{protocol}://{hostname}{port}{path}".format(**p) -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
-
git-admin＠x2go.org