The branch, build-main has been updated via c6124a24321183f804faa14574e436aa0fc7aca0 (commit) from a3e48a692cb9a727f8913df02b8e99f0e5f41c39 (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 | 5 ++--- pyhoca/wxgui/logon.py | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index dbcdcfb..dd2bff6 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -640,11 +640,10 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): self._logon_windows[profile_name] = _logon_window except x2go.SSHException, e: if str(e).startswith('Host key for server ') and str(e).endswith(' does not match!'): - host = str(e).replace('Host key for server ','').replace(' does not match!', '') - errmsg = _('Host key for X2Go server %s does not match') % host + errmsg = _('Host key verification failed. The X2Go server may have been compromised.\n\nIt is also possible that the host key has just been changed.\n\nHowever, for security reasons the connection will not be established!!!') else: errmsg = str(e) - self.notifier.send(_(u'%s - SSH error') % profile_name, u'%s!' % errmsg, icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - SSH error') % profile_name, u'%s!' % errmsg, icon='auth_error', timeout=10000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index 21d8617..f50bc97 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -413,8 +413,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): except x2go.SSHException, e: if str(e).startswith('Host key for server ') and str(e).endswith(' does not match!'): - host = str(e).replace('Host key for server ','').replace(' does not match!', '') - errmsg = _('Host key for X2Go server %s does not match') % host + errmsg = _('Host key verification failed. The X2Go server may have been compromised.\n\nIt is also possible that the host key has just been changed.\n\nHowever, for security reasons the connection will not be established!!!') else: errmsg = str(e) @@ -422,7 +421,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): title=_(u'%s - SSH error') % self.current_profile_name, text='%s' % errmsg, icon='auth_error', - timeout=4000) + timeout=10000) connect_failed = True 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)).