This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-cli. from 7303ada Revert "{pyhoca-cli, pyhoca/cli/frontend.py}: Only look for private ssh keys if appropriate." new e125445 {pyhoca-cli, pyhoca/cli/frontend.py}: Only look for private ssh keys if appropriate. new c12d0ca pyhoca-cli: Don't try to immitate look_for_keys behaviour as implemented in the x2go Python module. new 104e24b {pyhoca-cli, pyhoca/cli/frontend.py}: Add --ssh-passphrase feature. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ pyhoca-cli | 15 +++++++++++---- pyhoca/cli/frontend.py | 5 +++-- 3 files changed, 16 insertions(+), 6 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-cli. commit e12544585bba7b847b3c996e0794e632856e4e41 Author: Daniel Teichmann <daniel.teichmann@das-netzwerkteam.de> Date: Fri Sep 2 15:32:33 2022 +0200 {pyhoca-cli, pyhoca/cli/frontend.py}: Only look for private ssh keys if appropriate. --- debian/changelog | 2 ++ pyhoca-cli | 6 ++++++ pyhoca/cli/frontend.py | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 12553f7..8e89310 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ pyhoca-cli (0.6.1.3-0x2go1) UNRELEASED; urgency=medium - Fix typo in man page. - Add --non-interactive cmdline option for forcefully preventing password queries on the TTY. + - {pyhoca-cli, pyhoca/cli/frontend.py}: Only look for private ssh keys if + appropriate. -- X2Go Release Manager <git-admin@x2go.org> Thu, 26 Dec 2019 17:03:42 +0100 diff --git a/pyhoca-cli b/pyhoca-cli index fd08ad9..d535699 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -498,6 +498,12 @@ Possible values for the --pack NX option are: if not a.ssh_privkey and os.path.isfile('%s/.ssh/id_dsa' % current_home): a.ssh_privkey = '%s/.ssh/id_dsa' % current_home + # only look for ssh keys if no ssh privkey is specified + if a.ssh_privkey: + a.look_for_keys = False + else: + a.look_for_keys = True + # 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 c3bc74b..3b0f145 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -476,7 +476,8 @@ class PyHocaCLI(x2go.X2GoClient): allow_share_local_folders=allow_share_local_folders, forward_sshagent=self.args.forward_sshagent, clipboard=self.args.clipboard_mode, - cmd=self.args.command) + cmd=self.args.command, + look_for_keys=self.args.look_for_keys) def authenticate(self): """\ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-cli. commit c12d0ca9029b286591e54f76d8d1cb058fd93f77 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 8 15:10:47 2023 +0200 pyhoca-cli: Don't try to immitate look_for_keys behaviour as implemented in the x2go Python module. --- pyhoca-cli | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pyhoca-cli b/pyhoca-cli index d535699..39148fd 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -493,10 +493,6 @@ Possible values for the --pack NX option are: # check if ssh priv key exists if a.ssh_privkey and not os.path.isfile(a.ssh_privkey): runtime_error("SSH private key %s file does not exist." % a.ssh_privkey, parser=p, exitcode=30) - if not a.ssh_privkey and os.path.isfile('%s/.ssh/id_rsa' % current_home): - a.ssh_privkey = '%s/.ssh/id_rsa' % current_home - if not a.ssh_privkey and os.path.isfile('%s/.ssh/id_dsa' % current_home): - a.ssh_privkey = '%s/.ssh/id_dsa' % current_home # only look for ssh keys if no ssh privkey is specified if a.ssh_privkey: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-cli. commit 104e24b7e2dd6221f571d06adb54613bd773c047 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 39148fd..f5a9794 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', @@ -500,6 +502,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 3b0f145..d353233 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/pyhoca-cli.git
-
git-admin＠x2go.org