Support for ProxyJump

gae123 · Jan 10, 2018 · 723fe2d · 723fe2d
1 parent e1aebef
commit 723fe2d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/build/Makefile b/build/Makefile
@@ -1,7 +1,7 @@
 #############################################################################
 # Copyright (c) 2017 SiteWare Corp. All right reserved
 #############################################################################
-SD2_VERSION := 0.9.82
+SD2_VERSION := 0.9.83
 
 TOP := $(realpath ..)
 SD2OS := $(shell uname)

diff --git a/src/lib/sd2/gen_ssh_config.py b/src/lib/sd2/gen_ssh_config.py
@@ -25,9 +25,6 @@
 '''
 container_ssh_option_names = [
     'IdentityFile',
-    'ProxyCommand',
-    "PKCS11Provider",
-    'SmartcardDevice',
     "IdentitiesOnly"
 ]
 
@@ -42,6 +39,10 @@
     'UseKeychain',
     'AddKeysToAgent',
     'ForwardAgent',
+    'ProxyCommand',
+    'ProxyJump',
+    "PKCS11Provider",
+    'SmartcardDevice',
 ]
 ssh_option_names.extend(container_ssh_option_names)
 

diff --git a/src/lib/sd2/sd2_config_schema.json b/src/lib/sd2/sd2_config_schema.json
@@ -55,6 +55,7 @@
         "IdentityFile":  {"type": "string"},
         "StrictHostKeyChecking": {"type": "string"},
         "ProxyCommand": {"type": "string"},
+        "ProxyJump": {"type": "string"},
         "AddKeysToAgent": {"type": "string"},
         "UseKeychain": {"type": "string"},
         "UserKnownHostsFile": {"type": "string"},

diff --git a/src/lib/sd2/sd2cont.py b/src/lib/sd2/sd2cont.py
@@ -211,7 +211,7 @@ def main(args):
                     else (args.hostname + '-' + x)) for x in containers]
     ret = do_containers(args.hostname, containers, args.force, args.dryrun)
 
-    logging.debug("sd2cont: Starting %s on %s", containers, args.hostname)
+    logging.debug("sd2cont: Considered %s on %s", containers, args.hostname)
 
     # 0 means it did start one or more
     sys.exit(0 if ret else 1)