Inject and configure helper if ssh signature support enabled

cmd/agent/container/credentials_server.go

@@ -14,6 +14,7 @@ import (
 	"github.com/loft-sh/devpod/pkg/credentials"
 	"github.com/loft-sh/devpod/pkg/dockercredentials"
 	"github.com/loft-sh/devpod/pkg/gitcredentials"
+	"github.com/loft-sh/devpod/pkg/gitsshsigning"
 	"github.com/loft-sh/devpod/pkg/netstat"
 	portpkg "github.com/loft-sh/devpod/pkg/port"
 	"github.com/loft-sh/log"
@@ -29,10 +30,12 @@ type CredentialsServerCmd struct {
 
 	User string
 
-	ConfigureGitHelper    bool
-	ConfigureDockerHelper bool
+	ConfigureGitHelper             bool
+	ConfigureGitSSHSignatureHelper bool
+	ConfigureDockerHelper          bool
 
-	ForwardPorts bool
+	ForwardPorts              bool
+	GitSSHSignatureSigningKey string
 }
 
 // NewCredentialsServerCmd creates a new command
@@ -49,9 +52,11 @@ func NewCredentialsServerCmd(flags *flags.GlobalFlags) *cobra.Command {
 		},
 	}
 	credentialsServerCmd.Flags().BoolVar(&cmd.ConfigureGitHelper, "configure-git-helper", false, "If true will configure git helper")
+	credentialsServerCmd.Flags().BoolVar(&cmd.ConfigureGitSSHSignatureHelper, "configure-git-ssh-signature-helper", false, "If true will configure git ssh signature helper")
 	credentialsServerCmd.Flags().BoolVar(&cmd.ConfigureDockerHelper, "configure-docker-helper", false, "If true will configure docker helper")
 	credentialsServerCmd.Flags().BoolVar(&cmd.ForwardPorts, "forward-ports", false, "If true will automatically try to forward open ports within the container")
 	credentialsServerCmd.Flags().StringVar(&cmd.User, "user", "", "The user to use")
+	credentialsServerCmd.Flags().StringVar(&cmd.GitSSHSignatureSigningKey, "signing-key", "", "Key to use")
 	_ = credentialsServerCmd.MarkFlagRequired("user")
 	return credentialsServerCmd
 }
@@ -129,6 +134,18 @@ func (cmd *CredentialsServerCmd) Run(ctx context.Context, _ []string) error {
 		}(cmd.User)
 	}
 
+	if cmd.ConfigureGitSSHSignatureHelper {
+		err = gitsshsigning.ConfigureHelper(binaryPath, cmd.User, cmd.GitSSHSignatureSigningKey)
+		if err != nil {
+			return errors.Wrap(err, "configure git ssh signature helper")
+		}
+
+		// cleanup when we are done
+		defer func(userName string) {
+			_ = gitsshsigning.RemoveHelper()
+		}(cmd.User)
+	}
+
 	return credentials.RunCredentialsServer(ctx, port, tunnelClient, log)
 }
 

cmd/ssh.go

@@ -39,10 +39,11 @@ type SSHCmd struct {
 	ForwardPorts        []string
 	ReverseForwardPorts []string
 
-	Stdio              bool
-	JumpContainer      bool
-	AgentForwarding    bool
-	GPGAgentForwarding bool
+	Stdio                     bool
+	JumpContainer             bool
+	AgentForwarding           bool
+	GPGAgentForwarding        bool
+	GitSSHSignatureForwarding bool
 
 	StartServices bool
 
@@ -472,6 +473,12 @@ func (cmd *SSHCmd) startProxyServices(
 		if gitCredentials {
 			command += " --configure-git-helper"
 		}
+
+		// check if we should enable git ssh commit signature support
+		if cmd.GitSSHSignatureForwarding || devPodConfig.ContextOption(config.ContextOptionGitSSHSignatureForwarding) == "true" {
+			command += " --configure-git-ssh-signature-helper"
+		}
+
 		if log.GetLevel() == logrus.DebugLevel {
 			command += " --debug"
 		}

pkg/config/context.go

@@ -3,6 +3,7 @@ package config
 const (
 	ContextOptionSSHAddPrivateKeys          = "SSH_ADD_PRIVATE_KEYS"
 	ContextOptionGPGAgentForwarding         = "GPG_AGENT_FORWARDING"
+	ContextOptionGitSSHSignatureForwarding  = "GIT_SSH_SIGNATURE_FORWARDING"
 	ContextOptionSSHInjectDockerCredentials = "SSH_INJECT_DOCKER_CREDENTIALS"
 	ContextOptionSSHInjectGitCredentials    = "SSH_INJECT_GIT_CREDENTIALS"
 	ContextOptionExitAfterTimeout           = "EXIT_AFTER_TIMEOUT"
@@ -33,6 +34,12 @@ var ContextOptions = []ContextOption{
 		Default:     "false",
 		Enum:        []string{"true", "false"},
 	},
+	{
+		Name:        ContextOptionGitSSHSignatureForwarding,
+		Description: "Specifies if DevPod should automatically detect ssh signature git setting and inject ssh signature helper",
+		Default:     "true",
+		Enum:        []string{"true", "false"},
+	},
 	{
 		Name:        ContextOptionSSHInjectDockerCredentials,
 		Description: "Specifies if DevPod should inject docker credentials into the workspace",

pkg/tunnel/services.go

@@ -112,6 +112,7 @@ func RunInContainer(
 		command := fmt.Sprintf("'%s' agent container credentials-server --user '%s'", agent.ContainerDevPodHelperLocation, user)
 		if configureGitCredentials {
 			command += " --configure-git-helper"
+			command += " --configure-git-ssh-signature-helper"
 		}
 		if configureDockerCredentials {
 			command += " --configure-docker-helper"