The branch, master has been updated
via d7deb4a04587933dfd2186c1a71d7a9caff3234d (commit)
from 8954b44937f0ebc928b8d21b27a8e75d775ff9f5 (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 d7deb4a04587933dfd2186c1a71d7a9caff3234d
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Sep 3 18:25:13 2013 +0200
Add support for encrypted/locked/passphrase-protected SSH private key files.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 +
debian/control | 2 +-
pyhoca/wxgui/frontend.py | 21 +++
pyhoca/wxgui/passphrase.py | 343 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 367 insertions(+), 1 deletion(-)
create mode 100644 pyhoca/wxgui/passphrase.py
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1a96f31..d5acf11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ pyhoca-gui (0.4.0.9-0~x2go1) UNRELEASED; urgency=low
* New upstream release (0.4.0.9):
- Make notifications more robust.
+ - Add support for encrypted/locked/passphrase-protected SSH private key
+ files.
* /debian/copyright:
+ Update file. Add entry for file icon2exe.py.
diff --git a/debian/control b/debian/control
index fd14008..14b18ba 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Architecture: all
Depends:
${misc:Depends},
python,
- python-x2go (>=0.4.0.7-0~),
+ python-x2go (>=0.4.0.9-0~),
python-argparse,
python-notify,
python-setproctitle,
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index dffa613..00e47f3 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -51,6 +51,7 @@ import locale
# PyHoca-GUI modules
import about
import logon
+import passphrase
import taskbar
import profilemanager
import printingprefs
@@ -629,6 +630,26 @@ class PyHocaGUI(wx.App, x2go.X2GoClient):
_logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=((not _can_sshproxy_auto_connect) and _session_uses_sshproxy and (not _session_reuses_sshproxy_authinfo)))
self._logon_windows[profile_name] = _logon_window
+ except x2go.PasswordRequiredException:
+ key_filename = None
+ try:
+ if not self._X2GoClient__get_session(session_uuid).control_params['look_for_keys']:
+ key_filename = self._X2GoClient__get_session(session_uuid).control_params['key_filename']
+ except KeyError:
+ pass
+ self._pyhoca_logger('SSH private key file is encrypted and requires a passphrase', loglevel=x2go.log.loglevel_INFO, )
+ _passphrase_window = passphrase.PyHocaGUI_DialogBoxPassphrase(self, profile_name, caller=self, key_filename=key_filename)
+ self._logon_windows[profile_name] = _passphrase_window
+ except x2go.X2GoSSHProxyPasswordRequiredException:
+ key_filename = None
+ try:
+ if not self._X2GoClient__get_session(session_uuid).sshproxy_params['sshproxy_look_for_keys']:
+ key_filename = self._X2GoClient__get_session(session_uuid).sshproxy_params['sshproxy_key_filename']
+ except KeyError:
+ pass
+ self._pyhoca_logger('SSH private key file (for SSH proxy) is encrypted and requires a passphrase', loglevel=x2go.log.loglevel_INFO, )
+ _passphrase_window = passphrase.PyHocaGUI_DialogBoxPassphrase(self, profile_name, caller=self, sshproxy_auth=True, key_filename=key_filename)
+ self._logon_windows[profile_name] = _passphrase_window
except x2go.AuthenticationException:
self._pyhoca_logger('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, )
diff --git a/pyhoca/wxgui/passphrase.py b/pyhoca/wxgui/passphrase.py
new file mode 100644
index 0000000..c04b88d
--- /dev/null
+++ b/pyhoca/wxgui/passphrase.py
@@ -0,0 +1,343 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
+#
+# PyHoca GUI is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# PyHoca GUI is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+modules ={}
+
+try:
+ import wxversion
+ wxversion.select('2.9')
+except: pass
+
+try:
+ import wxversion
+ wxversion.select('2.8')
+except: pass
+
+# Python X2Go
+import x2go
+
+# gevent
+import gevent
+import gevent.monkey
+gevent.monkey.patch_all()
+
+import wx
+import os
+import base64
+
+# PyHoca-GUI modules
+# ... NONE ...
+
+if os.environ.has_key('DESKTOP_SESSION'):
+ WINDOW_MANAGER = os.environ['DESKTOP_SESSION']
+else:
+ WINDOW_MANAGER = 'generic'
+
+class PyHocaGUI_DialogBoxPassphrase(wx.Dialog):
+ """\
+ SSH key passphrase window for L{PyHocaGUI}.
+
+ """
+ def __init__(self, _PyHocaGUI, profile_name, caller=None, sshproxy_auth=False, sshproxy_passphrase='', key_filename=None):
+ """\
+ Passphrase window (constructor)
+
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param profile_name: name of session profile that defines the server we authenticate against
+ @type profile_name: C{str}
+ @param caller: unused
+ @type caller: C{None}
+
+ """
+ self._PyHocaGUI = _PyHocaGUI
+ self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger
+ self._pyhoca_logger('SSH key passphrase dialog box started', loglevel=x2go.loglevel_INFO, )
+
+ self.current_profile_name = profile_name
+ self.current_profile_config = self._PyHocaGUI.session_profiles.get_profile_config(profile_name)
+
+ if sshproxy_auth:
+ wx.Dialog.__init__(self, None, id=-1, title=_(u'%s (SSH proxy)') % profile_name, style=wx.DEFAULT_FRAME_STYLE, )
+ else:
+ wx.Dialog.__init__(self, None, id=-1, title=_(u'%s (X2Go Server)') % profile_name, style=wx.DEFAULT_FRAME_STYLE, )
+
+ self._PyHocaGUI._sub_windows.append(self)
+
+ self.passphrase = None
+ self.key_filename = key_filename
+ self.sshproxy_auth = sshproxy_auth
+ self.sshproxy_passphrase = sshproxy_passphrase
+
+ if self.key_filename is not None:
+ keyfilenameLbl = wx.StaticText(self, wx.ID_ANY, _(u'Unlock SSH private key (%s)...') % key_filename)
+ else:
+ keyfilenameLbl = wx.StaticText(self, wx.ID_ANY, _(u'Unlock auto-discovered SSH private key...'))
+
+ self.passphraseLbl = wx.StaticText(self, wx.ID_ANY, _(u'Passphrase')+':', size=(-1, -1))
+ self.passphraseTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER|wx.TE_PASSWORD, size=(120, -1))
+ self.passphraseTxt.SetFocus()
+ self.unlockBtn = wx.Button(self, wx.ID_OK, _(u'Unlock SSH key'), )
+ self.unlockBtn.SetDefault()
+
+ _tab_order = []
+
+ self.cancelBtn = wx.Button(self, wx.ID_CANCEL, _(u'Cancel'), )
+
+ _tab_order.extend([self.passphraseTxt, self.unlockBtn, self.cancelBtn, ])
+
+ self.Bind(wx.EVT_BUTTON, self.OnPassphrase, self.unlockBtn)
+ self.Bind(wx.EVT_TEXT_ENTER, self.OnPassphrase, self.passphraseTxt)
+ self.Bind(wx.EVT_BUTTON, self.OnCancel, self.cancelBtn)
+
+ btnSizer = wx.BoxSizer(wx.HORIZONTAL)
+ credSizer = wx.GridBagSizer(hgap=1, vgap=1)
+ mainSizer = wx.BoxSizer(wx.VERTICAL)
+
+ credSizer.Add(self.passphraseLbl, pos=(0,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
+ credSizer.Add(self.passphraseTxt, pos=(0,1), flag=wx.ALL, border=5)
+
+ btnSizer.Add(self.unlockBtn, 0, wx.ALL, 5)
+ btnSizer.Add(self.cancelBtn, 0, wx.ALL, 5)
+
+ mainSizer.Add(keyfilenameLbl, 0, wx.ALL|wx.ALIGN_LEFT, 5)
+ mainSizer.Add(credSizer, 0, wx.ALL|wx.ALIGN_CENTER, 5)
+ mainSizer.Add(btnSizer, 0, wx.ALL|wx.ALIGN_RIGHT, 5)
+
+ # Logged in variable
+ self.loggedIn = False
+
+ self.SetSizerAndFit(mainSizer)
+ self.Layout()
+
+ for i in xrange(len(_tab_order) - 1):
+ _tab_order[i+1].MoveAfterInTabOrder(_tab_order[i])
+
+ maxX, maxY = wx.GetDisplaySize()
+
+ if self._PyHocaGUI.logon_window_position_x and self._PyHocaGUI.logon_window_position_y:
+
+ # allow positioning of logon window via command line option
+ if self._PyHocaGUI.logon_window_position_x < 0:
+ move_x = maxX - (self.GetSize().GetWidth() + self._PyHocaGUI.logon_window_position_x)
+ else:
+ move_x = self._PyHocaGUI.logon_window_position_x
+ if self._PyHocaGUI.logon_window_position_y < 0:
+ move_y = maxX - (self.GetSize().GetHeight() + self._PyHocaGUI.logon_window_position_y)
+ else:
+ move_y = self._PyHocaGUI.logon_window_position_y
+
+ elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'mate', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )):
+
+ # automatically place logon Window for GNOME, awesome
+ move_x = maxX - (self.GetSize().GetWidth() + 20)
+ move_y = 35
+
+ else:
+
+ # automatically place logon Window for KDE4, LXDE, etc.
+ move_x = maxX - (self.GetSize().GetWidth() + 20)
+ move_y = maxY - (self.GetSize().GetHeight() + 70)
+
+ self.Move((move_x, move_y))
+ self.Show()
+
+ def OnPassphrase(self, evt):
+ """\
+ If the user clicks ,,Ok'' in the passphrase window.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
+ if self.sshproxy_auth:
+ passphrase = sshproxy_passphrase = self.passphraseTxt.GetValue()
+ else:
+ passphrase = self.passphraseTxt.GetValue()
+ sshproxy_passphrase = base64.b64decode(self.sshproxy_passphrase)
+
+ print 'X2GO: ', passphrase
+ print 'PROXY: ', sshproxy_passphrase
+
+ connect_failed = False
+
+ wx.BeginBusyCursor()
+ session_uuid = self._PyHocaGUI._X2GoClient__client_registered_sessions_of_profile_name(self.current_profile_name)[0]
+
+ try:
+ if self.sshproxy_auth:
+ self._PyHocaGUI._X2GoClient__connect_session(session_uuid,
+ password=passphrase,
+ sshproxy_password=sshproxy_passphrase,
+ add_to_known_hosts=self._PyHocaGUI.add_to_known_hosts,
+ )
+ else:
+ self._PyHocaGUI._X2GoClient__connect_session(session_uuid,
+ password=passphrase,
+ sshproxy_password=sshproxy_passphrase,
+ add_to_known_hosts=self._PyHocaGUI.add_to_known_hosts,
+ )
+ self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ title=_(u'%s - connect') % self.current_profile_name,
+ text=_(u'Authentication has been successful.'),
+ icon='auth_success')
+
+ except x2go.PasswordRequiredException:
+ if self.sshproxy_auth:
+ key_filename = None
+ try:
+ if not self._PyHocaGUI._X2GoClient__get_session(session_uuid).control_params['look_for_keys']:
+ key_filename = self._PyHocaGUI._X2GoClient__get_session(session_uuid).control_params['key_filename']
+ except KeyError:
+ pass
+ self._pyhoca_logger('SSH private key file is encrypted and requires a passphrase', loglevel=x2go.log.loglevel_INFO, )
+ _passphrase_window = PyHocaGUI_DialogBoxPassphrase(self._PyHocaGUI, self.current_profile_name, caller=self, sshproxy_passphrase=base64.b64encode(passphrase), key_filename=key_filename)
+ self._PyHocaGUI._logon_windows[self.current_profile_name] = _passphrase_window
+
+ else:
+ self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ title=_(u'%s - connect failure') % self.current_profile_name,
+ text=_(u'SSH key file (for X2Go server) could not be unlocked!'),
+ icon='auth_failed')
+ connect_failed = True
+
+ except x2go.X2GoSSHProxyPasswordRequiredException:
+ self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ title=_(u'%s - connect failure') % self.current_profile_name,
+ text=_(u'SSH key file (for SSH proxy) could not be unlocked!'),
+ icon='auth_failed')
+ connect_failed = True
+
+ except x2go.AuthenticationException:
+ self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ title=_(u'%s - connect failure') % self.current_profile_name,
+ text=_(u'Authentication failed!'),
+ icon='auth_failed')
+ connect_failed = True
+
+ except gevent.socket.error, e:
+ self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ title=_(u'%s - socket error') % self.current_profile_name,
+ text=e.strerror + '!',
+ icon='auth_error')
+ connect_failed = True
+
+ except x2go.X2GoHostKeyException, e:
+ self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ title=_(u'%s - host key error') % self.current_profile_name,
+ text=_(u'The remote server\'s host key is invalid or has not been accepted by the user') + '!',
+ icon='auth_error',
+ timeout=4000)
+ connect_failed = True
+
+ except x2go.X2GoRemoteHomeException, e:
+ self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ title=_(u'%s - missing home directory') % self.current_profile_name,
+ text=_("The remote user's home directory does not exist."),
+ icon='auth_error',
+ timeout=4000)
+ connect_failed = True
+
+ except x2go.X2GoSSHProxyException, e:
+ self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ title=_(u'%s - key error') % self.current_profile_name,
+ text='%s!' % str(e),
+ icon='auth_error',
+ timeout=4000)
+ connect_failed = True
+
+ except x2go.X2GoSessionException, e:
+ self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ title=_(u'%s - auth error') % self.current_profile_name,
+ text='%s!' % str(e),
+ icon='auth_error',
+ timeout=4000)
+ connect_failed = True
+
+ except x2go.SSHException, e:
+
+ if str(e).startswith('Host key for server ') and str(e).endswith(' does not match!'):
+ 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._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ title=_(u'%s - SSH error') % self.current_profile_name,
+ text='%s' % errmsg,
+ icon='auth_error',
+ timeout=10000)
+
+
+ connect_failed = True
+
+ except:
+ self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ title=_(u'%s - unknown error') % self.current_profile_name,
+ text=_(u'An unknown error occured during authentication!'),
+ icon='auth_error')
+ connect_failed = True
+ if self._PyHocaGUI.args.debug or self._PyHocaGUI.args.libdebug or (os.environ.has_key('PYHOCAGUI_DEVELOPMENT') and os.environ['PYHOCAGUI_DEVELOPMENT'] == '1'):
+ raise
+
+ self._PyHocaGUI.notifier.send(self.current_profile_name, context='AUTH_%s' % self.current_profile_name, timeout=4000)
+
+ wx.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
+ # Windows's GUI is more picky then Linux's GTK GUI about EndBusyCursor if cursor is not busy...
+ try: wx.EndBusyCursor()
+ except: pass
+
+ if connect_failed and self._PyHocaGUI.exit_on_disconnect:
+ self._PyHocaGUI.WakeUpIdle()
+ self._PyHocaGUI.ExitMainLoop()
+
+ if self._PyHocaGUI._X2GoClient__is_session_connected(session_uuid):
+ self._PyHocaGUI._post_authenticate(evt, session_uuid)
+ self.sshproxy_started = False
+ try: del self._PyHocaGUI._logon_windows[self.current_profile_name]
+ except KeyError: pass
+
+ self.Close()
+ self.Destroy()
+
+ def OnCancel(self, evt):
+ """
+ If the user clicks ,,Cancel'' in the logon window.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
+ self.Close()
+ self.Destroy()
+
+ def Destroy(self):
+ """
+ Tidy up some stuff in the main application instance when the logon window gets destroyed.
+
+ """
+ try:
+ self._PyHocaGUI._sub_windows.remove(self)
+ except ValueError:
+ pass
+ try:
+ self._PyHocaGUI._temp_disabled_profile_names.remove(self.current_profile_name)
+ except ValueError:
+ pass
+ wx.Dialog.Destroy(self)
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)).
