Merge remote-tracking branch 'origin/master' into stevenmasley/ch1559…

…1/webrtc_sh
coder · Emyrk · Aug 12, 2021 · Aug 3, 2021 · Aug 12, 2021 · Aug 12, 2021
commit 8e15d364bdb16e4f2693cf5fd20ad8cbec47175d
diff --git a/internal/cmd/configssh.go b/internal/cmd/configssh.go
@@ -45,7 +45,6 @@ func configSSHCmd() *cobra.Command {
 		RunE:  configSSH(&configpath, &remove, &additionalOptions),
 	}
 	cmd.Flags().StringVar(&configpath, "filepath", filepath.Join("~", ".ssh", "config"), "override the default path of your ssh config file")
-	cmd.Flags().StringSliceVarP(&additionalOptions, "option", "o", []string{}, "additional options injected in the ssh config (ex. disable caching with \"-o ControlPath=none\")")
 	cmd.Flags().BoolVar(&remove, "remove", false, "remove the auto-generated Coder ssh config")
 
 	return cmd
@@ -249,16 +248,24 @@ func makeNewConfigs(binPath string, workspaces []coderutil.WorkspaceWithWorkspac
 	return newConfig
 }
 
-func makeSSHConfig(binPath, workspaceName, privateKeyFilepath string) string {
-	entry := fmt.Sprintf(
-		`Host coder.%s
-   HostName coder.%s
-   ProxyCommand %s
-   StrictHostKeyChecking no
-   ConnectTimeout=0
-   IdentitiesOnly yes
-   IdentityFile="%s"
-`, workspaceName, workspaceName, proxyCommand(binPath, workspaceName, true), privateKeyFilepath)
+func makeSSHConfig(binPath, workspaceName, privateKeyFilepath string, additionalOptions []string) string {
+	// Custom user options come first to maximizessh customization.
+	options := []string{}
+	if len(additionalOptions) > 0 {
+		options = []string{
+			"# Custom options. Duplicated values will always prefer the first!",
+		}
+		options = append(options, additionalOptions...)
+		options = append(options, "# End custom options.")
+	}
+	options = append(options,
+		fmt.Sprintf("HostName coder.%s", workspaceName),
+		fmt.Sprintf("ProxyCommand %s", proxyCommand(binPath, workspaceName, true)),
+		"StrictHostKeyChecking no",
+		"ConnectTimeout=0",
+		"IdentitiesOnly yes",
+		fmt.Sprintf("IdentityFile=%q", privateKeyFilepath),
+	)
 
 	if runtime.GOOS == "linux" || runtime.GOOS == "darwin" {
 		options = append(options,