This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 9eea371075ee1f60e24a980280c4a1d85fa2fed4 Author: Daniel Teichmann <daniel.teichmann@das-netzwerkteam.de> Date: Thu Sep 15 00:06:07 2022 +0200 {pyhoca-cli, pyhoca/cli/frontend.py}: Add --ssh-passphrase feature. --- pyhoca-cli | 5 +++++ pyhoca/cli/frontend.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pyhoca-cli b/pyhoca-cli index d5356997..3651c241 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -181,6 +181,7 @@ x2go_options = [ {'args':['--force-password'], 'default': False, 'action': 'store_true', 'help': 'enforce username/password authentication', }, {'args':['-p','--remote-ssh-port'], 'default': '22', 'help': 'remote SSH port (default: 22)', }, {'args':['-i', '-k','--ssh-privkey'], 'default': None, 'help': 'use file \'SSH_PRIVKEY\' as private key for the SSH connection (e.g. ~/.ssh/id_rsa)', }, + {'args':['--ssh-passphrase'], 'default': None, 'help': 'use passphrase to unlock private key \'SSH_PRIVKEY\' for the SSH connection.', }, {'args':['--add-to-known-hosts'], 'default': False, 'action': 'store_true', 'help': 'add RSA host key fingerprint to ~/.ssh/known_hosts if authenticity of server can\'t be established (default: not set)', }, {'args':['--sound'], 'default': 'pulse', 'choices': ('pulse', 'esd', 'none'), 'help': 'X2Go server sound system (default: \'pulse\')', }, {'args':['--printing'], 'default': False, 'action': 'store_true', 'help': 'use X2Go printing (default: disabled)', }, @@ -197,6 +198,7 @@ x2go_features = [ 'COMMAND', 'FORCE_PASSWORD', 'REMOTE_SSH_PORT', 'SSH_PRIVKEY', + 'SSH_PASSPHRASE', 'ADD_TO_KNOWN_HOSTS', 'SOUND', 'PRINTING', @@ -504,6 +506,9 @@ Possible values for the --pack NX option are: else: a.look_for_keys = True + if a.ssh_passphrase and not a.ssh_privkey: + runtime_error("--ssh-passphrase can only be used in conjunction with --ssh-privkey.", parser=p, exitcode=1) + # hang around the keyboard chaos... a.kbd_type = a.kbd_type.lower() a.kbd_layout = a.kbd_layout.lower() diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 3b0f1453..d3532334 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -504,7 +504,7 @@ class PyHocaCLI(x2go.X2GoClient): else: non_interactive = False - passphrase = None + passphrase = self.args.ssh_passphrase passphrase_unlock_counter = 3 _username = self.args.username or self._X2GoClient__get_session_username(self.x2go_session_hash) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git