The branch, master has been updated via c2e233584ebfc0d361028c68f2d54fdbb7844372 (commit) from 0916a6aec0281fa70dfcfa4a1edc0d3d0c56a8cc (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 c2e233584ebfc0d361028c68f2d54fdbb7844372 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jan 13 16:30:13 2013 +0100 Add cmdline option --add-to-known-hosts. Add SSH host keys automatically to the client's known_hosts file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ man/man1/pyhoca-gui.1 | 5 +++++ pyhoca-gui | 1 + pyhoca/wxgui/frontend.py | 3 ++- pyhoca/wxgui/logon.py | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d2acff9..90c676e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ pyhoca-gui (0.2.2.0-0~x2go1) UNRELEASED; urgency=low - Translation source file (.pot) updated. Update of en.po and de.po. - Drop SSH proxy tunnel configuration parameter. Adapt PyHoca-GUI to the way X2GoClient configures the SSH proxy settings. + - Add cmdline option --add-to-known-hosts. Add SSH host keys automatically + to the client's known_hosts file. * /debian/control: + Thanks to Orion's patch in bug #91 we can drop many build dependencies. + Versioned Depend: on python-x2go (>= 0.2.2.0-0~). diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1 index 790b2de..8f07e83 100644 --- a/man/man1/pyhoca-gui.1 +++ b/man/man1/pyhoca-gui.1 @@ -95,6 +95,11 @@ Restrict functionality of \fBpyhoca-gui\fR's main session manager icon that is s switch limits the icon 's functionality to a right-click menu that allows one to raise the ,,About'' window and exit the application. On left-click only a minimal session menu is shown. .TP +\*(T<\fB\-\-add-to-known-hosts\fR\*(T> +Automatically add host key fingerprint to .ssh/known_hosts in case of "authenticity of server can't be established" (without user interaction). + +Handle this option with care: Using it lessens the security/integrity of your SSH client setup. +.TP \*(T<\fB\-\-start-on-connect\fR\*(T> Start a session directly after authentication (only if no suspended sessions are available). .TP diff --git a/pyhoca-gui b/pyhoca-gui index c077301..d0da14f 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -206,6 +206,7 @@ x2go_gui_options = [ {'args':['--tray-icon'], 'default': None, 'metavar': '<your-logo>', 'help': 'define an alternative system tray icon file (PNG files only, leave out file extension here, size 22x22 on Linux, 16x16 on Windows)', }, {'args':['--tray-icon-connecting'], 'default': None, 'metavar': '<your-logo-while-connecting>', 'help': 'define an alternative system tray icon file while connecting to a server (PNG files only, leave out file extension here, size 22x22 on Linux, 16x16 on Windows)', }, {'args':['--restricted-trayicon'], 'default': False, 'action': 'store_true', 'help': 'restricts session manager\'s main icon functionality to information window and application exit; on left-click only a minimal session menu is shown', }, + {'args':['--add-to-known-hosts'], 'default': False, 'action': 'store_true', 'help': 'automatically add SSH host keys to the known_hosts files of the client-side user', }, {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'start a session directly after authentication if no session is currently running/suspended', }, {'args':['--exit-on-disconnect'], 'default': False, 'action': 'store_true', 'help': 'exit the session manager after a server connection has died', }, {'args':['--resume-newest-on-connect', '--resume-on-connect'], 'default': False, 'action': 'store_true', 'help': 'on connect auto-resume the newest suspended session', }, diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 45f60dd..6bc336e 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -275,6 +275,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ # cmd line options + self.add_to_known_hosts = self.args.add_to_known_hosts self.auto_connect = self.args.auto_connect self.start_on_connect = self.args.start_on_connect self.resume_newest_on_connect = self.args.resume_newest_on_connect @@ -602,7 +603,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): _session_uses_sshproxy = self._X2goClient__session_uses_sshproxy(session_uuid) _session_reuses_sshproxy_authinfo = self._X2goClient__session_reuses_sshproxy_authinfo(session_uuid) if _can_session_auto_connect: - self._X2goClient__connect_session(session_uuid) + self._X2goClient__connect_session(session_uuid, add_to_known_hosts=self.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.OnServerDisconnect(evt) diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index 36ac3d9..0557288 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -287,7 +287,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): username=username, password=password, force_password_auth=force_password_auth, - add_to_known_hosts=False, + add_to_known_hosts=self._PyHocaGUI.add_to_known_hosts, sshproxy_user=sshproxy_user, sshproxy_password=sshproxy_password, sshproxy_force_password_auth=sshproxy_force_password_auth, 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)).