[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.0.28.0-15-g8a0d2e6
X2Go dev team
git-admin at x2go.org
Sat Sep 14 15:54:44 CEST 2013
The branch, twofactorauth has been updated
via 8a0d2e68c057649a967994db26e1354349d6ce12 (commit)
from 3d01e545189a919d8936ebceb94f06a826e2221b (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 | 9 +++++----
pyhoca/wxgui/logon.py | 5 +++--
2 files changed, 8 insertions(+), 6 deletions(-)
The diff of changes is:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index d41cc90..f180813 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -135,7 +135,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
if x2go.X2GOCLIENT_OS == 'Windows':
_x2goclient_kwargs['start_xserver'] = self.args.start_xserver
_x2goclient_kwargs['start_pulseaudio'] = self.args.start_pulseaudio
-
+
if x2go.X2GOCLIENT_OS == 'Windows' and self.args.start_pulseaudio and os.environ.has_key('PYHOCAGUI_DEVELOPMENT') and os.environ['PYHOCAGUI_DEVELOPMENT'] == '1':
print os.path.dirname(basepath.pulseaudio_binary)
_x2goclient_kwargs['pulseaudio_installdir'] = os.path.dirname(basepath.pulseaudio_binary)
@@ -304,8 +304,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def _do_authenticate(self, evt, session_uuid):
profile_name = self.current_profile_name
+ _add_to_known_hosts = self._X2goClient__check_session_host(session_uuid)
try:
- self._X2goClient__connect_session(session_uuid, add_to_known_hosts=True)
+ self._X2goClient__connect_session(session_uuid, add_to_known_hosts=_add_to_known_hosts)
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._X2goClient__disconnect_profile(profile_name)
@@ -317,11 +318,11 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self._temp_disabled_profile_names.remove(profile_name)
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 )
+ _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self,)
self._sub_windows.append(_logon_window)
except x2go.X2goSSHProxyAuthenticationException:
self._pyhoca_logger('public SSH key authentication for SSH proxy failed, trying next auth-mechanism', loglevel=x2go.log.loglevel_INFO, )
- _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=True )
+ _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, add_to_known_hosts=_add_to_known_hosts, sshproxy_auth=True )
self._sub_windows.append(_logon_window)
except x2go.SSHException, e:
self.notifier.send(_(u'%s - connect error') % profile_name, '%s!' % str(e), icon='auth_error', timeout=4000)
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index cd63646..59d4a09 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -62,12 +62,13 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
STILL UNDOCUMENTED
"""
- def __init__(self, _PyHocaGUI, profile_name, caller=None, sshproxy_auth=False):
+ def __init__(self, _PyHocaGUI, profile_name, caller=None, add_to_known_hosts=False, sshproxy_auth=False):
self._PyHocaGUI = _PyHocaGUI
self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger
self._pyhoca_logger('password dialog box started', loglevel=x2go.loglevel_INFO, )
+ self.add_to_known_hosts = add_to_known_hosts
self.sshproxy_auth = sshproxy_auth
self.current_profile_name = profile_name
@@ -227,7 +228,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
username=username,
password=password,
force_password_auth=force_password_auth,
- add_to_known_hosts=True,
+ add_to_known_hosts=self.add_to_known_hosts,
sshproxy_user=sshproxy_user,
sshproxy_password=sshproxy_password)
if not self._PyHocaGUI._X2goClient__server_valid_x2gouser(session_uuid):
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