[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.1.0.8-26-ge1fac98

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:55:20 CEST 2013


The branch, twofactorauth has been updated
       via  e1fac985554f168d0a4b82739b0a0e36eb275dca (commit)
      from  d4bc7cf1ae224fc6c4f4bb5a16de7f1d2720e86a (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 |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 99d727a..a2a3efe 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -354,7 +354,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         connect_failed = False
         profile_name = self.current_profile_name
         try:
-            if self._X2goClient__session_can_auto_connect(session_uuid):
+            _can_session_auto_connect = self._X2goClient__session_can_auto_connect(session_uuid)
+            _can_sshproxy_auto_connect = self._X2goClient__session_can_sshproxy_auto_connect(session_uuid)
+            _session_uses_sshproxy = self._X2goClient__session_can_sshproxy_auto_connect(session_uuid)
+            if _can_session_auto_connect:
                 self._X2goClient__connect_session(session_uuid)
                 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)
@@ -372,7 +375,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
                     except ValueError:
                         pass
             else:
-                _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=not self._X2goClient__session_can_sshproxy_auto_connect(session_uuid))
+                _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=(not _can_sshproxy_auto_connect) and _session_uses_sshproxy)
                 self._logon_windows[profile_name] = _logon_window
         except x2go.AuthenticationException:
             self._pyhoca_logger('public SSH key authentication to server failed, trying next auth-mechanism', loglevel=x2go.log.loglevel_INFO, )


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)).




More information about the x2go-commits mailing list