Merge pull request cli#4521 from cli/jg/bind-locally

mislav · web-flow · commit b0360612d218 · 2021-10-14T20:29:21.000+02:00
codespace: switches port binding to 127.0.0.1 where possible
diff --git a/internal/codespaces/states.go b/internal/codespaces/states.go
@@ -52,7 +52,7 @@ func PollPostCreateStates(ctx context.Context, logger logger, apiClient apiClien
 	}()
 
 	// Ensure local port is listening before client (getPostCreateOutput) connects.
-	listen, err := net.Listen("tcp", ":0") // arbitrary port
+	listen, err := net.Listen("tcp", "127.0.0.1:0") // arbitrary port
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cmd/codespace/logs.go b/pkg/cmd/codespace/logs.go
@@ -62,7 +62,7 @@ func (a *App) Logs(ctx context.Context, codespaceName string, follow bool) (err
 	}
 
 	// Ensure local port is listening before client (getPostCreateOutput) connects.
-	listen, err := net.Listen("tcp", ":0") // arbitrary port
+	listen, err := net.Listen("tcp", "127.0.0.1:0") // arbitrary port
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cmd/codespace/ssh.go b/pkg/cmd/codespace/ssh.go
@@ -94,7 +94,9 @@ func (a *App) SSH(ctx context.Context, sshArgs []string, opts sshOptions) (err e
 	usingCustomPort := localSSHServerPort != 0 // suppress log of command line in Shell
 
 	// Ensure local port is listening before client (Shell) connects.
-	listen, err := net.Listen("tcp", fmt.Sprintf(":%d", localSSHServerPort))
+	// Unless the user specifies a server port, localSSHServerPort is 0
+	// and thus the client will pick a random port.
+	listen, err := net.Listen("tcp", fmt.Sprintf("127.0.0.1:%d", localSSHServerPort))
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func PollPostCreateStates(ctx context.Context, logger logger, apiClient apiClien`
`52`	`52`	`}()`
`53`	`53`
`54`	`54`	`// Ensure local port is listening before client (getPostCreateOutput) connects.`
`55`		`- listen, err := net.Listen("tcp", ":0") // arbitrary port`
	`55`	`+ listen, err := net.Listen("tcp", "127.0.0.1:0") // arbitrary port`
`56`	`56`	`if err != nil {`
`57`	`57`	`return err`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func (a *App) Logs(ctx context.Context, codespaceName string, follow bool) (err`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`// Ensure local port is listening before client (getPostCreateOutput) connects.`
`65`		`- listen, err := net.Listen("tcp", ":0") // arbitrary port`
	`65`	`+ listen, err := net.Listen("tcp", "127.0.0.1:0") // arbitrary port`
`66`	`66`	`if err != nil {`
`67`	`67`	`return err`
`68`	`68`	`}`