[X2go-Commits] python-x2go.git - master (branch) updated: 0.2.0.10-91-g8b51f44

[X2Go dev team]

The branch, master has been updated
       via  8b51f4435d5042e8f8a3d38767d8cf70d38a67b6 (commit)
       via  54e4dbcf1b1b740eb5fff25d8f308a4331ba616f (commit)
      from  384130ba3e22a2ea7c3c4d021f1e7e22a072727b (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 8b51f4435d5042e8f8a3d38767d8cf70d38a67b6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Nov 26 11:06:00 2012 +0100

    Fix password authentication in case no private RSA/DSA key for a client user exists.

commit 54e4dbcf1b1b740eb5fff25d8f308a4331ba616f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Nov 26 11:05:09 2012 +0100

    cleanup X2goSession.connect()

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                 |    2 ++
 x2go/backends/control/_stdout.py |    7 +------
 x2go/session.py                  |    8 +-------
 3 files changed, 4 insertions(+), 13 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 469efd4..2d2122e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,8 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low
       folders.
     - Before suspending/terminating a session, make sure that the list of
       shared folders is up-to-date.
+    - Fix password authentication in case no private RSA/DSA key for a
+      client user exists.
   * /debian/rules:
     + Allow package build on systems with missing dh_python2.
   * /debian/control:
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index cb309ad..b95e916 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -803,11 +803,6 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
                     try:
                         paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password,
                                                    key_filename=None, pkey=None, 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:
@@ -817,7 +812,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
                     self.close()
                     if self.sshproxy_session:
                         self.sshproxy_session.stop_thread()
-                    raise(e)
+                    raise(paramiko.AuthenticationException('Interactive password authentication required!'))
 
             except:
                 self.close()
diff --git a/x2go/session.py b/x2go/session.py
index c7bda03..0348ae3 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1215,10 +1215,6 @@ class X2goSession(object):
             if sshproxy_reuse_authinfo is not None:
                 self.sshproxy_reuse_authinfo = sshproxy_reuse_authinfo
 
-            _params = {}
-            _params.update(self.control_params)
-            _params.update(self.sshproxy_params)
-
             if username:
                 self.control_params['username'] = username
             if add_to_known_hosts is not None:
@@ -1229,9 +1225,9 @@ class X2goSession(object):
                 self.control_params['look_for_keys'] = look_for_keys
             if allow_agent is not None:
                 self.control_params['allow_agent'] = allow_agent
+
             if sshproxy_user:
                 self.sshproxy_params['sshproxy_user'] = sshproxy_user
-
             if sshproxy_password:
                 self.sshproxy_params['sshproxy_password'] = sshproxy_password
 
@@ -1244,8 +1240,6 @@ class X2goSession(object):
                     self.sshproxy_params['sshproxy_pkey'] = self.control_params['pkey']
                 if self.control_params.has_key('password'):
                     self.sshproxy_params['sshproxy_password'] = self.control_params['password']
-                if self.control_params.has_key('password'):
-                    self.sshproxy_params['sshproxy_password'] = self.control_params['password']
 
             _params = {}
             _params.update(self.control_params)


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