x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

python-x2go.git - master (branch) updated: 0.1.1.1-12-g3fb1a45
by git-admin＠x2go.org 28 Jun '11

28 Jun '11

The branch, master has been updated via 3fb1a45de69efba836f725c5e8ae5ca128959127 (commit) via a7e043c046bd4088bc991a79708b8544123ff45b (commit) from 9ab58903d0517d1633730fc2e1973eac8d7c2bea (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 3fb1a45de69efba836f725c5e8ae5ca128959127 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 28 21:01:08 2011 +0200 Fix for session status notification for sessions with PENDING terminal session. commit a7e043c046bd4088bc991a79708b8544123ff45b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 28 20:59:52 2011 +0200 Getting log msg more precise... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/forward.py | 11 ++++++----- x2go/session.py | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cb2524e..67214b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ python-x2go (0.1.1.2-0~x2go1) UNRELEASED; urgency=low - Add X2goSession method that detects if auto-connecting a session profile is probably possible. - Fix MIME box action SAVEAS. + - Fix for session status notification for sessions with PENDING terminal session. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 24 Jun 2011 16:42:20 +0200 diff --git a/x2go/forward.py b/x2go/forward.py index f12666b..f87e964 100644 --- a/x2go/forward.py +++ b/x2go/forward.py @@ -113,11 +113,12 @@ class X2goFwServer(StreamServer): chan_peername = self.chan.getpeername() _success = True except Exception, e: - self.logger('incoming request to %s:%d failed on attempt %d: %s' % (self.chain_host, - self.chain_port, - _count, - repr(e)), - loglevel=log.loglevel_WARN) + self.logger('incoming request to %s:%d failed on attempt %d of %d: %s' % (self.chain_host, + self.chain_port, + _count, + _maxwait, + repr(e)), + loglevel=log.loglevel_WARN) gevent.sleep(.4) diff --git a/x2go/session.py b/x2go/session.py index ead7b93..e69f960 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -979,7 +979,7 @@ class X2goSession(object): @rtype: C{bool} """ - self.terminal_session == 'PENDING' + self.terminal_session = 'PENDING' _new_session = False if self.session_name is None: self.session_name = session_name 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.1.1.1-10-g9ab5890
by git-admin＠x2go.org 28 Jun '11

28 Jun '11

The branch, master has been updated via 9ab58903d0517d1633730fc2e1973eac8d7c2bea (commit) from 56bb7e448827dc04c8f1e680b624a3d5c3720b21 (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 9ab58903d0517d1633730fc2e1973eac8d7c2bea Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 28 16:04:44 2011 +0200 minor fix for SAVEAS MIME box action ----------------------------------------------------------------------- Summary of changes: x2go/mimeboxactions.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/mimeboxactions.py b/x2go/mimeboxactions.py index 7987fb0..4fb21fb 100644 --- a/x2go/mimeboxactions.py +++ b/x2go/mimeboxactions.py @@ -260,7 +260,7 @@ class X2goMIMEboxActionSAVEAS(X2goMIMEboxAction): @param mimebox_file: PDF file name as placed in to the X2go spool directory """ - self.logger('Session %s (%s) is calling X2goClient class hook method <client_instance>.HOOK_open_mimebox_saveas_dialog(%s)' % (self.session_name, self.profile_name, self.mimebox_file), loglevel=log.loglevel_NOTICE) + self.logger('Session %s (%s) is calling X2goClient class hook method <client_instance>.HOOK_open_mimebox_saveas_dialog(%s)' % (self.session_name, self.profile_name, mimebox_file), loglevel=log.loglevel_NOTICE) self.client_instance.HOOK_open_mimebox_saveas_dialog(os.path.join(mimebox_dir, mimebox_file), profile_name=self.profile_name, session_name=self.session_name) time.sleep(60) 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.1.1.1-9-g56bb7e4
by git-admin＠x2go.org 28 Jun '11

28 Jun '11

The branch, master has been updated via 56bb7e448827dc04c8f1e680b624a3d5c3720b21 (commit) from 5b871552813091544650f7333f40081fc5ee8560 (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 56bb7e448827dc04c8f1e680b624a3d5c3720b21 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 28 15:59:20 2011 +0200 Minor fix for X2go printing ----------------------------------------------------------------------- Summary of changes: x2go/printqueue.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/printqueue.py b/x2go/printqueue.py index 4529c9f..d064e41 100644 --- a/x2go/printqueue.py +++ b/x2go/printqueue.py @@ -105,7 +105,7 @@ class X2goPrintQueue(threading.Thread): self.client_rootdir = client_instance.get_client_rootdir() self.printing_backend = printing_backend if print_action is not None: - self.set_print_action(print_action, logger=logger, **print_action_args) + self.set_print_action(print_action, client_instance=self.client_instance, logger=logger, **print_action_args) threading.Thread.__init__(self) self.daemon = True self._accept_jobs = True hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - master (branch) updated: 0.1.1.1-8-g5b87155
by git-admin＠x2go.org 28 Jun '11

28 Jun '11

The branch, master has been updated via 5b871552813091544650f7333f40081fc5ee8560 (commit) from 15598f15f512d67222a5d2b4f1b4bb277b29f520 (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 5b871552813091544650f7333f40081fc5ee8560 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 28 15:55:35 2011 +0200 Fix for MIME box action SAVEAS ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/mimebox.py | 8 ++++++-- x2go/x2go_exceptions.py | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a6a731a..cb2524e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ python-x2go (0.1.1.2-0~x2go1) UNRELEASED; urgency=low - Improve error handling / logging in forward.py. - Add X2goSession method that detects if auto-connecting a session profile is probably possible. + - Fix MIME box action SAVEAS. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 24 Jun 2011 16:42:20 +0200 diff --git a/x2go/mimebox.py b/x2go/mimebox.py index ec2e974..be62404 100644 --- a/x2go/mimebox.py +++ b/x2go/mimebox.py @@ -93,10 +93,13 @@ class X2goMIMEboxQueue(threading.Thread): self.client_instance = client_instance self.client_rootdir = client_instance.get_client_rootdir() + # this has to be set before we set the MIME box action... + self._accept_jobs = False + if mimebox_action is None: - mimebox_action = mimebox_actions.X2goMIMEboxActionOPEN(client_instance=self.client_instance, logger=self.logger, **mimebox_action_args) + mimebox_action = mimebox_actions.X2goMIMEboxActionOPEN(client_instance=self.client_instance, logger=self.logger) elif type(mimebox_action) in (types.StringType, types.UnicodeType): - mimebox_action = self.set_mimebox_action(mimebox_action) + mimebox_action = self.set_mimebox_action(mimebox_action, client_instance=self.client_instance, logger=self.logger) else: # hope it's already an instance... self.mimebox_action = mimebox_action @@ -105,6 +108,7 @@ class X2goMIMEboxQueue(threading.Thread): self.daemon = True self._accept_jobs = True + def __del__(self): """\ Class destructor. diff --git a/x2go/x2go_exceptions.py b/x2go/x2go_exceptions.py index 9b7b3eb..c068b6c 100644 --- a/x2go/x2go_exceptions.py +++ b/x2go/x2go_exceptions.py @@ -57,6 +57,8 @@ class X2goRevFwTunnelException(_X2goException): pass class X2goPrintException(_X2goException): pass class X2goPrintQueueException(_X2goException): pass class X2goPrintActionException(_X2goException): pass +class X2goMIMEboxActionException(_X2goException): pass +class X2goMIMEboxQueueException(_X2goException): pass class X2goSSHProxyException(_X2goException): pass class X2goSSHProxyAuthenticationException(_X2goException): pass class X2goNotImplementedYetException(_X2goException): pass 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 - build-main (branch) updated: 0.1.1.1-7-g15598f1
by git-admin＠x2go.org 28 Jun '11

28 Jun '11

The branch, build-main has been updated via 15598f15f512d67222a5d2b4f1b4bb277b29f520 (commit) via 77a00fac353b65ab845e1eba91a9e0a4f5df150a (commit) via 470dda06432bcaaa0989b6961700ec4e71c5a194 (commit) from 6d9eef295e1a3386d07015e00e4292400f8c4d7f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++ x2go/client.py | 16 ++++++++++++ x2go/forward.py | 72 +++++++++++++++++++++++++++++------------------------ x2go/session.py | 37 +++++++++++++++++++++++++++- x2go/sshproxy.py | 12 ++++++-- 5 files changed, 103 insertions(+), 37 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0805825..a6a731a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ python-x2go (0.1.1.2-0~x2go1) UNRELEASED; urgency=low - Use X2goRegistryException for session query for non-existing sessions. - Catch this exception in X2goClient. - Fix desktop sharing. + - Improve error handling / logging in forward.py. + - Add X2goSession method that detects if auto-connecting a session profile + is probably possible. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 24 Jun 2011 16:42:20 +0200 diff --git a/x2go/client.py b/x2go/client.py index c4073ca..1327d33 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1035,6 +1035,22 @@ class X2goClient(object): return self.session_registry(session_uuid).check_host() __check_session_host = check_session_host + def session_can_auto_connect(self, session_uuid): + """\ + Check if session with unique identifier <session_uuid> is configured adequately + to be able to auto-connect to the X2go server (e.g. public key authentication). + + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: C{str} + + @return: returns C{True} if the session can auto-connect, C{False} otherwise, C{None} + if no control session has been set up yet. + @rtype: C{bool} + + """ + return self.session_registry(session_uuid).can_auto_connect() + __session_can_auto_connect = session_can_auto_connect + def connect_session(self, session_uuid, username='', password='', diff --git a/x2go/forward.py b/x2go/forward.py index 34466d0..f12666b 100644 --- a/x2go/forward.py +++ b/x2go/forward.py @@ -103,7 +103,6 @@ class X2goFwServer(StreamServer): # it is recommended here to have passed on the session instance to this object... if self.session_instance: if not self.session_instance.is_connected(): - print 'HALLO' break _count += 1 @@ -117,45 +116,52 @@ class X2goFwServer(StreamServer): self.logger('incoming request to %s:%d failed on attempt %d: %s' % (self.chain_host, self.chain_port, _count, - repr(e)), - loglevel=log.loglevel_ERROR) + repr(e)), + loglevel=log.loglevel_WARN) gevent.sleep(.4) - # once we are here, we can presume the tunnel to be active... - self.is_active = True - if self.chan is None: - self.logger('incoming request to [%s]:%d was rejected by the SSH server.' % - (self.chain_host, self.chain_port), loglevel=log.loglevel_ERROR) - if self.session_instance: - self.session_instance.HOOK_forwarding_tunnel_setup_failed(chain_host=self.chain_host, chain_port=self.chain_port) - return + if not _success: + self.logger('incoming request to %s:%d failed after %d attempts' % (self.chain_host, + self.chain_port, + _count), + loglevel=log.loglevel_ERROR) else: - self.logger('connected! Tunnel open %r -> %r -> %r' % (self.fw_socket.getpeername(), + # once we are here, we can presume the tunnel to be active... + self.is_active = True + + if self.chan is None: + self.logger('incoming request to [%s]:%d was rejected by the SSH server.' % + (self.chain_host, self.chain_port), loglevel=log.loglevel_ERROR) + if self.session_instance: + self.session_instance.HOOK_forwarding_tunnel_setup_failed(chain_host=self.chain_host, chain_port=self.chain_port) + return + else: + self.logger('connected! Tunnel open %r -> %r -> %r' % (self.fw_socket.getpeername(), chan_peername, (self.chain_host, self.chain_port)), loglevel=log.loglevel_INFO) - self.keepalive = True - try: - while self.keepalive: - r, w, x = select.select([self.fw_socket, self.chan], [], []) - if fw_socket in r: - data = fw_socket.recv(1024) - if len(data) == 0: - break - self.chan.send(data) - if self.chan in r: - data = self.chan.recv(1024) - if len(data) == 0: - break - fw_socket.send(data) - self.close_channel() - self.close_socket() - except socket.error: - pass + self.keepalive = True + try: + while self.keepalive: + r, w, x = select.select([self.fw_socket, self.chan], [], []) + if fw_socket in r: + data = fw_socket.recv(1024) + if len(data) == 0: + break + self.chan.send(data) + if self.chan in r: + data = self.chan.recv(1024) + if len(data) == 0: + break + fw_socket.send(data) + self.close_channel() + self.close_socket() + except socket.error: + pass - self.is_active = False - self.logger('Tunnel closed from %r' % (chan_peername,), - loglevel=log.loglevel_INFO) + self.is_active = False + self.logger('Tunnel closed from %r' % (chan_peername,), + loglevel=log.loglevel_INFO) def close_channel(self): """\ diff --git a/x2go/session.py b/x2go/session.py index 9439477..ead7b93 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -75,7 +75,7 @@ _X2GO_SESSION_PARAMS = ('geometry', 'depth', 'link', 'pack', ) """A list of allowed X2go session parameters.""" _X2GO_SSHPROXY_PARAMS = ('sshproxy_host', 'sshproxy_user', 'sshproxy_password', - 'sshproxy_key_filename', 'sshproxy_tunnel', + 'sshproxy_key_filename', 'sshproxy_pkey', 'sshproxy_tunnel', ) """A list of allowed X2go SSH proxy parameters.""" @@ -665,6 +665,41 @@ class X2goSession(object): return _valid or self.HOOK_check_host_dialog(host=_host, port=_port, fingerprint=_fingerprint, fingerprint_type=_fingerprint_type) __check_host = check_host + def can_auto_connect(self): + """\ + Check if a session is configured adequately to be able to auto-connect to the X2go + server (e.g. public key authentication). + + @return: returns C{True} if the session can auto-connect, C{False} otherwise, C{None} + if no control session has been set up yet. + @rtype: C{bool} + + """ + + def _can_sshproxy_autoconnect(): + + if self.use_sshproxy: + if self.sshproxy_params.has_key('sshproxy_key_filename') and self.sshproxy_params['sshproxy_key_filename'] and os.path.exists(os.path.normpath(self.sshproxy_params['sshproxy_key_filename'])): + return True + elif self.sshproxy_params.has_key('sshproxy_pkey') and self.sshproxy_params['sshproxy_pkey']: + return True + else: + return False + else: + return True + + # do we have a key file passed as control parameter? + if self.control_params.has_key('key_filename') and self.control_params['key_filename'] and os.path.exists(os.path.normpath(self.control_params['key_filename'])): + return _can_sshproxy_autoconnect() + + # or a private key? + elif self.control_params.has_key('pkey') and self.control_params['pkey']: + return _can_sshproxy_autoconnect() + + else: + return False + __can_auto_connect = can_auto_connect + def connect(self, username='', password='', add_to_known_hosts=False, force_password_auth=False, use_sshproxy=False, sshproxy_user='', sshproxy_password=''): """\ diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index e59d430..3d08a35 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -55,9 +55,9 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): def __init__(self, hostname=None, port=22, username=None, password=None, key_filename=None, local_host='localhost', local_port=22022, remote_host='localhost', remote_port=22, - known_hosts=None, add_to_known_hosts=False, + known_hosts=None, add_to_known_hosts=False, pkey=None, sshproxy_host=None, sshproxy_port=22, sshproxy_user=None, - sshproxy_password=None, sshproxy_key_filename=None, + sshproxy_password=None, sshproxy_key_filename=None, sshproxy_pkey=None, sshproxy_tunnel=None, ssh_rootdir=os.path.join(_LOCAL_HOME, _X2GO_SSH_ROOTDIR), session_instance=None, @@ -73,6 +73,8 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): @type password: C{str} @param key_filename: name of a SSH private key file @type key_filename: C{str} + @param pkey: a private DSA/RSA key object (as provided by Paramiko/SSH) + @type pkey: C{RSA/DSA key instance} @param local_host: bind SSH tunnel to the C{local_host} IP socket address (default: localhost) @type local_host: C{str} @param local_port: IP socket port to bind the SSH tunnel to (default; 22022) @@ -99,6 +101,8 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): @type sshproxy_password: C{str} @param sshproxy_key_filename: alias for C{key_filename} @type sshproxy_key_filename: C{str} + @param sshproxy_pkey: alias for C{pkey} + @type sshproxy_pkey: C{RSA/DSA key instance} (Paramiko) @param sshproxy_tunnel: a string of the format <local_host>:<local_port>:<remote_host>:<remote_port> which will override---if used---the options: C{local_host}, C{local_port}, C{remote_host} and C{remote_port} @@ -135,6 +139,7 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): if sshproxy_user: self.username = sshproxy_user if sshproxy_password: password = sshproxy_password if sshproxy_key_filename: key_filename = sshproxy_key_filename + if sshproxy_pkey: pkey = sshproxy_pkey if sshproxy_tunnel: self.local_host, self.local_port, self.remote_host, self.remote_port = sshproxy_tunnel.split(':') self.local_port = int(self.local_port) @@ -164,11 +169,12 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): self.set_missing_host_key_policy(paramiko.AutoAddPolicy()) try: - if key_filename and os.path.exists(os.path.normpath(key_filename)): + if (key_filename and os.path.exists(os.path.normpath(key_filename))) or pkey: try: self.connect(self.hostname, port=self.port, username=self.username, key_filename=key_filename, + pkey=pkey, look_for_keys=False, allow_agent=False, ) 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 - build-main (branch) updated: 0.1.0.4-18-gc336e8a
by git-admin＠x2go.org 28 Jun '11

28 Jun '11

The branch, build-main has been updated via c336e8a87da20287a0631a78e37a74118dc9c06f (commit) via 8658a5d95d59612b985c418444d488edc33ab3ed (commit) via fbfe96acee1d091742ea1e849c1d74de277a4539 (commit) from 117a0ea4289d97940943139d05cbec00ec028b4e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- debian/control | 2 +- pyhoca/wxgui/frontend.py | 29 +++++++++++++++++------------ pyhoca/wxgui/profilemanager.py | 1 - 4 files changed, 20 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 40f671c..461ee18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,9 @@ pyhoca-gui (0.1.0.5-0~x2go1) UNRELEASED; urgency=low hit in logon window. - Make tab traversal work in logon window. - Update i18n (en, de, nl). + - Fix session auto-connecting. * React to bug #627990, prefer man2html-base over man2html. - + * Depend on Python X2go 0.1.1.2 -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 24 Jun 2011 16:39:24 +0200 diff --git a/debian/control b/debian/control index d2af9ba..23b5475 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.1.1.0-0~0), + python-x2go (>=0.1.1.2-0~0), python-argparse, python-notify, python-setproctitle, diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 9b17d05..a5cd682 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -226,12 +226,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self._temp_disabled_profile_names = [] self._temp_disabled_session_names = {} - if self.args.auto_connect: - - for session_uuid in self._X2goClient__client_registered_sessions: - self._pyhoca_logger('auto-connecting to %s session profile' % s.get_profile_name(), loglevel=x2go.log.loglevel_NOTICE) - gevent.spawn(self._auto_connect, session_uuid) - self.profilemanager_disabled = self.args.disable_profilemanager self.printingprefs_disabled = self.args.disable_printingprefs @@ -244,6 +238,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self._pyhoca_logger('the current release of %s does not support client configuration' % self.appname, loglevel=x2go.log.loglevel_WARN) self.options_disabled = True + if self.args.auto_connect: + gevent.spawn(self._auto_connect) + if self.args.session_profile: for profile_name in self.args.session_profile.split(','): if not self._X2goClient__client_registered_sessions_of_profile_name(profile_name): @@ -257,13 +254,21 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self._pyhoca_logger('opening default session profile %s' % profile_name, loglevel=x2go.log.loglevel_NOTICE) self.OnSessionAuthenticate(evt) - def _auto_connect(self, session_uuid): + def _auto_connect(self): - try: - self._X2goClient__connect_session(session_uuid) - self._pyhoca_logger('auto-connected session profile %s' % self._X2goClient__get_session_profile_name(session_uuid), loglevel=x2go.log.loglevel_NOTICE) - except x2go.AuthenticationException: - self._pyhoca_logger('no pubkey authentication available for session profile %s' % self._X2goClient__get_session_profile_name(session_uuid), loglevel=x2go.log.loglevel_NOTICE) + # wait for splash to appear + if not self.args.disable_splash: + gevent.sleep(1) + for session_uuid in self._X2goClient__client_registered_sessions(return_objects=False): + if self._X2goClient__session_can_auto_connect(session_uuid): + self._pyhoca_logger('auto-connecting to %s session profile' % self.get_session_profile_name(session_uuid), loglevel=x2go.log.loglevel_NOTICE) + + # create a dummy event and call OnAuthenticate + _dummy_id = wx.NewId() + self._eventid_profilenames_map[_dummy_id] = self.get_session_profile_name(session_uuid) + evt = wx.CommandEvent() + evt.SetId(_dummy_id) + self.OnSessionAuthenticate(evt) # wx.App's OnExit method def OnExit(self): diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 64e5286..8b15ed1 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -1376,7 +1376,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): 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']: - print self.profile_config['sshproxytunnel'].split(':')[0:2] try: (from_host, from_port) = self.profile_config['sshproxytunnel'].split(':')[0:2] except ValueError: 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.1.0.4-18-gc336e8a
by git-admin＠x2go.org 28 Jun '11

28 Jun '11

The branch, master has been updated via c336e8a87da20287a0631a78e37a74118dc9c06f (commit) from 8658a5d95d59612b985c418444d488edc33ab3ed (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 c336e8a87da20287a0631a78e37a74118dc9c06f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 28 13:24:05 2011 +0200 Fix session auto-connecting, depend on Python X2go 0.1.1.2. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- debian/control | 2 +- pyhoca/wxgui/frontend.py | 29 +++++++++++++++++------------ 3 files changed, 20 insertions(+), 14 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 40f671c..461ee18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,9 @@ pyhoca-gui (0.1.0.5-0~x2go1) UNRELEASED; urgency=low hit in logon window. - Make tab traversal work in logon window. - Update i18n (en, de, nl). + - Fix session auto-connecting. * React to bug #627990, prefer man2html-base over man2html. - + * Depend on Python X2go 0.1.1.2 -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 24 Jun 2011 16:39:24 +0200 diff --git a/debian/control b/debian/control index d2af9ba..23b5475 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.1.1.0-0~0), + python-x2go (>=0.1.1.2-0~0), python-argparse, python-notify, python-setproctitle, diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index d28c79d..a5cd682 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -226,12 +226,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self._temp_disabled_profile_names = [] self._temp_disabled_session_names = {} - if self.args.auto_connect: - - for _session in self._X2goClient__client_registered_sessions(return_objects=True): - self._pyhoca_logger('auto-connecting to %s session profile' % _session.get_profile_name(), loglevel=x2go.log.loglevel_NOTICE) - gevent.spawn(self._auto_connect, _session()) - self.profilemanager_disabled = self.args.disable_profilemanager self.printingprefs_disabled = self.args.disable_printingprefs @@ -244,6 +238,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self._pyhoca_logger('the current release of %s does not support client configuration' % self.appname, loglevel=x2go.log.loglevel_WARN) self.options_disabled = True + if self.args.auto_connect: + gevent.spawn(self._auto_connect) + if self.args.session_profile: for profile_name in self.args.session_profile.split(','): if not self._X2goClient__client_registered_sessions_of_profile_name(profile_name): @@ -257,13 +254,21 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self._pyhoca_logger('opening default session profile %s' % profile_name, loglevel=x2go.log.loglevel_NOTICE) self.OnSessionAuthenticate(evt) - def _auto_connect(self, session_uuid): + def _auto_connect(self): - try: - self._X2goClient__connect_session(session_uuid) - self._pyhoca_logger('auto-connected session profile %s' % self._X2goClient__get_session_profile_name(session_uuid), loglevel=x2go.log.loglevel_NOTICE) - except x2go.AuthenticationException: - self._pyhoca_logger('no pubkey authentication available for session profile %s' % self._X2goClient__get_session_profile_name(session_uuid), loglevel=x2go.log.loglevel_NOTICE) + # wait for splash to appear + if not self.args.disable_splash: + gevent.sleep(1) + for session_uuid in self._X2goClient__client_registered_sessions(return_objects=False): + if self._X2goClient__session_can_auto_connect(session_uuid): + self._pyhoca_logger('auto-connecting to %s session profile' % self.get_session_profile_name(session_uuid), loglevel=x2go.log.loglevel_NOTICE) + + # create a dummy event and call OnAuthenticate + _dummy_id = wx.NewId() + self._eventid_profilenames_map[_dummy_id] = self.get_session_profile_name(session_uuid) + evt = wx.CommandEvent() + evt.SetId(_dummy_id) + self.OnSessionAuthenticate(evt) # wx.App's OnExit method def OnExit(self): 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.1.1.1-7-g15598f1
by git-admin＠x2go.org 28 Jun '11

28 Jun '11

The branch, master has been updated via 15598f15f512d67222a5d2b4f1b4bb277b29f520 (commit) from 77a00fac353b65ab845e1eba91a9e0a4f5df150a (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 15598f15f512d67222a5d2b4f1b4bb277b29f520 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 28 13:22:43 2011 +0200 Add X2goSession method that detects if auto-connecting a session profile is probably possible. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/client.py | 16 ++++++++++++++++ x2go/session.py | 37 ++++++++++++++++++++++++++++++++++++- x2go/sshproxy.py | 12 +++++++++--- 4 files changed, 63 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c6dca3a..a6a731a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ python-x2go (0.1.1.2-0~x2go1) UNRELEASED; urgency=low - Catch this exception in X2goClient. - Fix desktop sharing. - Improve error handling / logging in forward.py. + - Add X2goSession method that detects if auto-connecting a session profile + is probably possible. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 24 Jun 2011 16:42:20 +0200 diff --git a/x2go/client.py b/x2go/client.py index c4073ca..1327d33 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1035,6 +1035,22 @@ class X2goClient(object): return self.session_registry(session_uuid).check_host() __check_session_host = check_session_host + def session_can_auto_connect(self, session_uuid): + """\ + Check if session with unique identifier <session_uuid> is configured adequately + to be able to auto-connect to the X2go server (e.g. public key authentication). + + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: C{str} + + @return: returns C{True} if the session can auto-connect, C{False} otherwise, C{None} + if no control session has been set up yet. + @rtype: C{bool} + + """ + return self.session_registry(session_uuid).can_auto_connect() + __session_can_auto_connect = session_can_auto_connect + def connect_session(self, session_uuid, username='', password='', diff --git a/x2go/session.py b/x2go/session.py index 9439477..ead7b93 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -75,7 +75,7 @@ _X2GO_SESSION_PARAMS = ('geometry', 'depth', 'link', 'pack', ) """A list of allowed X2go session parameters.""" _X2GO_SSHPROXY_PARAMS = ('sshproxy_host', 'sshproxy_user', 'sshproxy_password', - 'sshproxy_key_filename', 'sshproxy_tunnel', + 'sshproxy_key_filename', 'sshproxy_pkey', 'sshproxy_tunnel', ) """A list of allowed X2go SSH proxy parameters.""" @@ -665,6 +665,41 @@ class X2goSession(object): return _valid or self.HOOK_check_host_dialog(host=_host, port=_port, fingerprint=_fingerprint, fingerprint_type=_fingerprint_type) __check_host = check_host + def can_auto_connect(self): + """\ + Check if a session is configured adequately to be able to auto-connect to the X2go + server (e.g. public key authentication). + + @return: returns C{True} if the session can auto-connect, C{False} otherwise, C{None} + if no control session has been set up yet. + @rtype: C{bool} + + """ + + def _can_sshproxy_autoconnect(): + + if self.use_sshproxy: + if self.sshproxy_params.has_key('sshproxy_key_filename') and self.sshproxy_params['sshproxy_key_filename'] and os.path.exists(os.path.normpath(self.sshproxy_params['sshproxy_key_filename'])): + return True + elif self.sshproxy_params.has_key('sshproxy_pkey') and self.sshproxy_params['sshproxy_pkey']: + return True + else: + return False + else: + return True + + # do we have a key file passed as control parameter? + if self.control_params.has_key('key_filename') and self.control_params['key_filename'] and os.path.exists(os.path.normpath(self.control_params['key_filename'])): + return _can_sshproxy_autoconnect() + + # or a private key? + elif self.control_params.has_key('pkey') and self.control_params['pkey']: + return _can_sshproxy_autoconnect() + + else: + return False + __can_auto_connect = can_auto_connect + def connect(self, username='', password='', add_to_known_hosts=False, force_password_auth=False, use_sshproxy=False, sshproxy_user='', sshproxy_password=''): """\ diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index e59d430..3d08a35 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -55,9 +55,9 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): def __init__(self, hostname=None, port=22, username=None, password=None, key_filename=None, local_host='localhost', local_port=22022, remote_host='localhost', remote_port=22, - known_hosts=None, add_to_known_hosts=False, + known_hosts=None, add_to_known_hosts=False, pkey=None, sshproxy_host=None, sshproxy_port=22, sshproxy_user=None, - sshproxy_password=None, sshproxy_key_filename=None, + sshproxy_password=None, sshproxy_key_filename=None, sshproxy_pkey=None, sshproxy_tunnel=None, ssh_rootdir=os.path.join(_LOCAL_HOME, _X2GO_SSH_ROOTDIR), session_instance=None, @@ -73,6 +73,8 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): @type password: C{str} @param key_filename: name of a SSH private key file @type key_filename: C{str} + @param pkey: a private DSA/RSA key object (as provided by Paramiko/SSH) + @type pkey: C{RSA/DSA key instance} @param local_host: bind SSH tunnel to the C{local_host} IP socket address (default: localhost) @type local_host: C{str} @param local_port: IP socket port to bind the SSH tunnel to (default; 22022) @@ -99,6 +101,8 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): @type sshproxy_password: C{str} @param sshproxy_key_filename: alias for C{key_filename} @type sshproxy_key_filename: C{str} + @param sshproxy_pkey: alias for C{pkey} + @type sshproxy_pkey: C{RSA/DSA key instance} (Paramiko) @param sshproxy_tunnel: a string of the format <local_host>:<local_port>:<remote_host>:<remote_port> which will override---if used---the options: C{local_host}, C{local_port}, C{remote_host} and C{remote_port} @@ -135,6 +139,7 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): if sshproxy_user: self.username = sshproxy_user if sshproxy_password: password = sshproxy_password if sshproxy_key_filename: key_filename = sshproxy_key_filename + if sshproxy_pkey: pkey = sshproxy_pkey if sshproxy_tunnel: self.local_host, self.local_port, self.remote_host, self.remote_port = sshproxy_tunnel.split(':') self.local_port = int(self.local_port) @@ -164,11 +169,12 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): self.set_missing_host_key_policy(paramiko.AutoAddPolicy()) try: - if key_filename and os.path.exists(os.path.normpath(key_filename)): + if (key_filename and os.path.exists(os.path.normpath(key_filename))) or pkey: try: self.connect(self.hostname, port=self.port, username=self.username, key_filename=key_filename, + pkey=pkey, look_for_keys=False, allow_agent=False, ) 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.1.0.4-17-g8658a5d
by git-admin＠x2go.org 27 Jun '11

27 Jun '11

The branch, master has been updated via 8658a5d95d59612b985c418444d488edc33ab3ed (commit) from fbfe96acee1d091742ea1e849c1d74de277a4539 (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 8658a5d95d59612b985c418444d488edc33ab3ed Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jun 27 11:51:30 2011 +0200 Remove debug output... ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/profilemanager.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 64e5286..8b15ed1 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -1376,7 +1376,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): 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']: - print self.profile_config['sshproxytunnel'].split(':')[0:2] try: (from_host, from_port) = self.profile_config['sshproxytunnel'].split(':')[0:2] except ValueError: 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.1.0.4-16-gfbfe96a
by git-admin＠x2go.org 27 Jun '11

27 Jun '11

The branch, master has been updated via fbfe96acee1d091742ea1e849c1d74de277a4539 (commit) from 117a0ea4289d97940943139d05cbec00ec028b4e (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 fbfe96acee1d091742ea1e849c1d74de277a4539 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jun 27 11:38:27 2011 +0200 beginning to fix --auto-connect cmd line option ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/frontend.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 9b17d05..d28c79d 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -228,9 +228,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient): if self.args.auto_connect: - for session_uuid in self._X2goClient__client_registered_sessions: - self._pyhoca_logger('auto-connecting to %s session profile' % s.get_profile_name(), loglevel=x2go.log.loglevel_NOTICE) - gevent.spawn(self._auto_connect, session_uuid) + for _session in self._X2goClient__client_registered_sessions(return_objects=True): + self._pyhoca_logger('auto-connecting to %s session profile' % _session.get_profile_name(), loglevel=x2go.log.loglevel_NOTICE) + gevent.spawn(self._auto_connect, _session()) self.profilemanager_disabled = self.args.disable_profilemanager self.printingprefs_disabled = self.args.disable_printingprefs 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits