[X2Go-Commits] [x2goclient] 49/94: Add --forward-sshagent / -A cmdline option for enabling SSH agent forwarding.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.0
in repository x2goclient.

commit d417c628e0ece776a3c0343110070dadcbee176a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Sep 18 09:12:18 2018 +0200

    Add --forward-sshagent / -A cmdline option for enabling SSH agent forwarding.
---
 debian/changelog       | 7 ++++---
 pyhoca-cli             | 6 +++++-
 pyhoca/cli/frontend.py | 1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c76a862..f0e152aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium
+pyhoca-cli (0.5.99.1-0x2go2) UNRELEASED; urgency=medium
 
   * New upstream version (0.5.99.1).
     - Port to Python3.
@@ -11,6 +11,8 @@ pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium
       auto-detect the client-side keyboard in the X2Go session just fine.
     - pyhoca-cli main programme: Check for DISPLAY env var being set and having
       a usable / expectable value.
+    - Add --forward-sshagent / -A cmdline option for enabling SSH agent
+      forwarding.
   * debian/rules:
     + Build for Python3, not Python2.
     + Switch to pybuild DH build system.
@@ -25,9 +27,8 @@ pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium
     + Drop D (pyhoca-cli): python3-argparse. Part of stdlib in Python3
       these days.
   * debian/{control,compat}: Bump to DH version level 9.
-  * 
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 12 May 2018 20:37:21 +0000
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 18 Sep 2018 09:10:58 +0200
 
 pyhoca-cli (0.5.0.4-0x2go1) unstable; urgency=medium
 
diff --git a/pyhoca-cli b/pyhoca-cli
index 447969b1..1856777d 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -170,6 +170,9 @@ x2go_options =    [
                     {'args':['--terminate-on-ctrl-c'], 'default': False, 'action': 'store_true', 'help': 'terminate the connected session when pressing CTRL+C (instead of suspending the session)', },
                     {'args':['--auth-attempts'], 'default': 3, 'help': 'number of authentication attempts before authentication fails (default: 3)', },
                   ]
+ssh_options =     [
+                    {'args':['-A', '--forward-sshagent'], 'default': False, 'action': 'store_true', 'help': 'forward SSH agent authentication socket', },
+                  ]
 print_options =   [
                     {'args':['--print-action'], 'default': 'PDFVIEW', 'choices': PRINT_ACTIONS, 'help': 'action to be performed for incoming X2Go print jobs (default: \'PDFVIEW\')', },
                     {'args':['--pdfview-cmd'], 'default': None, 'help': 'PDF viewer command for displaying incoming X2Go print jobs (default: \'%s\'); this option selects \'--print-action PDFVIEW\'' % DEFAULT_PDFVIEW_CMD,},
@@ -250,13 +253,14 @@ Possible values for the --pack NX option are:
     p_actionopts = p.add_argument_group('client actions')
     p_debugopts = p.add_argument_group('debug options')
     p_x2goopts = p.add_argument_group('X2Go options')
+    p_sshopts = p.add_argument_group('SSH options')
     p_printopts = p.add_argument_group('X2Go print options')
     p_brokeropts = p.add_argument_group('X2Go Session Broker client options')
     p_nxopts = p.add_argument_group('NX options')
     p_backendopts = p.add_argument_group('Python X2Go backend options (for experts only)')
     p_compatopts = p.add_argument_group('compatibility options')
 
-    for (p_group, opts) in ((p_x2goopts, x2go_options), (p_printopts, print_options), (p_brokeropts, broker_options), (p_actionopts, action_options), (p_debugopts, debug_options), (p_nxopts, nx_options), (p_backendopts, backend_options), (p_compatopts, compat_options)):
+    for (p_group, opts) in ((p_x2goopts, x2go_options), (p_sshopts, ssh_options), (p_printopts, print_options), (p_brokeropts, broker_options), (p_actionopts, action_options), (p_debugopts, debug_options), (p_nxopts, nx_options), (p_backendopts, backend_options), (p_compatopts, compat_options)):
         for opt in opts:
 
             args = opt['args']
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 6e54164e..a73dc2f0 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -459,6 +459,7 @@ class PyHocaCLI(x2go.X2GoClient):
                                                            print_action=self.args.print_action,
                                                            print_action_args=self.args.print_action_args,
                                                            share_local_folders=self.args.share_local_folders,
+                                                           forward_sshagent=self.args.forward_sshagent,
                                                            cmd=self.args.command)
 
     def authenticate(self):

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git