[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.2.0.4-110-g19d9643

[X2Go dev team]

The branch, twofactorauth has been updated
       via  19d964360f25318e592c33da21327909f28494ab (commit)
      from  6dc18e669540ca454f2b25e6b49b6371213dc4c1 (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/logon.py |   42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

The diff of changes is:
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index c3e9e19..fca8600 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -261,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
@@ -275,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]
@@ -286,9 +288,9 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
                                                          password=password, 
                                                          force_password_auth=force_password_auth,
                                                          add_to_known_hosts=False,
-                                                         sshproxy_user=sshproxy_user, 
+                                                         sshproxy_user=sshproxy_user,
                                                          sshproxy_password=sshproxy_password,
-                                                         sshproxy_force_password_auth=force_password_auth,
+                                                         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,
@@ -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)).