[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.2.0.10-33-gb75628b

X2Go dev team git-admin at x2go.org
Tue Jan 7 16:21:27 CET 2014


The branch, brokerclient has been updated
       via  b75628bac35ba95c3c70d3a9dccba9c116b263a7 (commit)
      from  b1b4c6bc2a503e903dcf2c1e19fd7e386a8213ca (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                 |    1 +
 x2go/backends/control/_stdout.py |    8 ++++++++
 x2go/client.py                   |    3 ++-
 x2go/session.py                  |    1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a8310b3..e9934e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low
       ,,sshproxyautologin'' (meaning: look_for_keys and allow_agent in Python
       Paramiko terms).
     - Make X2goClient instance available in initial X2goSession instances.
+    - Allow post-initialization updating of forward_sshagent class property.
   * /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 616415c..e02fb21 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -614,6 +614,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
                 use_sshproxy=False, sshproxy_host='', sshproxy_port=22, sshproxy_user='', sshproxy_password='',
                 sshproxy_key_filename='', sshproxy_pkey=None, sshproxy_look_for_keys=False, sshproxy_allow_agent=False,
                 sshproxy_tunnel='',
+                forward_sshagent=None,
                 session_instance=None,
                 add_to_known_hosts=False, force_password_auth=False):
         """\
@@ -654,6 +655,9 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
         @type key_filename: C{str} or list(str)
         @param pkey: an optional private key to use for authentication
         @type pkey: C{PKey}
+        @param forward_sshagent: forward SSH agent authentication requests to the X2Go client-side
+            (will update the class property of the same name)
+        @type forward_sshagent: C{bool}
         @param timeout: an optional timeout (in seconds) for the TCP connect
         @type timeout: float
         @param look_for_keys: set to C{True} to enable searching for discoverable
@@ -763,6 +767,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
         if _hostname in ('localhost', 'localhost.localdomain'):
             _hostname = '127.0.0.1'
 
+        # update self.forward_sshagent via connect method parameter
+        if forward_sshagent is not None:
+            self.forward_sshagent = forward_sshagent
+
         if (key_filename and os.path.exists(os.path.normpath(key_filename))) or pkey or look_for_keys or allow_agent:
             try:
                 self.logger('trying SSH pub/priv key authentication with server', loglevel=log.loglevel_DEBUG)
diff --git a/x2go/client.py b/x2go/client.py
index beb4469..5f463fb 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -2959,9 +2959,10 @@ class X2goClient(object):
                                          )
         try:
             self.session_registry.register_available_server_sessions(profile_name, session_list=session_list, re_register=re_register)
-        except x2go_exceptions.X2goControlSessionException:
+        except x2go_exceptions.X2goControlSessionException, e:
             self.HOOK_on_control_session_death(profile_name)
             self.disconnect_profile(profile_name)
+            raise e
     __register_available_server_sessions_by_profile_name = register_available_server_sessions_by_profile_name
 
     def register_available_server_sessions_by_session_uuid(self, session_uuid):
diff --git a/x2go/session.py b/x2go/session.py
index 7722822..6161075 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1222,6 +1222,7 @@ class X2goSession(object):
                 self.connected = self.control_session.connect(self.server,
                                                               use_sshproxy=self.use_sshproxy,
                                                               session_instance=self,
+                                                              forward_sshagent=self.forward_sshagent,
                                                               **_params)
             except x2go_exceptions.X2goControlSessionException, e:
                 raise x2go_exceptions.X2goSessionException(str(e))


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