[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.1.0.3-10-g5014b32

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:56:47 CEST 2013


The branch, twofactorauth has been updated
       via  5014b32c3ff00c326699108a8470443c8abd43da (commit)
      from  fa0d562da07ec11e299edc3b98a56121b4e0c25e (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:
 debian/changelog                 |    3 ++-
 x2go/backends/control/_stdout.py |   15 ++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 026ac15..5f60e5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ python-x2go (0.1.1.0-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (0.1.1.0):
     - Add X2go desktop sharing support.
     - Fix SSH authentication failures (close session on failure).
+    - Close SSH connection first, then close down SSH proxy.
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 13 Jun 2011 23:24:02 +0200
+ -- Mike Gabriel <mike at mimino.das-netzwerkteam.de>  Mon, 20 Jun 2011 14:16:54 +0200
 
 python-x2go (0.1.0.3-0~x2go1) unstable; urgency=low
 
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 2c94ecc..8e5a0c2 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -399,20 +399,20 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
                     except paramiko.AuthenticationException, e:
                         raise e
                     except:
+                        self.close()
                         if self.sshproxy_session:
                             self.sshproxy_session.stop_thread()
-                        self.close()
                         raise
                 else:
+                    self.close()
                     if self.sshproxy_session:
                         self.sshproxy_session.stop_thread()
-                    self.close()
                     raise(e)
 
             except:
+                self.close()
                 if self.sshproxy_session:
                     self.sshproxy_session.stop_thread()
-                self.close()
                 raise
 
         # if there is not private key, we will use the given password, if any
@@ -427,9 +427,9 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
             except paramiko.AuthenticationException, e:
                 raise e
             except:
+                self.close()
                 if self.sshproxy_session:
                     self.sshproxy_session.stop_thread()
-                self.close()
                 raise
 
         self.set_missing_host_key_policy(paramiko.RejectPolicy())
@@ -485,9 +485,6 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
                 except KeyError:
                     pass
 
-        if self.sshproxy_session is not None:
-            self.sshproxy_session.stop_thread()
-
         self._remote_home = None
         self._remote_group = {}
 
@@ -504,6 +501,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
             # but state that this method call did not close the SSH client, but was already closed
             return False
 
+        if self.sshproxy_session is not None:
+            self.sshproxy_session.stop_thread()
+
+        
     def is_alive(self):
         if self._x2go_exec_command('echo', loglevel=log.loglevel_DEBUG):
             return True


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).




More information about the x2go-commits mailing list