X2Go dev team | 9 Oct 15:17 2012

python-x2go.git - master (branch) updated: 0.2.0.10-27-gc94349b

The branch, master has been updated
       via  c94349b46c7749705dce1047fd048437baac8518 (commit)
      from  4f9151805b10d30f2d5f6c241a20c8748337fdec (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 c94349b46c7749705dce1047fd048437baac8518
Author: Mike Gabriel <mike.gabriel@...>
Date:   Tue Oct 9 15:17:46 2012 +0200

    fix last two commits

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

Summary of changes:
 x2go/backends/control/_stdout.py |   12 ++--
 x2go/client.py                   |    2 +-
 x2go/paramiko.py                 |  126 --------------------------------------
 x2go/session.py                  |    6 +-
 x2go/sshproxy.py                 |    6 +-
 x2go/utils.py                    |    9 ++-
 6 files changed, 22 insertions(+), 139 deletions(-)
 delete mode 100644 x2go/paramiko.py

The diff of changes is:
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index a3506ae..616415c 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
 <at>  <at>  -54,8 +54,8  <at>  <at>  from x2go.backends.info import X2goServerSessionInfo as _X2goServerSessionInfo
 from x2go.backends.info import X2goServerSessionList as _X2goServerSessionList
 from x2go.backends.proxy import X2goProxy as _X2goProxy

-import x2go.paramiko
-x2go.paramiko.monkey_patch_paramiko()
+import x2go._paramiko
+x2go._paramiko.monkey_patch_paramiko()

 def _rerewrite_blanks(cmd):
     """\
 <at>  <at>  -167,7 +167,7  <at>  <at>  class X2goControlSessionSTDOUT(paramiko.SSHClient):
          <at> param loglevel: if no L{X2goLogger} object has been supplied a new one will be
             constructed with the given loglevel
          <at> type loglevel: C{int}
-         <at> param kwargs: parameters passed through to C{SSHClient.__init__()}
+         <at> param kwargs: catch any non-defined parameters in C{kwargs}
          <at> type kwargs: C{dict}

         """
 <at>  <at>  -209,7 +209,7  <at>  <at>  class X2goControlSessionSTDOUT(paramiko.SSHClient):

         self._published_applications_menu = {}

-        paramiko.SSHClient.__init__(self, **kwargs)
+        paramiko.SSHClient.__init__(self)
         if self.add_to_known_hosts:
             self.set_missing_host_key_policy(paramiko.AutoAddPolicy())

 <at>  <at>  -781,7 +781,7  <at>  <at>  class X2goControlSessionSTDOUT(paramiko.SSHClient):

                 # since Paramiko 1.7.7.1 there is compression available, let's use it if present...
                 t = self.get_transport()
-                if x2go.paramiko.PARAMIKO_FEATURES['use-compression']:
+                if x2go._paramiko.PARAMIKO_FEATURE['use-compression']:
                     t.use_compression(compress=True)

             except paramiko.AuthenticationException, e:
 <at>  <at>  -850,7 +850,7  <at>  <at>  class X2goControlSessionSTDOUT(paramiko.SSHClient):
             self.session_died = False
             self.query_server_features(force=True)
             if self.forward_sshagent:
-                if x2go.paramiko.PARAMIKO_FEATURE['forward-ssh-agent']:
+                if x2go._paramiko.PARAMIKO_FEATURE['forward-ssh-agent']:
                     self.agent_chan = ssh_transport.open_session()
                     self.agent_handler = paramiko.agent.AgentRequestHandler(self.agent_chan)
                     self.logger('Requesting SSH agent forwarding for control session of connected session profile %s' %
self.profile_name, loglevel=log.loglevel_INFO)
diff --git a/x2go/client.py b/x2go/client.py
index a22df3a..beb4469 100644
--- a/x2go/client.py
+++ b/x2go/client.py
 <at>  <at>  -977,6 +977,7  <at>  <at>  class X2goClient(object):
             _params['mimebox_action'] = mimebox_action
             _params['client_instance'] = self
             _params['proxy_options'] = proxy_options
+            _params['forward_sshagent'] = forward_sshagent

         session_uuid = self.session_registry.register(server=server,
                                                       profile_id=_profile_id, profile_name=_profile_name,
 <at>  <at>  -994,7 +995,6  <at>  <at>  class X2goClient(object):
                                                       keep_controlsession_alive=True,
                                                       add_to_known_hosts=add_to_known_hosts,
                                                       known_hosts=known_hosts,
-                                                      forward_sshagent=forward_sshagent,
                                                       **_params)

         self.logger('initializing X2Go session...', log.loglevel_NOTICE, tag=self._logger_tag)
diff --git a/x2go/paramiko.py b/x2go/paramiko.py
deleted file mode 100644
index caafb5f..0000000
--- a/x2go/paramiko.py
+++ /dev/null
 <at>  <at>  -1,126 +0,0  <at>  <at> 
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel@...>
-#
-# Python X2Go is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# Python X2Go is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-"""\
-Monkey Patch and feature map for Python Paramiko
-
-"""
-
-import paramiko
-from x2go.utils import compare_versions
-
-PARAMIKO_VERSION = paramiko.__version__.split()[0]
-PARAMIKO_FEATURE = {
-    'forward-ssh-agent': compare_versions(PARAMIKO_VERSION, ">=", '1.8'),
-    'use-compression': compare_versions(PARAMIKO_VERSION, ">=", '1.7.7.1'),
-}
-
-def _SSHClient_save_host_keys(self, filename):
-    """\
-    FIXME!!! --- this method should become part of Paramiko
-
-    This method has been taken from SSHClient class in Paramiko and
-    has been improved and adapted to latest SSH implementations.
-
-    Save the host keys back to a file.
-    Only the host keys loaded with
-    L{load_host_keys} (plus any added directly) will be saved -- not any
-    host keys loaded with L{load_system_host_keys}.
-
-     <at> param filename: the filename to save to
-     <at> type filename: str
-
-     <at> raise IOError: if the file could not be written 
-
-    """
-    # update local host keys from file (in case other SSH clients
-    # have written to the known_hosts file meanwhile.
-    if self.known_hosts is not None:
-        self.load_host_keys(self.known_hosts)
-
-    f = open(filename, 'w')
-    #f.write('# SSH host keys collected by paramiko\n')
-    _host_keys = self.get_host_keys()
-    for hostname, keys in _host_keys.iteritems():
-
-        for keytype, key in keys.iteritems():
-            f.write('%s %s %s\n' % (hostname, keytype, key.get_base64()))
-
-    f.close()
-
-
-def _HostKeys_load(self, filename):
-    """\
-    Read a file of known SSH host keys, in the format used by openssh.
-    This type of file unfortunately doesn't exist on Windows, but on
-    posix, it will usually be stored in
-    C{os.path.expanduser("~/.ssh/known_hosts")}.
-
-    If this method is called multiple times, the host keys are merged,
-    not cleared. So multiple calls to C{load} will just call L{add},
-    replacing any existing entries and adding new ones.
-
-     <at> param filename: name of the file to read host keys from
-     <at> type filename: str
-
-     <at> raise IOError: if there was an error reading the file
-
-    """
-    f = open(filename, 'r')
-    for line in f:
-        line = line.strip()
-        if (len(line) == 0) or (line[0] == '#'):
-            continue
-        e = paramiko.hostkeys.HostKeyEntry.from_line(line)
-        if e is not None:
-            _hostnames = e.hostnames
-            for h in _hostnames:
-                if self.check(h, e.key):
-                    e.hostnames.remove(h)
-            if len(e.hostnames):
-                self._entries.append(e)
-    f.close() 
-
-
-def _HostKeys_add(self, hostname, keytype, key, hash_hostname=True):
-    """\
-    Add a host key entry to the table. Any existing entry for a
-    C{(hostname, keytype)} pair will be replaced.
-
-     <at> param hostname: the hostname (or IP) to add
-     <at> type hostname: str
-     <at> param keytype: key type (C{"ssh-rsa"} or C{"ssh-dss"})
-     <at> type keytype: str
-     <at> param key: the key to add
-     <at> type key: L{PKey}
-
-    """
-    for e in self._entries:
-        if (hostname in e.hostnames) and (e.key.get_name() == keytype):
-            e.key = key
-            return
-    if not hostname.startswith('|1|') and hash_hostname:
-        hostname = self.hash_host(hostname)
-    self._entries.append(paramiko.hostkeys.HostKeyEntry([hostname], key))
-
-
-def monkey_patch_paramiko():
-    paramiko.SSHClient.save_host_keys = _SSHClient_save_host_keys
-    paramiko.hostkeys.HostKeys.load = _HostKeys_load
-    paramiko.hostkeys.HostKeys.add = _HostKeys_add
diff --git a/x2go/session.py b/x2go/session.py
index a8d4469..0330015 100644
--- a/x2go/session.py
+++ b/x2go/session.py
 <at>  <at>  -91,7 +91,7  <at>  <at>  _X2GO_SESSION_PARAMS = ('use_sshproxy', 'sshproxy_reuse_authinfo',
                         'allow_share_local_folders', 'share_local_folders',
                         'control_backend', 'terminal_backend', 'info_backend', 'list_backend', 'proxy_backend',
'settings_backend', 'printing_backend',
                         'client_rootdir', 'sessions_rootdir', 'ssh_rootdir',
-                        'keep_controlsession_alive', 'add_to_known_hosts', 'known_hosts'
+                        'keep_controlsession_alive', 'add_to_known_hosts', 'known_hosts', 'forward_sshagent',
                         'connected', 'virgin', 'running', 'suspended', 'terminated', 'faulty'
                         'client_instance',
                        )
 <at>  <at>  -748,6 +748,10  <at>  <at>  class X2goSession(object):
             del params['auto_connect']
         except KeyError: pass
         try:
+            self.forward_sshagent = params['forward_sshagent']
+            del params['forward_sshagent']
+        except KeyError: pass
+        try:
             self.auto_start_or_resume = params['auto_start_or_resume']
             del params['auto_start_or_resume']
         except KeyError: pass
diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py
index 3728950..b11bed3 100644
--- a/x2go/sshproxy.py
+++ b/x2go/sshproxy.py
 <at>  <at>  -44,8 +44,8  <at>  <at>  from x2go.defaults import CURRENT_LOCAL_USER as _CURRENT_LOCAL_USER
 from x2go.defaults import LOCAL_HOME as _LOCAL_HOME
 from x2go.defaults import X2GO_SSH_ROOTDIR as _X2GO_SSH_ROOTDIR

-import x2go.paramiko
-x2go.paramiko.monkey_patch_paramiko()
+import x2go._paramiko
+x2go._paramiko.monkey_patch_paramiko()

 class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
     """\
 <at>  <at>  -243,7 +243,7  <at>  <at>  class X2goSSHProxy(paramiko.SSHClient, threading.Thread):

                 # since Paramiko 1.7.7.1 there is compression available, let's use it if present...
                 t = self.get_transport()
-                if x2go.paramiko.PARAMIKO_FEATURES['use-compression']:
+                if x2go._paramiko.PARAMIKO_FEATURE['use-compression']:
                     t.use_compression(compress=True)

             # if there is no private key, we will use the given password, if any
diff --git a/x2go/utils.py b/x2go/utils.py
index 137a76b..23e3184 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
 <at>  <at>  -211,7 +211,8  <at>  <at>  def _convert_SessionProfileOptions_2_SessionParams(options):
             'autostart': 'auto_start_or_resume',
             'autoconnect': 'auto_connect',
             'forwardsshagent': 'forward_sshagent',
-
+            'autologin': 'look_for_keys',
+            'sshproxyautologin': 'sshproxy_look_for_keys',
     }
     _speed_dict = {
             '0': 'modem',
 <at>  <at>  -249,6 +250,11  <at>  <at>  def _convert_SessionProfileOptions_2_SessionParams(options):
                 else:
                     _params[opt] = []

+    if _params['look_for_keys']:
+        _params['allow_agent'] = True
+    if _params['sshproxy_look_for_keys']:
+        _params['sshproxy_allow_agent'] = True
+
     # append value for quality to value for pack method
     if _params['quality']:
         _params['pack'] = '%s-%s' % (_params['pack'], _params['quality'])
 <at>  <at>  -334,7 +340,6  <at>  <at>  def _convert_SessionProfileOptions_2_SessionParams(options):
             'rdpclient',
             'rdpport',
             'sshproxytype',
-            'sshproxyautologin',
     ]
     for i in _ignored_options:
         del _params[i]

hooks/post-receive

Gmane