This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-cli. from 9eea371 {pyhoca-cli, pyhoca/cli/frontend.py}: Add --ssh-passphrase feature. new c861a11 Revert "{pyhoca-cli, pyhoca/cli/frontend.py}: Add --ssh-passphrase feature." new 7303ada Revert "{pyhoca-cli, pyhoca/cli/frontend.py}: Only look for private ssh keys if appropriate." The 2 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 | 11 ----------- pyhoca/cli/frontend.py | 5 ++--- 3 files changed, 2 insertions(+), 16 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 c861a11d2df00ca66c139770135a92dac5f97e35 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 16 20:19:21 2022 +0200 Revert "{pyhoca-cli, pyhoca/cli/frontend.py}: Add --ssh-passphrase feature." This reverts commit 9eea371075ee1f60e24a980280c4a1d85fa2fed4. --- pyhoca-cli | 5 ----- pyhoca/cli/frontend.py | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pyhoca-cli b/pyhoca-cli index 3651c24..d535699 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -181,7 +181,6 @@ 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)', }, @@ -198,7 +197,6 @@ x2go_features = [ 'COMMAND', 'FORCE_PASSWORD', 'REMOTE_SSH_PORT', 'SSH_PRIVKEY', - 'SSH_PASSPHRASE', 'ADD_TO_KNOWN_HOSTS', 'SOUND', 'PRINTING', @@ -506,9 +504,6 @@ 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 d353233..3b0f145 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -504,7 +504,7 @@ class PyHocaCLI(x2go.X2GoClient): else: non_interactive = False - passphrase = self.args.ssh_passphrase + passphrase = None 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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-cli. commit 7303ada0a83b70863b1805452288919e8efdc235 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 16 20:19:24 2022 +0200 Revert "{pyhoca-cli, pyhoca/cli/frontend.py}: Only look for private ssh keys if appropriate." This reverts commit 8ce1d32efe640cffe9c0bd97fd747503ba7ac5e9. This issue is temporarily reverted because it breaks ssh-agent based authentication. --- debian/changelog | 2 -- pyhoca-cli | 6 ------ pyhoca/cli/frontend.py | 3 +-- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8e89310..12553f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,8 +24,6 @@ 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 d535699..fd08ad9 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -498,12 +498,6 @@ 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 3b0f145..c3bc74b 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -476,8 +476,7 @@ 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, - look_for_keys=self.args.look_for_keys) + cmd=self.args.command) def authenticate(self): """\ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git
-
git-admin＠x2go.org