The branch, twofactorauth has been updated via 56019d33d4bd27bfbf0828631b73960a89fce0e4 (commit) from 63c6f4cb928e735ae3b6202ff34cfc82d09cf816 (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: pyhoca/wxgui/frontend.py | 50 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index c06c51c..64a28c6 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -334,12 +334,18 @@ class PyHocaGUI(wx.App, x2go.X2goClient): 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) - self._temp_disabled_profile_names.remove(profile_name) + try: + self._temp_disabled_profile_names.remove(profile_name) + except ValueError: + pass else: self.notifier.send(_(u'%s - connect') % profile_name, _(u'Public SSH key authentication has been successful.'), icon='auth_success', timeout=4000) _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True) self._post_authenticate(evt, session_uuid) - self._temp_disabled_profile_names.remove(profile_name) + try: + self._temp_disabled_profile_names.remove(profile_name) + except ValueError: + pass except x2go.AuthenticationException: self._pyhoca_logger('public SSH key authentication to server failed, trying next auth-mechanism', loglevel=x2go.log.loglevel_INFO, ) _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, ) @@ -350,35 +356,59 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self._logon_windows[profile_name] = _logon_window except x2go.SSHException, e: self.notifier.send(_(u'%s - connect error') % profile_name, '%s!' % str(e), icon='auth_error', timeout=4000) - self._temp_disabled_profile_names.remove(profile_name) + try: + self._temp_disabled_profile_names.remove(profile_name) + except ValueError: + pass connect_failed = True except x2go.X2goHostKeyException, e: self.notifier.send(_(u'%s - host key error') % profile_name, '%s!' % _(u'The remote server\'s host key is invalid or has not been accepted by the user'), icon='auth_error', timeout=4000) - self._temp_disabled_profile_names.remove(profile_name) + try: + self._temp_disabled_profile_names.remove(profile_name) + except ValueError: + pass connect_failed = True except x2go.X2goSSHProxyHostKeyException, e: self.notifier.send(_(u'%s - host key error') % profile_name, '%s!' % _(u'The SSH proxy\'s host key is invalid or has not been accepted by the user'), icon='auth_error', timeout=4000) - self._temp_disabled_profile_names.remove(profile_name) + try: + self._temp_disabled_profile_names.remove(profile_name) + except ValueError: + pass connect_failed = True except gevent.dns.DNSError, e: self.notifier.send(_(u'%s - connect error') % profile_name, '%s!' % e.strerror, icon='auth_error', timeout=4000) - self._temp_disabled_profile_names.remove(profile_name) + try: + self._temp_disabled_profile_names.remove(profile_name) + except ValueError: + pass connect_failed = True except gevent.socket.error, e: self.notifier.send(_(u'%s - connect error') % profile_name, '%s!' % e.strerror, icon='auth_error', timeout=4000) - self._temp_disabled_profile_names.remove(profile_name) + try: + self._temp_disabled_profile_names.remove(profile_name) + except ValueError: + pass connect_failed = True except EOFError, e: self.notifier.send(_(u'%s - connect error') % profile_name, _(u'Authentication protocol communication incomplete! Try again...'), icon='auth_error', timeout=4000) - self._temp_disabled_profile_names.remove(profile_name) + try: + self._temp_disabled_profile_names.remove(profile_name) + except ValueError: + pass connect_failed = True except x2go.X2goSSHProxyException, e: self.notifier.send(_(u'%s - auth key error') % profile_name, '%s!' % str(e), icon='auth_error', timeout=4000) - self._temp_disabled_profile_names.remove(profile_name) + try: + self._temp_disabled_profile_names.remove(profile_name) + except ValueError: + pass connect_failed = True except: self.notifier.send('%s - connect error' % profile_name, 'An unknown error occurred during authentication!', icon='auth_error', timeout=4000) - self._temp_disabled_profile_names.remove(profile_name) + try: + self._temp_disabled_profile_names.remove(profile_name) + except ValueError: + pass connect_failed = True if os.environ.has_key('PYHOCAGUI_DEVELOPMENT') and os.environ['PYHOCAGUI_DEVELOPMENT'] == '1': raise 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)).