The branch, twofactorauth has been updated via 27d7b87c686844af7b63b6045aff296a9b8da04d (commit) from 94a3a09921f8ece7076a485c127aafa55e42d2cd (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 8 ++++++++ x2go/sshproxy.py | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 38e3a6f..7e6245e 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -397,6 +397,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): paramiko.SSHClient.connect(self, hostname, port=port, username=username, password=password, timeout=timeout, allow_agent=allow_agent, look_for_keys=look_for_keys) + except paramiko.AuthenticationException, e: + if self.sshproxy_session: + self.sshproxy_session.stop_thread() + raise e except: if self.sshproxy_session: self.sshproxy_session.stop_thread() @@ -423,6 +427,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): try: paramiko.SSHClient.connect(self, hostname, port=port, username=username, password=password, timeout=timeout, allow_agent=allow_agent, look_for_keys=look_for_keys) + except paramiko.AuthenticationException, e: + if self.sshproxy_session: + self.sshproxy_session.stop_thread() + raise e except: if self.sshproxy_session: self.sshproxy_session.stop_thread() diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index 25da56f..670fe0c 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -173,7 +173,6 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): allow_agent=False, ) except AuthenticationException, e: - self.close() raise X2goSSHProxyAuthenticationException('pubkey auth mechanisms both failed') except: self.close() @@ -192,7 +191,6 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): allow_agent=False, ) except AuthenticationException: - self.close() raise X2goSSHProxyAuthenticationException('interactive auth mechanisms failed') except: self.close() 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).