fixed jump hosts regression

ferama · Apr 24, 2021 · eae8d85 · eae8d85
1 parent 3a2084b
commit eae8d85
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/cmd/tun_forward.go b/cmd/tun_forward.go
@@ -32,13 +32,8 @@ var tunForwardCmd = &cobra.Command{
 			SshClient: &conf.SshClientConf{
 				Identity:  identity,
 				ServerURI: args[0],
-				JumpHosts: []*conf.JumpHostConf{
-					{
-						URI:      jumpHost,
-						Identity: identity,
-					},
-				},
-				Insecure: insecure,
+				JumpHosts: make([]*conf.JumpHostConf, 0),
+				Insecure:  insecure,
 			},
 			Tunnel: []*conf.TunnnelConf{
 				{
@@ -49,6 +44,13 @@ var tunForwardCmd = &cobra.Command{
 			},
 		}
 
+		if jumpHost != "" {
+			config.SshClient.JumpHosts = append(config.SshClient.JumpHosts, &conf.JumpHostConf{
+				URI:      jumpHost,
+				Identity: identity,
+			})
+		}
+
 		client := sshc.NewSshConnection(config.SshClient)
 		go client.Start()
 		tun.NewTunnel(client, config.Tunnel[0]).Start()

diff --git a/cmd/tun_reverse.go b/cmd/tun_reverse.go
@@ -43,13 +43,8 @@ var tunReverseCmd = &cobra.Command{
 			SshClient: &conf.SshClientConf{
 				Identity:  identity,
 				ServerURI: args[0],
-				JumpHosts: []*conf.JumpHostConf{
-					{
-						URI:      jumpHost,
-						Identity: identity,
-					},
-				},
-				Insecure: insecure,
+				JumpHosts: make([]*conf.JumpHostConf, 0),
+				Insecure:  insecure,
 			},
 			Tunnel: []*conf.TunnnelConf{
 				{
@@ -59,6 +54,14 @@ var tunReverseCmd = &cobra.Command{
 				},
 			},
 		}
+
+		if jumpHost != "" {
+			config.SshClient.JumpHosts = append(config.SshClient.JumpHosts, &conf.JumpHostConf{
+				URI:      jumpHost,
+				Identity: identity,
+			})
+		}
+
 		if startSshD {
 			sshdKey, _ := cmd.Flags().GetString("sshd-key")
 			sshdAuthorizedKeys, _ := cmd.Flags().GetString("sshd-authorized-keys")