The branch, master has been updated via 19d964360f25318e592c33da21327909f28494ab (commit) via 6dc18e669540ca454f2b25e6b49b6371213dc4c1 (commit) via ac750e0c0c547caf19bcd36d48d41fb36146b62f (commit) from 85f634b07ef3b07d6a1ff6c00afc74f6621cb00d (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 19d964360f25318e592c33da21327909f28494ab Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 26 14:16:41 2012 +0100 fix sshproxy auth, use new option sshproxy_force_password_auth commit 6dc18e669540ca454f2b25e6b49b6371213dc4c1 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 26 13:52:20 2012 +0100 remove debug code, fix whitespaced EOLs commit ac750e0c0c547caf19bcd36d48d41fb36146b62f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 26 13:39:31 2012 +0100 remove debug code, fix whitespaced EOLs ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/logon.py | 50 ++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 21 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index aa6cede..fca8600 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -188,7 +188,6 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): if self.sshproxy_auth: - print self.current_profile_config if self.current_profile_config.has_key('sshproxyuser'): if self.current_profile_config.has_key('sshproxysameuser') and not self.current_profile_config['sshproxysameuser']: self.sshProxyUserTxt.SetValue(self.current_profile_config['sshproxyuser']) @@ -262,8 +261,8 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): self.cancelBtn.Enable(False) elif self.current_profile_config['sshproxysamepass']: - sshproxy_user = None - sshproxy_password = self.passwordTxt.GetValue() + sshproxy_user = None + sshproxy_password = self.passwordTxt.GetValue() else: sshproxy_user = sshproxy_password = None @@ -276,8 +275,10 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): if self.sshproxy_auth and (not self.sshproxy_started): force_password_auth=False + sshproxy_force_password_auth = True else: force_password_auth=True + sshproxy_force_password_auth = True wx.BeginBusyCursor() session_uuid = self._PyHocaGUI._X2goClient__client_registered_sessions_of_profile_name(self.current_profile_name)[0] @@ -285,14 +286,15 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): self._PyHocaGUI._X2goClient__connect_session(session_uuid, username=username, password=password, - force_password_auth=force_password_auth, + force_password_auth=force_password_auth, add_to_known_hosts=False, - sshproxy_user=sshproxy_user, - sshproxy_password=sshproxy_password + sshproxy_user=sshproxy_user, + sshproxy_password=sshproxy_password, + sshproxy_force_password_auth=sshproxy_force_password_auth, ) if not self._PyHocaGUI._X2goClient__server_valid_x2gouser(session_uuid): - self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, - title=_(u'%s - connect failure') % self.current_profile_name, + self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, + title=_(u'%s - connect failure') % self.current_profile_name, text=_(u'User is not allowed to start X2Go sessions!'), icon='auth_error') self._PyHocaGUI.OnServerDisconnect(evt) @@ -342,19 +344,25 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): except x2go.X2goSSHProxyAuthenticationException: try: wx.EndBusyCursor() except: pass - self._PyHocaGUI.notifier.send(title=_(u'%s - SSH proxy') % self.current_profile_name, - text=_(u'Authentication to the SSH proxy server failed!'), - icon='auth_failed') - if self.sshproxy_auth: - self.sshProxyPasswordTxt.SetValue('') - self.sshProxyHeaderLbl.Enable(True) - self.sshProxyUserLbl.Enable(True) - self.sshProxyUserTxt.Enable(True) - self.sshProxyPasswordLbl.Enable(True) - self.sshProxyPasswordTxt.Enable(True) - self.sshProxyLoginBtn.Enable(True) - self.cancelBtn.Enable(True) - return + self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, + title=_(u'%s - SSH proxy') % self.current_profile_name, + text=_(u'Authentication to the SSH proxy server failed!'), + icon='auth_failed') + + if not self.current_profile_config['sshproxysamepass']: + self._PyHocaGUI.notifier.send(self.current_profile_name, context='AUTH_%s' % self.current_profile_name, timeout=4000) + if self.sshproxy_auth: + self.sshProxyPasswordTxt.SetValue('') + self.sshProxyHeaderLbl.Enable(True) + self.sshProxyUserLbl.Enable(True) + self.sshProxyUserTxt.Enable(True) + self.sshProxyPasswordLbl.Enable(True) + self.sshProxyPasswordTxt.Enable(True) + self.sshProxyLoginBtn.Enable(True) + self.cancelBtn.Enable(True) + return + else: + connect_failed = True #except gevent.dns.DNSError, e: # self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, 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)).
-
git-admin＠x2go.org