x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

python-x2go.git - master (branch) updated: 0.2.1.1-20-g7914c64
by git-admin＠x2go.org 13 Jan '13

13 Jan '13

The branch, master has been updated via 7914c64237973c66222fc35094ccc34b6d921063 (commit) from e1b34e08af86bd3c56119cf467dfae5520c07fac (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 7914c64237973c66222fc35094ccc34b6d921063 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jan 13 21:54:32 2013 +0100 Add session profile option: uniquehostkeyaliases. Allow the (by-design-unique) X2Go session profile ID to be a representative for <hostname>:<port>. Update session profile IDs on hostname changes. Re-arrange class structure for MissingHostKey policies, also provide an X2goAutoAddPolicy class. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 ++ x2go/backends/control/_stdout.py | 13 ++- x2go/backends/profiles/_file.py | 40 ++++++--- x2go/checkhosts.py | 178 ++++++++++++++++++++++---------------- x2go/defaults.py | 1 + x2go/utils.py | 1 + 6 files changed, 152 insertions(+), 86 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 33a0f83..223faed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,11 @@ python-x2go (0.2.2.0-0~x2go1) UNRELEASED; urgency=low - Avoid the known_hosts file being flushed with localhost:[<someport>] entries. Store host keys of SSH-proxied hosts under the [<address>]:<port> the system has _behind_ the SSH proxy gateway. + - Add session profile option: uniquehostkeyaliases. Allow the + (by-design-unique) X2Go session profile ID to be a representative for + <hostname>:<port>. Update session profile IDs on hostname changes. + Re-arrange class structure for MissingHostKey policies, also provide an + X2goAutoAddPolicy class. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 20 Dec 2012 08:58:44 +0100 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 2112f14..ef8da9c 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -118,6 +118,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): add_to_known_hosts=False, known_hosts=None, forward_sshagent=False, + unique_hostkey_aliases=False, terminal_backend=_X2goTerminalSession, info_backend=_X2goServerSessionInfo, list_backend=_X2goServerSessionList, @@ -143,6 +144,9 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): @type known_hosts: C{str} @param forward_sshagent: forward SSH agent authentication requests to the X2Go client-side @type forward_sshagent: C{bool} + @param unique_hostkey_aliases: instead of storing [<hostname>]:<port> in known_hosts file, use the + (unique-by-design) profile ID + @type unique_hostkey_aliases: C{bool} @param terminal_backend: X2Go terminal session backend to use @type terminal_backend: C{class} @param info_backend: backend for handling storage of server session information @@ -177,6 +181,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.add_to_known_hosts = add_to_known_hosts self.known_hosts = known_hosts self.forward_sshagent = forward_sshagent + self.unique_hostkey_aliases = unique_hostkey_aliases self.hostname = None self.port = None @@ -617,6 +622,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): sshproxy_key_filename='', sshproxy_pkey=None, sshproxy_look_for_keys=False, sshproxy_allow_agent=False, sshproxy_tunnel='', forward_sshagent=None, + unique_hostkey_aliases=None, session_instance=None, add_to_known_hosts=False, force_password_auth=False): """\ @@ -660,6 +666,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): @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 unique_hostkey_aliases: update the unique_hostkey_aliases class property + @type unique_hostkey_aliases: 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 @@ -720,6 +728,9 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): """ _fake_hostname = None + if unique_hostkey_aliases is not None: + self.unique_hostkey_aliases = unique_hostkey_aliases + if use_sshproxy and sshproxy_host and sshproxy_user: try: @@ -763,7 +774,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.set_missing_host_key_policy(checkhosts.X2goInteractiveAddPolicy(caller=self, session_instance=session_instance, fake_hostname=_fake_hostname)) if add_to_known_hosts: - self.set_missing_host_key_policy(paramiko.AutoAddPolicy()) + self.set_missing_host_key_policy(checkhosts.X2goAutoAddPolicy(caller=self, session_instance=session_instance, fake_hostname=_fake_hostname)) # disable pub/priv key authentication if forced if force_password_auth: diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py index fbbf396..eb23582 100644 --- a/x2go/backends/profiles/_file.py +++ b/x2go/backends/profiles/_file.py @@ -67,6 +67,7 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile): self._profile_metatypes = {} self._cached_profile_ids = [] self._cached_profile_names = [] + self._profiles_need_profile_id_renewal = [] if logger is None: self.logger = log.X2goLogger(loglevel=loglevel) @@ -115,7 +116,6 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile): @rtype: C{str} """ - _profile_id = self.check_profile_id_or_name(profile_id_or_name) if not self._profile_metatypes.has_key(_profile_id) or force: _config = self.get_profile_config(_profile_id) @@ -146,6 +146,23 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile): else: return self._profile_metatypes[_profile_id] + def write(self): + + + # then update profile IDs for profiles that have a renamed host attribute... + for profile_id in self._profiles_need_profile_id_renewal: + _config = self.get_profile_config(profile_id=profile_id) + self.iniConfig.remove_section(profile_id) + try: self._cached_profile_ids.remove(profile_id) + except ValueError: pass + try: self._cached_profile_names.remove(_config['name']) + except ValueError: pass + self.add_profile(profile_id=None, **_config) + + # at last write the profile config as is... + inifiles.X2goIniFile.write(self) + + def get_profile_option_type(self, option): """\ Get the data type for a specific session profile option. @@ -345,17 +362,12 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile): if profile_id is None: profile_id = utils._genSessionProfileId() for key, value in kwargs.items(): - if key in self.defaultSessionProfile: - self.update_value(profile_id, key, value) - else: - raise X2goProfileException('keyword ,,%s\'\' not supported in X2Go session profile' % key) + self.update_value(None, key, value, profile_id=profile_id) for key, value in self.defaultSessionProfile.items(): if key in kwargs: continue - self.update_value(profile_id, key, value) + self.update_value(None, key, value, profile_id=profile_id) - self._cached_profile_ids = [] - self._cached_profile_names = [] return profile_id @@ -365,6 +377,8 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile): @param profile_id_or_name: profile ID or profile name @type profile_id_or_name: C{str} + @param skip_writing: do not perform a write operation after deleting the session profile + @type skip_writing: C{bool} """ _profile_id = self.check_profile_id_or_name(profile_id_or_name) @@ -374,7 +388,7 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile): self._cached_profile_ids = [] self._cached_profile_names = [] - def update_value(self, section, key, value): + def update_value(self, section, key, value, profile_id=None): """\ Update a value in a session profile. @@ -387,7 +401,7 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile): """ try: - profile_id = self.check_profile_id_or_name(section) + profile_id = profile_id or self.check_profile_id_or_name(section) except X2goProfileException: profile_id = section if key == 'name': @@ -401,7 +415,6 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile): self._cached_profile_names = [] if key == 'export' and type(value) == types.DictType: - _strvalue = '"' for folder in value.keys(): _strvalue += "%s:%s;" % (folder, int(value[folder])) @@ -409,6 +422,11 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile): _strvalue = _strvalue.replace('""', '') value = _strvalue + if key == 'host': + _config = self.get_profile_config(profile_id=profile_id) + if _config.has_key('host') and _config['host'] != value: + self._profiles_need_profile_id_renewal.append(profile_id) + inifiles.X2goIniFile.update_value(self, profile_id, key, value) def check_profile_id_or_name(self, profile_id_or_name): diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py index aedb08d..f1bda26 100644 --- a/x2go/checkhosts.py +++ b/x2go/checkhosts.py @@ -34,20 +34,9 @@ import x2go_exceptions import random import string -class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy): +class X2goMissingHostKeyPolicy(paramiko.MissingHostKeyPolicy): """\ - Policy for making host key information available to Python X2Go after a - Paramiko/SSH connect has been attempted. This class needs information - about the associated L{X2goSession} instance. - - Once called, the L{missing_host_key} method of this class will try to call - L{X2goSession.HOOK_check_host_dialog()}. This hook method---if not re-defined - in your application---will then try to call the L{X2goClient.HOOK_check_host_dialog()}, - which then will return C{True} by default if not customized in your application. - - To accept host key checks, make sure to either customize the - L{X2goClient.HOOK_check_host_dialog()} method or the L{X2goSession.HOOK_check_host_dialog()} - method and hook some interactive user dialog to either of them. + Skeleton class for Python X2Go's missing host key policies. """ def __init__(self, caller=None, session_instance=None, fake_hostname=None): @@ -62,67 +51,6 @@ class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy): self.session_instance = session_instance self.fake_hostname = fake_hostname - def missing_host_key(self, client, hostname, key): - """\ - Handle a missing host key situation. This method calls - - Once called, the L{missing_host_key} method will try to call - L{X2goSession.HOOK_check_host_dialog()}. This hook method---if not re-defined - in your application---will then try to call the L{X2goClient.HOOK_check_host_dialog()}, - which then will return C{True} by default if not customized in your application. - - To accept host key checks, make sure to either customize the - L{X2goClient.HOOK_check_host_dialog()} method or the L{X2goSession.HOOK_check_host_dialog()} - method and hook some interactive user dialog to either of them. - - @param client: SSH client (C{X2goControlSession*}) instance - @type client: C{X2goControlSession*} instance - @param hostname: remote hostname - @type hostname: C{str} - @param key: host key to validate - @type key: Paramiko/SSH key instance - - @raise X2goHostKeyException: if the X2Go server host key is not in the C{known_hosts} file - @raise X2goSSHProxyHostKeyException: if the SSH proxy host key is not in the C{known_hosts} file - @raise SSHException: if this instance does not know its {self.session_instance} - - """ - self.client = client - self.hostname = hostname - if (self.hostname.find(']') == -1) and (self.hostname.find(':') == -1): - # if hostname is an IPv4 quadruple with standard SSH port... - self.hostname = '[%s]:22' % self.hostname - self.key = key - client._log(paramiko.common.DEBUG, 'Interactively Checking %s host key for %s: %s' % - (self.key.get_name(), self.hostname, binascii.hexlify(self.key.get_fingerprint()))) - if self.session_instance: - - if self.fake_hostname is not None: - server_key = client.get_transport().get_remote_server_key() - keytype = server_key.get_name() - our_server_key = client._system_host_keys.get(self.fake_hostname, {}).get(keytype, None) - if our_server_key is None: - our_server_key = client._host_keys.get(self.fake_hostname, {}).get(keytype, None) - if our_server_key is not None: - self.session_instance.logger('SSH host key verification for SSH-proxied host %s with %s fingerprint ,,%s\'\' succeeded. This host is known by the address it has behind the SSH proxy host.' % (self.fake_hostname, self.get_key_name(), self.get_key_fingerprint_with_colons()), loglevel=log.loglevel_NOTICE) - return - - self.session_instance.logger('SSH host key verification for host %s with %s fingerprint ,,%s\'\' initiated. We are seeing this X2Go server for the first time.' % (self.get_hostname(), self.get_key_name(), self.get_key_fingerprint_with_colons()), loglevel=log.loglevel_NOTICE) - _valid = self.session_instance.HOOK_check_host_dialog(self.get_hostname_name(), - port=self.get_hostname_port(), - fingerprint=self.get_key_fingerprint_with_colons(), - fingerprint_type=self.get_key_name(), - ) - if _valid: - paramiko.AutoAddPolicy().missing_host_key(client, self.get_hostname(), key) - else: - if type(self.caller) in (sshproxy.X2goSSHProxy, ): - raise x2go_exceptions.X2goSSHProxyHostKeyException('Invalid host %s is not authorized for access. Add the host to Paramiko/SSH\'s known_hosts file.' % self.get_hostname()) - else: - raise x2go_exceptions.X2goHostKeyException('Invalid host %s is not authorized for access. Add the host to Paramiko/SSH\'s known_hosts file.' % self.get_hostname()) - else: - raise x2go_exceptions.SSHException('Policy has collected host key information on %s for further introspection' % self.get_hostname()) - def get_client(self): """\ Retrieve the Paramiko SSH/Client. @@ -213,6 +141,108 @@ class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy): return _colon_fingerprint.rstrip(':') +class X2goAutoAddPolicy(X2goMissingHostKeyPolicy): + + def missing_host_key(self, client, hostname, key): + self.client = client + self.hostname = hostname + self.key = key + if self.session_instance and self.session_instance.control_session.unique_hostkey_aliases: + self.client._host_keys.add(self.session_instance.get_profile_id(), self.key.get_name(), self.key) + else: + self.client._host_keys.add(self.get_hostname(), self.key.get_name(), self.key) + if self.client._host_keys_filename is not None: + self.client.save_host_keys(self.client._host_keys_filename) + self.client._log(paramiko.common.DEBUG, 'Adding %s host key for %s: %s' % + (self.key.get_name(), self.get_hostname(), binascii.hexlify(self.key.get_fingerprint()))) + + +class X2goInteractiveAddPolicy(X2goMissingHostKeyPolicy): + """\ + Policy for making host key information available to Python X2Go after a + Paramiko/SSH connect has been attempted. This class needs information + about the associated L{X2goSession} instance. + + Once called, the L{missing_host_key} method of this class will try to call + L{X2goSession.HOOK_check_host_dialog()}. This hook method---if not re-defined + in your application---will then try to call the L{X2goClient.HOOK_check_host_dialog()}, + which then will return C{True} by default if not customized in your application. + + To accept host key checks, make sure to either customize the + L{X2goClient.HOOK_check_host_dialog()} method or the L{X2goSession.HOOK_check_host_dialog()} + method and hook some interactive user dialog to either of them. + + """ + def missing_host_key(self, client, hostname, key): + """\ + Handle a missing host key situation. This method calls + + Once called, the L{missing_host_key} method will try to call + L{X2goSession.HOOK_check_host_dialog()}. This hook method---if not re-defined + in your application---will then try to call the L{X2goClient.HOOK_check_host_dialog()}, + which then will return C{True} by default if not customized in your application. + + To accept host key checks, make sure to either customize the + L{X2goClient.HOOK_check_host_dialog()} method or the L{X2goSession.HOOK_check_host_dialog()} + method and hook some interactive user dialog to either of them. + + @param client: SSH client (C{X2goControlSession*}) instance + @type client: C{X2goControlSession*} instance + @param hostname: remote hostname + @type hostname: C{str} + @param key: host key to validate + @type key: Paramiko/SSH key instance + + @raise X2goHostKeyException: if the X2Go server host key is not in the C{known_hosts} file + @raise X2goSSHProxyHostKeyException: if the SSH proxy host key is not in the C{known_hosts} file + @raise SSHException: if this instance does not know its {self.session_instance} + + """ + self.client = client + self.hostname = hostname + if (self.hostname.find(']') == -1) and (self.hostname.find(':') == -1): + # if hostname is an IPv4 quadruple with standard SSH port... + self.hostname = '[%s]:22' % self.hostname + self.key = key + self.client._log(paramiko.common.DEBUG, 'Interactively Checking %s host key for %s: %s' % + (self.key.get_name(), self.get_hostname(), binascii.hexlify(self.key.get_fingerprint()))) + if self.session_instance: + + if self.fake_hostname is not None: + server_key = client.get_transport().get_remote_server_key() + keytype = server_key.get_name() + our_server_key = client._system_host_keys.get(self.fake_hostname, {}).get(keytype, None) + if our_server_key is None: + if self.session_instance.control_session.unique_hostkey_aliases: + our_server_key = client._host_keys.get(self.session_instance.get_profile_id(), {}).get(keytype, None) + self.session_instance.logger('SSH host key verification for SSH-proxied host %s with %s fingerprint ,,%s\'\' succeeded. This host is known by the X2Go session profile ID of profile »%s«.' % (self.fake_hostname, self.get_key_name(), self.get_key_fingerprint_with_colons(), self.session_instance.profile_name), loglevel=log.loglevel_NOTICE) + else: + our_server_key = client._host_keys.get(self.fake_hostname, {}).get(keytype, None) + self.session_instance.logger('SSH host key verification for SSH-proxied host %s with %s fingerprint ,,%s\'\' succeeded. This host is known by the address it has behind the SSH proxy host.' % (self.fake_hostname, self.get_key_name(), self.get_key_fingerprint_with_colons()), loglevel=log.loglevel_NOTICE) + if our_server_key is not None: + return + + self.session_instance.logger('SSH host key verification for host %s with %s fingerprint ,,%s\'\' initiated. We are seeing this X2Go server for the first time.' % (self.get_hostname(), self.get_key_name(), self.get_key_fingerprint_with_colons()), loglevel=log.loglevel_NOTICE) + _valid = self.session_instance.HOOK_check_host_dialog(self.get_hostname_name(), + port=self.get_hostname_port(), + fingerprint=self.get_key_fingerprint_with_colons(), + fingerprint_type=self.get_key_name(), + ) + if _valid: + if self.session_instance.control_session.unique_hostkey_aliases: + paramiko.AutoAddPolicy().missing_host_key(client, self.session_instance.get_profile_id(), key) + else: + paramiko.AutoAddPolicy().missing_host_key(client, self.get_hostname(), key) + + else: + if type(self.caller) in (sshproxy.X2goSSHProxy, ): + raise x2go_exceptions.X2goSSHProxyHostKeyException('Invalid host %s is not authorized for access. Add the host to Paramiko/SSH\'s known_hosts file.' % self.get_hostname()) + else: + raise x2go_exceptions.X2goHostKeyException('Invalid host %s is not authorized for access. Add the host to Paramiko/SSH\'s known_hosts file.' % self.get_hostname()) + else: + raise x2go_exceptions.SSHException('Policy has collected host key information on %s for further introspection' % self.get_hostname()) + + def check_ssh_host_key(x2go_sshclient_instance, hostname, port=22): """\ Perform a Paramiko/SSH host key check by connecting to the host and diff --git a/x2go/defaults.py b/x2go/defaults.py index 8689608..193ef90 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -297,6 +297,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = { 'iconvto': 'UTF-8', 'iconvfrom': 'UTF-8', 'useiconv': False, 'usesshproxy': False, 'sshproxyhost': 'proxyhost.mydomain', 'sshproxyport': 22, 'sshproxyuser': '', 'sshproxykeyfile': '', 'sshproxytype': 'SSH', 'sshproxysameuser': False, 'sshproxysamepass': False, 'sshproxyautologin': True, + 'uniquehostkeyaliases': False, 'useexports': True, 'restoreexports': False, 'fstunnel': True, 'export': '', 'usemimebox': False, 'mimeboxextensions': '', 'mimeboxaction': 'OPEN', 'fullscreen': False, diff --git a/x2go/utils.py b/x2go/utils.py index a83c78a..a1dbab5 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -213,6 +213,7 @@ def _convert_SessionProfileOptions_2_SessionParams(options): 'forwardsshagent': 'forward_sshagent', 'autologin': 'look_for_keys', 'sshproxyautologin': 'sshproxy_look_for_keys', + 'uniquehostkeyaliases': 'unique_hostkey_aliases', } _speed_dict = { '0': 'modem', 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).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.1.1-25-gc2e2335
by git-admin＠x2go.org 13 Jan '13

13 Jan '13

The branch, master has been updated via c2e233584ebfc0d361028c68f2d54fdbb7844372 (commit) from 0916a6aec0281fa70dfcfa4a1edc0d3d0c56a8cc (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 c2e233584ebfc0d361028c68f2d54fdbb7844372 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jan 13 16:30:13 2013 +0100 Add cmdline option --add-to-known-hosts. Add SSH host keys automatically to the client's known_hosts file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ man/man1/pyhoca-gui.1 | 5 +++++ pyhoca-gui | 1 + pyhoca/wxgui/frontend.py | 3 ++- pyhoca/wxgui/logon.py | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d2acff9..90c676e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ pyhoca-gui (0.2.2.0-0~x2go1) UNRELEASED; urgency=low - Translation source file (.pot) updated. Update of en.po and de.po. - Drop SSH proxy tunnel configuration parameter. Adapt PyHoca-GUI to the way X2GoClient configures the SSH proxy settings. + - Add cmdline option --add-to-known-hosts. Add SSH host keys automatically + to the client's known_hosts file. * /debian/control: + Thanks to Orion's patch in bug #91 we can drop many build dependencies. + Versioned Depend: on python-x2go (>= 0.2.2.0-0~). diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1 index 790b2de..8f07e83 100644 --- a/man/man1/pyhoca-gui.1 +++ b/man/man1/pyhoca-gui.1 @@ -95,6 +95,11 @@ Restrict functionality of \fBpyhoca-gui\fR's main session manager icon that is s switch limits the icon 's functionality to a right-click menu that allows one to raise the ,,About'' window and exit the application. On left-click only a minimal session menu is shown. .TP +\*(T<\fB\-\-add-to-known-hosts\fR\*(T> +Automatically add host key fingerprint to .ssh/known_hosts in case of "authenticity of server can't be established" (without user interaction). + +Handle this option with care: Using it lessens the security/integrity of your SSH client setup. +.TP \*(T<\fB\-\-start-on-connect\fR\*(T> Start a session directly after authentication (only if no suspended sessions are available). .TP diff --git a/pyhoca-gui b/pyhoca-gui index c077301..d0da14f 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -206,6 +206,7 @@ x2go_gui_options = [ {'args':['--tray-icon'], 'default': None, 'metavar': '<your-logo>', 'help': 'define an alternative system tray icon file (PNG files only, leave out file extension here, size 22x22 on Linux, 16x16 on Windows)', }, {'args':['--tray-icon-connecting'], 'default': None, 'metavar': '<your-logo-while-connecting>', 'help': 'define an alternative system tray icon file while connecting to a server (PNG files only, leave out file extension here, size 22x22 on Linux, 16x16 on Windows)', }, {'args':['--restricted-trayicon'], 'default': False, 'action': 'store_true', 'help': 'restricts session manager\'s main icon functionality to information window and application exit; on left-click only a minimal session menu is shown', }, + {'args':['--add-to-known-hosts'], 'default': False, 'action': 'store_true', 'help': 'automatically add SSH host keys to the known_hosts files of the client-side user', }, {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'start a session directly after authentication if no session is currently running/suspended', }, {'args':['--exit-on-disconnect'], 'default': False, 'action': 'store_true', 'help': 'exit the session manager after a server connection has died', }, {'args':['--resume-newest-on-connect', '--resume-on-connect'], 'default': False, 'action': 'store_true', 'help': 'on connect auto-resume the newest suspended session', }, diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 45f60dd..6bc336e 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -275,6 +275,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ # cmd line options + self.add_to_known_hosts = self.args.add_to_known_hosts self.auto_connect = self.args.auto_connect self.start_on_connect = self.args.start_on_connect self.resume_newest_on_connect = self.args.resume_newest_on_connect @@ -602,7 +603,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): _session_uses_sshproxy = self._X2goClient__session_uses_sshproxy(session_uuid) _session_reuses_sshproxy_authinfo = self._X2goClient__session_reuses_sshproxy_authinfo(session_uuid) if _can_session_auto_connect: - self._X2goClient__connect_session(session_uuid) + self._X2goClient__connect_session(session_uuid, add_to_known_hosts=self.add_to_known_hosts) if not self._X2goClient__server_valid_x2gouser(session_uuid): self.notifier.send(_(u'%s - connect failure') % profile_name, _(u'User is not allowed to start X2Go sessions!'), icon='session_warning', timeout=10000) self.OnServerDisconnect(evt) diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index 36ac3d9..0557288 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -287,7 +287,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): username=username, password=password, force_password_auth=force_password_auth, - add_to_known_hosts=False, + add_to_known_hosts=self._PyHocaGUI.add_to_known_hosts, sshproxy_user=sshproxy_user, sshproxy_password=sshproxy_password, sshproxy_force_password_auth=sshproxy_force_password_auth, hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.1.1-24-g0916a6a
by git-admin＠x2go.org 13 Jan '13

13 Jan '13

The branch, master has been updated via 0916a6aec0281fa70dfcfa4a1edc0d3d0c56a8cc (commit) from 6d1945340163f63a971625d0c5c5259a38620299 (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 0916a6aec0281fa70dfcfa4a1edc0d3d0c56a8cc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jan 13 15:55:36 2013 +0100 expect DirectRDP support for 0.3.0.0 ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/frontend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 0eadf94..45f60dd 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -727,7 +727,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): if self.session_profiles.get_profile_config(profile_name)['directrdp']: m = messages.PyHoca_MessageWindow_Ok(self, title=_(u'%s: DirectRDP not supported yet') % self.appname, - msg=_(u"We apologize for the inconvenience...\n\nSession profiles of type ,,DirectRDP'' are not\nsupported by %s (%s), yet!!\n\nDirectRDP support will be available in %s (>= 0.2.2.0).") % (self.appname, self.version, self.appname), + msg=_(u"We apologize for the inconvenience...\n\nSession profiles of type ,,DirectRDP'' are not\nsupported by %s (%s), yet!!\n\nDirectRDP support will be available in %s (>= 0.3.0.0).") % (self.appname, self.version, self.appname), icon='warning', profile_name=profile_name) m.ShowModal() hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.1.1-23-g6d19453
by git-admin＠x2go.org 13 Jan '13

13 Jan '13

The branch, master has been updated via 6d1945340163f63a971625d0c5c5259a38620299 (commit) via aee40cd57c0925f62589eab444d0505c94245793 (commit) via 6fd80fce8bb01b6b3c6fa59eaaf7f35cae0f6cb2 (commit) from ad6f58f4462ebd6acb1852da0f92cfaa8d750689 (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 6d1945340163f63a971625d0c5c5259a38620299 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jan 13 15:53:44 2013 +0100 bump version to 0.2.2.0 commit aee40cd57c0925f62589eab444d0505c94245793 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jan 13 15:52:31 2013 +0100 Drop SSH proxy tunnel configuration parameter. Adapt PyHoca-GUI to the way X2GoClient configures the SSH proxy settings. commit 6fd80fce8bb01b6b3c6fa59eaaf7f35cae0f6cb2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jan 13 15:44:53 2013 +0100 typo in German translation ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 ++- debian/control | 2 +- po/de.po | 2 +- pyhoca/wxgui/__init__.py | 2 +- pyhoca/wxgui/profilemanager.py | 176 ++++++++-------------------------------- 5 files changed, 45 insertions(+), 147 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b0dab63..d2acff9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,21 +1,23 @@ -pyhoca-gui (0.2.1.2-0~x2go1) UNRELEASED; urgency=low +pyhoca-gui (0.2.2.0-0~x2go1) UNRELEASED; urgency=low [ Orion Poplawski ] - * New upstream version (0.2.1.2): + * New upstream version (0.2.2.0): - Importing all of pyhoca.wxgui in setup.py causes rpmbuild problems due to DISPLAY not being set. It is overkill as well, causing extra dependencies to be installed at build time. (Fixes: #91). [ Mike Gabriel ] - * New upstream version (0.2.1.2): + * New upstream version (0.2.2.0): - Add rules to setup.py that install PyHoca-GUI's data files under Linux (i.e. icons, images, man page, etc.). Thanks to Orion Poplawski for coming up with an inspiring patch. (Fixes: #92). - Add support for exporting session profiles and session profile groups. - Translation source file (.pot) updated. Update of en.po and de.po. + - Drop SSH proxy tunnel configuration parameter. Adapt PyHoca-GUI to the + way X2GoClient configures the SSH proxy settings. * /debian/control: + Thanks to Orion's patch in bug #91 we can drop many build dependencies. - + Versioned Depend: on python-x2go (>= 0.2.1.2-0~). + + Versioned Depend: on python-x2go (>= 0.2.2.0-0~). + Add gnome-colors-common to Build-Depends. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 20 Dec 2012 08:51:50 +0100 diff --git a/debian/control b/debian/control index a3bc64e..ad57e92 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.2.1.2-0~), + python-x2go (>=0.2.2.0-0~), python-argparse, python-notify, python-setproctitle, diff --git a/po/de.po b/po/de.po index d4097b8..0796ecd 100644 --- a/po/de.po +++ b/po/de.po @@ -418,7 +418,7 @@ msgstr "Schlüssel" #: ../pyhoca/wxgui/profilemanager.py:276 msgid "Discover SSH keys or use SSH agent for proxy authentication" -msgstr "Find SSH Schlüssel oder verwende SSH Agent für Proxy-Anmeldung" +msgstr "Finde SSH Schlüssel oder verwende SSH Agent für Proxy-Anmeldung" #: ../pyhoca/wxgui/profilemanager.py:279 msgid "Modem" diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index 7f1a55b..eddb9e3 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -18,6 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.2.1.2' +__VERSION__ = '0.2.2.0' from frontend import * diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 0d3dde5..c8c9de8 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -149,19 +149,31 @@ class PyHocaGUI_ProfileManager(wx.Dialog): # allow localization of the default keyboard settings self.profile_name = self.profile_config['name'] = profile_name + # this code block is for compatibility of session profiles prior to 0.2.2.0: + _from_host = _from_port = _to_host = _to_port = None + if self.profile_config.has_key('sshproxytunnel'): + if self.profile_config['sshproxytunnel'].count(':') == 2: + _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':') + _from_host = 'localhost' + elif self.profile_config['sshproxytunnel'].count(':') == 3: + _from_host, _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':') + + if _to_host: self.profile_config['host'] = _to_host + if _to_port: self.profile_config['sshport'] = int(_to_port) + # we create a backup dict of our profile_config immediately (for being able to reset erroneously made changes) self.profile_config_bak = copy.deepcopy(self.profile_config) self._last_rdpclient = self.profile_config['rdpclient'] self._last_application = self.applicationChoices['TERMINAL'] - self.X2goTabs = wx.Notebook(self, -1, style=0) - self.tab_Profile = wx.Panel(self.X2goTabs, -1) - self.tab_Session = wx.Panel(self.X2goTabs, -1) - self.tab_Connection = wx.Panel(self.X2goTabs, -1) - self.tab_LinkQuality = wx.Panel(self.X2goTabs, -1) - self.tab_Settings = wx.Panel(self.X2goTabs, -1) - self.tab_SharedResources = wx.Panel(self.X2goTabs, -1) + self.X2GoTabs = wx.Notebook(self, -1, style=0) + self.tab_Profile = wx.Panel(self.X2GoTabs, -1) + self.tab_Session = wx.Panel(self.X2GoTabs, -1) + self.tab_Connection = wx.Panel(self.X2GoTabs, -1) + self.tab_LinkQuality = wx.Panel(self.X2GoTabs, -1) + self.tab_Settings = wx.Panel(self.X2GoTabs, -1) + self.tab_SharedResources = wx.Panel(self.X2GoTabs, -1) # boxes for all tabs self.staticbox_Profile = wx.StaticBox(self.tab_Profile, -1, ' %s ' % _(u'Session Title')) @@ -261,12 +273,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20)) self.SSHProxyPortLabel = wx.StaticText(self.tab_Connection, -1, _(u"Port")+": ") self.SSHProxyPort = wx.SpinCtrl(self.tab_Connection, -1, "22", min=1, max=65534) - self.SSHProxyTunnelLabel = wx.StaticText(self.tab_Connection, -1, _(u"SSH Proxy Tunnel")+": ") - self.SSHProxyTunnelFromHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) - self.SSHProxyTunnelFromPort = wx.SpinCtrl(self.tab_Connection, -1, "44444", min=1, max=65534) - self.SSHProxyTunnelBetweenLabel = wx.StaticText(self.tab_Connection, -1, " -> ") - self.SSHProxyTunnelToHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) - self.SSHProxyTunnelToPort = wx.SpinCtrl(self.tab_Connection, -1, "22", min=1, max=65534) self.SSHProxyAutoLogin = wx.CheckBox(self.tab_Connection, -1, _(u"Discover SSH keys or use SSH agent for proxy authentication")) self.LinkSpeed = wx.Slider(self.tab_LinkQuality, -1, 0, 0, 4) @@ -367,8 +373,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.Bind(wx.EVT_CHECKBOX, self.OnSSHProxySameUser, self.SSHProxySameUser) self.Bind(wx.EVT_CHECKBOX, self.OnSSHProxySamePassword, self.SSHProxySamePassword) self.Bind(wx.EVT_CHECKBOX, self.OnSSHProxyAutoLogin, self.SSHProxyAutoLogin) - self.Bind(wx.EVT_TEXT, self.OnUpdateSSHProxyTunnelFromHost, self.SSHProxyTunnelFromHost) - self.Bind(wx.EVT_TEXT, self.OnUpdateSSHProxyTunnelFromPort, self.SSHProxyTunnelFromPort) self.Bind(wx.EVT_COMBOBOX, self.OnCompressionSelected, self.Compression) self.Bind(wx.EVT_RADIOBUTTON, self.OnSetDisplayFullscreen, self.DisplayTypeFullscreen) self.Bind(wx.EVT_RADIOBUTTON, self.OnSetDisplayMaximize, self.DisplayTypeMaximize) @@ -458,11 +462,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyPortLabel.SetMinSize((-1, 16)) self.SSHProxyPort.SetMinSize((65, self._textfield_height)) self.SSHProxyKeyFile.SetMinSize((220, self._textfield_height)) - self.SSHProxyTunnelLabel.SetMinSize((-1, 16)) - self.SSHProxyTunnelFromPort.SetMinSize((65, self._textfield_height)) - self.SSHProxyTunnelToPort.SetMinSize((65, self._textfield_height)) - self.SSHProxyTunnelFromHost.SetMinSize((140, self._textfield_height)) - self.SSHProxyTunnelToHost.SetMinSize((140, self._textfield_height)) if X2GOCLIENT_OS == 'Windows': self.LinkSpeed.SetMinSize((425, self._textfield_height)) else: @@ -602,18 +601,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_3_2_1.Add(self.SSHProxyPort, pos=(3,4), span=(1,2), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_2_1.Add(self.SSHProxyAutoLogin, pos=(4,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_2_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_2_1_1.Add(self.SSHProxyTunnelLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1_1.Add(self.SSHProxyTunnelFromHost, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1_1.Add((4, 0)) - sizer_3_2_1_1.Add(self.SSHProxyTunnelFromPort, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1_1.Add((8, 0)) - sizer_3_2_1_1.Add(self.SSHProxyTunnelBetweenLabel, flag=wx.ALIGN_CENTRE_VERTICAL|wx.ALIGN_CENTRE_HORIZONTAL) - sizer_3_2_1_1.Add((8, 0)) - sizer_3_2_1_1.Add(self.SSHProxyTunnelToHost, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1_1.Add((4, 0)) - sizer_3_2_1_1.Add(self.SSHProxyTunnelToPort, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1_1.Add((0,32)) - sizer_3_2_1.Add(sizer_3_2_1_1, pos=(5,0), span=(1,6)) sizer_3_2.Add(sizer_3_2_1, flag=wx.EXPAND|wx.ALL, border=7) sizer_3.Add(sizer_3_1, flag=wx.EXPAND|wx.ALL, border=5) @@ -794,12 +781,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.tab_SharedResources.SetSizerAndFit(sizer_6) self.tab_SharedResources.Layout() - self.X2goTabs.AddPage(self.tab_Profile, _(u"Profile")) - self.X2goTabs.AddPage(self.tab_Session, _(u"Session")) - self.X2goTabs.AddPage(self.tab_Connection, _(u"Connection")) - self.X2goTabs.AddPage(self.tab_LinkQuality, _(u"Link Quality")) - self.X2goTabs.AddPage(self.tab_Settings, _(u"Settings")) - self.X2goTabs.AddPage(self.tab_SharedResources, _(u"Sharing")) + self.X2GoTabs.AddPage(self.tab_Profile, _(u"Profile")) + self.X2GoTabs.AddPage(self.tab_Session, _(u"Session")) + self.X2GoTabs.AddPage(self.tab_Connection, _(u"Connection")) + self.X2GoTabs.AddPage(self.tab_LinkQuality, _(u"Link Quality")) + self.X2GoTabs.AddPage(self.tab_Settings, _(u"Settings")) + self.X2GoTabs.AddPage(self.tab_SharedResources, _(u"Sharing")) # the bottom area with OK, Defaults and Cancel buttons sizer_B = wx.BoxSizer(wx.HORIZONTAL) @@ -811,7 +798,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): # put it all together... MainSizer = wx.BoxSizer(wx.VERTICAL) - MainSizer.Add(self.X2goTabs, proportion=1, flag=wx.EXPAND|wx.FIXED_MINSIZE) + MainSizer.Add(self.X2GoTabs, proportion=1, flag=wx.EXPAND|wx.FIXED_MINSIZE) MainSizer.Add(sizer_B, flag=wx.ALIGN_RIGHT) self.SetSizerAndFit(MainSizer) @@ -822,7 +809,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): max5_x, max5_y = self.tab_Settings.GetBestSize() max6_x, max6_y = self.tab_SharedResources.GetBestSize() - #self.SetSize(self.GetBestSize() + self.X2goTabs.GetBestSize()) + #self.SetSize(self.GetBestSize() + self.X2GoTabs.GetBestSize()) if X2GOCLIENT_OS == "Windows": self.SetSize((max(max1_x, max2_x, max3_x, max4_x, max5_x) * 1.05, max(max1_y, max2_y, max3_y, max4_y, max5_y) * 1.10 + 50)) @@ -881,18 +868,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyUser.SetValue(self.profile_config['sshproxyuser']) self.SSHProxyKeyFile.SetValue(self.profile_config['sshproxykeyfile']) - _from_host = _from_port = _to_host = _to_port = None - if self.profile_config['sshproxytunnel'].count(':') == 2: - _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':') - _from_host = 'localhost' - elif self.profile_config['sshproxytunnel'].count(':') == 3: - _from_host, _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':') - - if _from_host: self.SSHProxyTunnelFromHost.SetValue(_from_host) - if _from_port: self.SSHProxyTunnelFromPort.SetValue(int(_from_port)) - if _to_host: self.SSHProxyTunnelToHost.SetValue(_to_host) - if _to_port: self.SSHProxyTunnelToPort.SetValue(int(_to_port)) - self.UseSSHProxy.SetValue(_ssh_proxy) self.SSHProxySameUser.SetValue(self.profile_config['sshproxysameuser']) self.SSHProxySamePassword.SetValue(self.profile_config['sshproxysamepass']) @@ -1246,12 +1221,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyHost.Enable(False) self.SSHProxyPortLabel.Enable(False) self.SSHProxyPort.Enable(False) - self.SSHProxyTunnelLabel.Enable(False) - self.SSHProxyTunnelFromHost.Enable(False) - self.SSHProxyTunnelFromPort.Enable(False) - self.SSHProxyTunnelBetweenLabel.Enable(False) - self.SSHProxyTunnelToHost.Enable(False) - self.SSHProxyTunnelToPort.Enable(False) self.SSHProxyAutoLogin.Enable(False) @@ -1281,13 +1250,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['icon'] = ':icons/128x128/x2gosession.png' self.profile_config['user'] = self.UserName.GetValue() self.profile_config['key'] = self.SSHKeyFile.GetValue() + self.profile_config['host'] = self.Host.GetValue() if self.UseSSHProxy.GetValue(): self.profile_config['usesshproxy'] = True - self.profile_config['host'] = self.SSHProxyTunnelFromHost.GetValue() - self.profile_config['sshport'] = self.SSHProxyTunnelFromPort.GetValue() else: self.profile_config['usesshproxy'] = False - self.profile_config['host'] = self.Host.GetValue() if _session_type != 'DirectRDP': self.profile_config['sshport'] = self.SSHPort.GetValue() self.profile_config['sshproxysameuser'] = self.SSHProxySameUser.GetValue() @@ -1295,11 +1262,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['sshproxyhost'] = self.SSHProxyHost.GetValue() self.profile_config['sshproxyport'] = self.SSHProxyPort.GetValue() - self.profile_config['sshproxytunnel'] = '%s:%s:%s:%s' % (self.SSHProxyTunnelFromHost.GetValue(), - self.SSHProxyTunnelFromPort.GetValue(), - self.SSHProxyTunnelToHost.GetValue(), - self.SSHProxyTunnelToPort.GetValue(), - ) + if self.profile_config.has_key('sshproxytunnel'): + self.profile_config['sshproxytunnel'] = 'DEPRECATED_CAN_BE_REMOVED' self.profile_config['sshproxyautologin'] = self.SSHProxyAutoLogin.GetValue() if self.profile_config['sshproxysameuser']: self.profile_config['sshproxyuser'] = '' @@ -1521,12 +1485,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyHost.Enable(False) self.SSHProxyPortLabel.Enable(False) self.SSHProxyPort.Enable(False) - self.SSHProxyTunnelLabel.Enable(False) - self.SSHProxyTunnelFromHost.Enable(False) - self.SSHProxyTunnelFromPort.Enable(False) - self.SSHProxyTunnelBetweenLabel.Enable(False) - self.SSHProxyTunnelToHost.Enable(False) - self.SSHProxyTunnelToPort.Enable(False) self.SSHProxyAutoLogin.Enable(False) self.LinkSpeed.Enable(False) self.ModemLabel.Enable(False) @@ -1566,14 +1524,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): @type event: C{obj} """ - if not self.UseSSHProxy.GetValue(): - self.HostLabel.Enable(True) - self.Host.Enable(True) - self.SSHPortLabel.Enable(True) - self.SSHPort.Enable(True) - self.SSHPort.SetValue(self.profile_config_bak['sshport']) - else: - self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue()) + self.HostLabel.Enable(True) + self.Host.Enable(True) + self.SSHPortLabel.Enable(True) + self.SSHPort.Enable(True) + self.SSHPort.SetValue(self.profile_config_bak['sshport']) self.SSHAutoLogin.Enable(True) if PARAMIKO_FEATURE['forward-ssh-agent']: self.SSHForwardAuthAgent.Enable(True) @@ -1956,18 +1911,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): if self.SSHProxyAutoLogin.GetValue(): self.SSHProxyKeyFileLabel.Enable(False) self.SSHProxyAutoLogin.Enable(True) - self.SSHProxyTunnelLabel.Enable(True) - self.SSHProxyTunnelFromHost.Enable(True) - self.SSHProxyTunnelFromPort.Enable(True) - self.SSHProxyTunnelBetweenLabel.Enable(True) - self.SSHProxyTunnelToHost.Enable(True) - self.SSHProxyTunnelToPort.Enable(True) - self.Host.Enable(False) - self.HostLabel.Enable(False) - self.Host.SetValue(self.SSHProxyTunnelFromHost.GetValue()) - self.SSHPort.Enable(False) - self.SSHPortLabel.Enable(False) - self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue()) else: self.staticbox_Proxy.Enable(False) self.SSHProxySameUser.Enable(False) @@ -1981,39 +1924,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyKeyFileLabel.Enable(False) self.SSHProxyKeyFile.Enable(False) self.SSHProxyKeyFileBrowseButton.Enable(False) - self.SSHProxyTunnelLabel.Enable(False) - self.SSHProxyTunnelFromHost.Enable(False) - self.SSHProxyTunnelFromPort.Enable(False) - self.SSHProxyTunnelBetweenLabel.Enable(False) - self.SSHProxyTunnelToHost.Enable(False) - self.SSHProxyTunnelToPort.Enable(False) self.SSHProxyAutoLogin.Enable(False) - self.Host.Enable(True) - self.HostLabel.Enable(True) - self.Host.SetValue(self.profile_config_bak['host']) - self.SSHPort.Enable(True) - self.SSHPortLabel.Enable(True) - self.SSHPort.SetValue(self.profile_config_bak['sshport']) - - def OnUpdateSSHProxyTunnelFromHost(self, event): - """\ - Gets called whenever the ssh-proxy-tunnel-from-host gets modified. - - @param event: event - @type event: C{obj} - - """ - self.Host.SetValue(self.SSHProxyTunnelFromHost.GetValue()) - - def OnUpdateSSHProxyTunnelFromPort(self, event): - """\ - Gets called whenever the ssh-proxy-tunnel-from-port gets modified. - - @param event: event - @type event: C{obj} - - """ - self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue()) def OnSetKeyboard(self, event): """\ @@ -2048,7 +1959,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.KeyboardModel.Enable(False) self.KeyboardVariant.Enable(False) - def OnSoundEnable(self, event): # wxGlade: X2goMaintProfile.<event_handler> + def OnSoundEnable(self, event): """\ Gets called whenever the enable-sound checkbox gets marked. @@ -2352,21 +2263,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): elif self.profile_config['name'].strip() != self.profile_config_bak['name'] and self.profile_config['name'] in self.session_profiles.profile_names: validateOk = False self._PyHocaGUI.notifier.send(title=_(u'Profile Manager'), text=_(u'Profile name %s already exists!!!') % self.profile_config['name'].strip(), icon='profile_error') - elif self.profile_config['usesshproxy'] and self.profile_config['name'] == self.profile_config_bak['name']: - try: - (from_host, from_port) = self.profile_config['sshproxytunnel'].split(':')[0:2] - except ValueError: - self._PyHocaGUI.notifier.send(title=_(u'Profile Manager'), text=_(u'The SSH proxy configuration is incomplete. Try again.'), icon='profile_error') - for profile_name in [ p for p in self._PyHocaGUI.profile_names if p != self.profile_config['name'] ]: - test_profile_config = self.session_profiles.get_profile_config(profile_name) - if test_profile_config['usesshproxy']: - try: - (test_from_host, test_from_port) = test_profile_config['sshproxytunnel'].split(':')[0:2] - except ValueError: - continue - if (from_host, from_port) == (test_from_host, test_from_port): - validateOk = False - self._PyHocaGUI.notifier.send(title=_(u'Profile Manager'), text=_(u'Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\nPlease change the SSH proxy settings accordingly.' % (profile_name.strip(), from_host, from_port)), icon='profile_warning') return validateOk def OnOKButton(self, event): hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

python-x2go.git - master (branch) updated: 0.2.1.1-19-ge1b34e0
by git-admin＠x2go.org 13 Jan '13

13 Jan '13

The branch, master has been updated via e1b34e08af86bd3c56119cf467dfae5520c07fac (commit) via cd14d38e23fb6cf8e7860a6f7290669301c874f4 (commit) from 4de963ff56562f3fcb967ba2344d122e825aeb14 (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 e1b34e08af86bd3c56119cf467dfae5520c07fac Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jan 13 15:54:50 2013 +0100 bump version to 0.2.2.0 commit cd14d38e23fb6cf8e7860a6f7290669301c874f4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jan 13 15:54:09 2013 +0100 make SSH proxy setting migration more smooth ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 +++--- x2go/__init__.py | 2 +- x2go/backends/control/_stdout.py | 3 +++ x2go/defaults.py | 2 +- x2go/utils.py | 13 +++++++++---- 5 files changed, 17 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ca60226..33a0f83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,13 @@ -python-x2go (0.2.1.2-0~x2go1) UNRELEASED; urgency=low +python-x2go (0.2.2.0-0~x2go1) UNRELEASED; urgency=low [ Orion Poplawski ] - * New upstream version (0.2.1.2): + * New upstream version (0.2.2.0): - Importing all of x2go in setup.py causes rpmbuild problems due to DISPLAY not being set. It is overkill as well, causing extra dependencies to be installed at build time. (Fixes: #91). [ Mike Gabriel ] - * New upstream version (0.2.1.2): + * New upstream version (0.2.2.0): - Add session profile option ,,display'' to default session profile options. - Catch any kind of exception when writing session profile files and return True or False in cases where I/O errors occur. diff --git a/x2go/__init__.py b/x2go/__init__.py index aefd224..8398a96 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -178,7 +178,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.2.1.2' +__VERSION__ = '0.2.2.0' from gevent import monkey monkey.patch_all() diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index d7e0aec..2112f14 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -722,6 +722,9 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): if use_sshproxy and sshproxy_host and sshproxy_user: try: + + if not sshproxy_tunnel: + sshproxy_tunnel = "localhost:44444:%s:%s" % (hostname, port) self.sshproxy_session = sshproxy.X2goSSHProxy(known_hosts=self.known_hosts, sshproxy_host=sshproxy_host, sshproxy_port=sshproxy_port, diff --git a/x2go/defaults.py b/x2go/defaults.py index b40fefc..8689608 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -295,7 +295,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = { 'autologin': True, 'autoconnect': False, 'autostart': False, 'setsessiontitle': False, 'sessiontitle': "", 'speed': 2, 'pack': '16m-jpeg', 'quality': 9, 'iconvto': 'UTF-8', 'iconvfrom': 'UTF-8', 'useiconv': False, - 'usesshproxy': False, 'sshproxyhost': 'proxyhost.mydomain', 'sshproxyport': 22, 'sshproxyuser': '', 'sshproxytunnel': 'localhost:44444:server.mydomain.private:22', 'sshproxykeyfile': '', + 'usesshproxy': False, 'sshproxyhost': 'proxyhost.mydomain', 'sshproxyport': 22, 'sshproxyuser': '', 'sshproxykeyfile': '', 'sshproxytype': 'SSH', 'sshproxysameuser': False, 'sshproxysamepass': False, 'sshproxyautologin': True, 'useexports': True, 'restoreexports': False, 'fstunnel': True, 'export': '', 'usemimebox': False, 'mimeboxextensions': '', 'mimeboxaction': 'OPEN', diff --git a/x2go/utils.py b/x2go/utils.py index f621ece..a83c78a 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -328,12 +328,17 @@ def _convert_SessionProfileOptions_2_SessionParams(options): del _params['sshproxysamepass'] if _params['use_sshproxy']: - _params['server'] = options['sshproxytunnel'].split(":")[-2] - _params['port'] = options['sshproxytunnel'].split(":")[-1] + + # compat code for Python X2Go 0.2.1.0 -> 0.2.2.0 + if options.has_key('sshproxytunnel'): + if not options['sshproxytunnel'].startswith('DEPRECATED'): + _params['server'] = options['sshproxytunnel'].split(":")[-2] + _params['port'] = options['sshproxytunnel'].split(":")[-1] + try: del _params['sshproxytunnel'] + except KeyError: pass + _params['sshproxy_tunnel'] = 'localhost:44444:%s:%s' % (_params['server'], _params['port']) - if options['sshproxytunnel']: - del _params['sshproxytunnel'] # currently known but ignored in Python X2go _ignored_options = [ 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).

1 0

python-x2go.git - master (branch) updated: 0.2.1.1-17-g4de963f
by git-admin＠x2go.org 13 Jan '13

13 Jan '13

The branch, master has been updated via 4de963ff56562f3fcb967ba2344d122e825aeb14 (commit) from b1c28c749e6d34ae51d5169e360ba4f3409d1d81 (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 4de963ff56562f3fcb967ba2344d122e825aeb14 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jan 13 02:44:00 2013 +0100 fix __doc__ strings ----------------------------------------------------------------------- Summary of changes: x2go/sshproxy.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index 4f66123..8252278 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -338,7 +338,7 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): Retrieve the local IP socket address this SSH proxying tunnel is (about to) bind/bound to. @return: local IP socket address - @rtype: C{int} + @rtype: C{str} """ return self.local_host @@ -357,8 +357,8 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): """\ Retrieve the remote IP socket address at the remote end of the SSH proxying tunnel. - @return: local IP socket address - @rtype: C{int} + @return: remote IP socket address + @rtype: C{str} """ return self.remote_host 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).

1 0

python-x2go.git - master (branch) updated: 0.2.1.1-16-gb1c28c7
by git-admin＠x2go.org 13 Jan '13

13 Jan '13

The branch, master has been updated via b1c28c749e6d34ae51d5169e360ba4f3409d1d81 (commit) from f787a0620a5fee6cc9df2a53a92abb81d5a99880 (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 b1c28c749e6d34ae51d5169e360ba4f3409d1d81 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jan 13 02:42:15 2013 +0100 Avoid the known_hosts file being flushed with localhost:[<someport>] entries. Store host keys of SSH-proxied hosts under the [<address>]:<port> the system has _behind_ the SSH proxy gateway. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2go/backends/control/_stdout.py | 9 ++++++++- x2go/checkhosts.py | 24 ++++++++++++++++++------ x2go/client.py | 2 +- x2go/session.py | 2 +- x2go/sshproxy.py | 33 +++++++++++++++++++++++++++++++-- x2go/utils.py | 14 +++++++------- 7 files changed, 69 insertions(+), 18 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a8da37f..ca60226 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ python-x2go (0.2.1.2-0~x2go1) UNRELEASED; urgency=low - Add session profile option ,,display'' to default session profile options. - Catch any kind of exception when writing session profile files and return True or False in cases where I/O errors occur. + - Avoid the known_hosts file being flushed with localhost:[<someport>] + entries. Store host keys of SSH-proxied hosts under the [<address>]:<port> + the system has _behind_ the SSH proxy gateway. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 20 Dec 2012 08:58:44 +0100 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index fdb80d4..d7e0aec 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -718,6 +718,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): @raise X2goRemoteHomeException: if the remote home directory does not exist or is not accessible """ + _fake_hostname = None + if use_sshproxy and sshproxy_host and sshproxy_user: try: self.sshproxy_session = sshproxy.X2goSSHProxy(known_hosts=self.known_hosts, @@ -734,6 +736,11 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): session_instance=session_instance, logger=self.logger, ) + hostname = self.sshproxy_session.get_local_proxy_host() + port = self.sshproxy_session.get_local_proxy_port() + _fake_hostname = self.sshproxy_session.get_remote_host() + _fake_port = self.sshproxy_session.get_remote_port() + _fake_hostname = "[%s]:%s" % (_fake_hostname, _fake_port) except: if self.sshproxy_session: @@ -750,7 +757,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): port = self.sshproxy_session.get_local_proxy_port() if not add_to_known_hosts and session_instance: - self.set_missing_host_key_policy(checkhosts.X2goInteractiveAddPolicy(caller=self, session_instance=session_instance)) + self.set_missing_host_key_policy(checkhosts.X2goInteractiveAddPolicy(caller=self, session_instance=session_instance, fake_hostname=_fake_hostname)) if add_to_known_hosts: self.set_missing_host_key_policy(paramiko.AutoAddPolicy()) diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py index 98badbb..aedb08d 100644 --- a/x2go/checkhosts.py +++ b/x2go/checkhosts.py @@ -50,7 +50,7 @@ class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy): method and hook some interactive user dialog to either of them. """ - def __init__(self, caller=None, session_instance=None): + def __init__(self, caller=None, session_instance=None, fake_hostname=None): """\ @param caller: calling instance @type caller: C{class} @@ -60,6 +60,7 @@ class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy): """ self.caller = caller self.session_instance = session_instance + self.fake_hostname = fake_hostname def missing_host_key(self, client, hostname, key): """\ @@ -95,6 +96,17 @@ class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy): client._log(paramiko.common.DEBUG, 'Interactively Checking %s host key for %s: %s' % (self.key.get_name(), self.hostname, binascii.hexlify(self.key.get_fingerprint()))) if self.session_instance: + + if self.fake_hostname is not None: + server_key = client.get_transport().get_remote_server_key() + keytype = server_key.get_name() + our_server_key = client._system_host_keys.get(self.fake_hostname, {}).get(keytype, None) + if our_server_key is None: + our_server_key = client._host_keys.get(self.fake_hostname, {}).get(keytype, None) + if our_server_key is not None: + self.session_instance.logger('SSH host key verification for SSH-proxied host %s with %s fingerprint ,,%s\'\' succeeded. This host is known by the address it has behind the SSH proxy host.' % (self.fake_hostname, self.get_key_name(), self.get_key_fingerprint_with_colons()), loglevel=log.loglevel_NOTICE) + return + self.session_instance.logger('SSH host key verification for host %s with %s fingerprint ,,%s\'\' initiated. We are seeing this X2Go server for the first time.' % (self.get_hostname(), self.get_key_name(), self.get_key_fingerprint_with_colons()), loglevel=log.loglevel_NOTICE) _valid = self.session_instance.HOOK_check_host_dialog(self.get_hostname_name(), port=self.get_hostname_port(), @@ -102,14 +114,14 @@ class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy): fingerprint_type=self.get_key_name(), ) if _valid: - paramiko.AutoAddPolicy().missing_host_key(client, self.hostname, key) + paramiko.AutoAddPolicy().missing_host_key(client, self.get_hostname(), key) else: if type(self.caller) in (sshproxy.X2goSSHProxy, ): - raise x2go_exceptions.X2goSSHProxyHostKeyException('Invalid host %s is not authorized for access. Add the host to Paramiko/SSH\'s known_hosts file.' % hostname) + raise x2go_exceptions.X2goSSHProxyHostKeyException('Invalid host %s is not authorized for access. Add the host to Paramiko/SSH\'s known_hosts file.' % self.get_hostname()) else: - raise x2go_exceptions.X2goHostKeyException('Invalid host %s is not authorized for access. Add the host to Paramiko/SSH\'s known_hosts file.' % hostname) + raise x2go_exceptions.X2goHostKeyException('Invalid host %s is not authorized for access. Add the host to Paramiko/SSH\'s known_hosts file.' % self.get_hostname()) else: - raise x2go_exceptions.SSHException('Policy has collected host key information on %s for further introspection' % hostname) + raise x2go_exceptions.SSHException('Policy has collected host key information on %s for further introspection' % self.get_hostname()) def get_client(self): """\ @@ -129,7 +141,7 @@ class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy): @rtype: C{str} """ - return self.hostname + return self.fake_hostname or self.hostname def get_hostname_name(self): """\ diff --git a/x2go/client.py b/x2go/client.py index 9471cd2..f35961d 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -454,7 +454,7 @@ class X2goClient(object): else: self.logger('HOOK_printaction_error: incoming print job ,, %s'' caused error: %s' % (filename, err_msg), loglevel=log.loglevel_ERROR) - def HOOK_check_host_dialog(self, profile_name='UNKNOWN', host='UNKNOWN', port=22, fingerprint='no fingerprint', fingerprint_type='RSA'): + def HOOK_check_host_dialog(self, profile_name='UNKNOWN', host='UNKNOWN', port=22, fingerprint='no fingerprint', fingerprint_type='UNKNOWN'): """\ HOOK method: called if a host check is requested. This hook has to either return C{True} (default) or C{False}. diff --git a/x2go/session.py b/x2go/session.py index bca32ec..43c9256 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -544,7 +544,7 @@ class X2goSession(object): else: self.logger('HOOK_sshfs_not_available: the remote X2Go server (%s) denies SSHFS access for session %s. This will result in client-side folder sharing, printing and the MIME box feature being unavailable' % (self.profile_name, self.session_name), loglevel=log.loglevel_WARN) - def HOOK_check_host_dialog(self, host, port, fingerprint='no fingerprint', fingerprint_type='RSA'): + def HOOK_check_host_dialog(self, host, port, fingerprint='no fingerprint', fingerprint_type='UNKNOWN'): """\ HOOK method: called if a host check is requested. This hook has to either return C{True} (default) or C{False}. diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index df50f2b..4f66123 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -288,7 +288,6 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): Wraps around a Paramiko/SSH host key check. """ - # hostname rewrite for localhost, force to IPv4 _hostname = self.hostname # force into IPv4 for localhost connections @@ -298,7 +297,7 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): _valid = False (_valid, _hostname, _port, _fingerprint, _fingerprint_type) = checkhosts.check_ssh_host_key(self, _hostname, port=self.port) if not _valid and self.session_instance: - _valid = self.session_instance.HOOK_check_host_dialog(_hostname, _port, fingerprint=_fingerprint, fingerprint_type=_fingerprint_type) + _valid = self.session_instance.HOOK_check_host_dialog(self.remote_host, self.remote_port, fingerprint=_fingerprint, fingerprint_type=_fingerprint_type) return _valid def run(self): @@ -334,6 +333,16 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): else: raise x2go_exceptions.X2goSSHProxyException('SSH proxy connection could not retrieve an SSH transport') + def get_local_proxy_host(self): + """\ + Retrieve the local IP socket address this SSH proxying tunnel is (about to) bind/bound to. + + @return: local IP socket address + @rtype: C{int} + + """ + return self.local_host + def get_local_proxy_port(self): """\ Retrieve the local IP socket port this SSH proxying tunnel is (about to) bind/bound to. @@ -344,6 +353,26 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): """ return self.local_port + def get_remote_host(self): + """\ + Retrieve the remote IP socket address at the remote end of the SSH proxying tunnel. + + @return: local IP socket address + @rtype: C{int} + + """ + return self.remote_host + + def get_remote_port(self): + """\ + Retrieve the remote IP socket port of the target system's SSH daemon. + + @return: remote SSH port + @rtype: C{int} + + """ + return self.remote_port + def stop_thread(self): """\ Tear down the SSH proxying tunnel. diff --git a/x2go/utils.py b/x2go/utils.py index 5cbafa4..f621ece 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -205,8 +205,6 @@ def _convert_SessionProfileOptions_2_SessionParams(options): 'sshproxyport': 'sshproxy_port', 'sshproxyuser': 'sshproxy_user', 'sshproxykeyfile': 'sshproxy_key_filename', - # FIXME: remove this next option... - 'sshproxytunnel': 'sshproxy_tunnel', 'sessiontitle': 'session_title', 'setsessiontitle': 'set_session_title', 'published': 'published_applications', @@ -329,11 +327,13 @@ def _convert_SessionProfileOptions_2_SessionParams(options): _params['sshproxy_key_filename'] = _params['key_filename'] del _params['sshproxysamepass'] - #if options['sshproxytunnel']: - # del _params['sshproxytunnel'] - # - #if _params['use_sshproxy']: - # _params['sshproxy_tunnel'] = 'localhost:44444:%s:%s' % (_params['server'], _params['port']) + if _params['use_sshproxy']: + _params['server'] = options['sshproxytunnel'].split(":")[-2] + _params['port'] = options['sshproxytunnel'].split(":")[-1] + _params['sshproxy_tunnel'] = 'localhost:44444:%s:%s' % (_params['server'], _params['port']) + + if options['sshproxytunnel']: + del _params['sshproxytunnel'] # currently known but ignored in Python X2go _ignored_options = [ 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).

1 0

python-x2go.git - master (branch) updated: 0.2.1.1-15-gf787a06
by git-admin＠x2go.org 13 Jan '13

13 Jan '13

The branch, master has been updated via f787a0620a5fee6cc9df2a53a92abb81d5a99880 (commit) from a986b6081ff2f677036342e210ec9fac3d2f1331 (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 f787a0620a5fee6cc9df2a53a92abb81d5a99880 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jan 13 01:02:43 2013 +0100 fix name of Python X2Go in epydoc build ----------------------------------------------------------------------- Summary of changes: debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/rules b/debian/rules index 214d87b..0903f0a 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2") override_dh_auto_build: mkdir -p .epydoc/html rm -Rf .epydoc/html/* - epydoc --debug -n "Python X2go" -u http://www.x2go.org -v --html --no-private -o .epydoc/html x2go/ + epydoc --debug -n "Python X2Go" -u http://www.x2go.org -v --html --no-private -o .epydoc/html x2go/ dh_auto_build # tests from upstream are currently broken... 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).

1 0

python-x2go.git - master (branch) updated: 0.2.1.1-14-ga986b60
by git-admin＠x2go.org 12 Jan '13

12 Jan '13

The branch, master has been updated via a986b6081ff2f677036342e210ec9fac3d2f1331 (commit) via 60047c179c15e332894d321f323270b0675093ad (commit) via 2a9b2742b4f4386750758c6c67f6d003225f168a (commit) from c4a24c0afc5ab8636f069c80c1c70c19df52d5d3 (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 a986b6081ff2f677036342e210ec9fac3d2f1331 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jan 13 00:49:54 2013 +0100 fix faulty commit of partial new sshproxy code commit 60047c179c15e332894d321f323270b0675093ad Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jan 13 00:23:45 2013 +0100 ignore the session profile option display commit 2a9b2742b4f4386750758c6c67f6d003225f168a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jan 13 00:46:38 2013 +0100 Revert "ignore the session profile option display" This reverts commit c4a24c0afc5ab8636f069c80c1c70c19df52d5d3. ----------------------------------------------------------------------- Summary of changes: x2go/utils.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2go/utils.py b/x2go/utils.py index 421e066..5cbafa4 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -205,6 +205,8 @@ def _convert_SessionProfileOptions_2_SessionParams(options): 'sshproxyport': 'sshproxy_port', 'sshproxyuser': 'sshproxy_user', 'sshproxykeyfile': 'sshproxy_key_filename', + # FIXME: remove this next option... + 'sshproxytunnel': 'sshproxy_tunnel', 'sessiontitle': 'session_title', 'setsessiontitle': 'set_session_title', 'published': 'published_applications', @@ -327,11 +329,11 @@ def _convert_SessionProfileOptions_2_SessionParams(options): _params['sshproxy_key_filename'] = _params['key_filename'] del _params['sshproxysamepass'] - if options['sshproxytunnel']: - del _params['sshproxytunnel'] - - if _params['use_sshproxy']: - _params['sshproxy_tunnel'] = 'localhost:44444:%s:%s' % (_params['server'], _params['port']) + #if options['sshproxytunnel']: + # del _params['sshproxytunnel'] + # + #if _params['use_sshproxy']: + # _params['sshproxy_tunnel'] = 'localhost:44444:%s:%s' % (_params['server'], _params['port']) # currently known but ignored in Python X2go _ignored_options = [ 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).

1 0

python-x2go.git - master (branch) updated: 0.2.1.1-11-gc4a24c0
by git-admin＠x2go.org 12 Jan '13

12 Jan '13

The branch, master has been updated via c4a24c0afc5ab8636f069c80c1c70c19df52d5d3 (commit) via 61dc41b90989393423cac83e4bc7c4693f37299f (commit) from 2dad37975a1de1ddc41c3d460dd7bfc64bd6ec87 (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 c4a24c0afc5ab8636f069c80c1c70c19df52d5d3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jan 13 00:23:45 2013 +0100 ignore the session profile option display commit 61dc41b90989393423cac83e4bc7c4693f37299f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jan 13 00:22:37 2013 +0100 Revert "ignore the session profile option display" This reverts commit 2dad37975a1de1ddc41c3d460dd7bfc64bd6ec87. ----------------------------------------------------------------------- Summary of changes: x2go/sshproxy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index e06b6f5..df50f2b 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -289,14 +289,14 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): """ # hostname rewrite for localhost, force to IPv4 - _hostname = self.remote_host + _hostname = self.hostname # force into IPv4 for localhost connections if _hostname in ('localhost', 'localhost.localdomain'): _hostname = '127.0.0.1' _valid = False - (_valid, _hostname, _port, _fingerprint, _fingerprint_type) = checkhosts.check_ssh_host_key(self, _hostname, port=self.remote_port) + (_valid, _hostname, _port, _fingerprint, _fingerprint_type) = checkhosts.check_ssh_host_key(self, _hostname, port=self.port) if not _valid and self.session_instance: _valid = self.session_instance.HOOK_check_host_dialog(_hostname, _port, fingerprint=_fingerprint, fingerprint_type=_fingerprint_type) return _valid 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).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits