Base 64 encode and decode signing key

Author: bkneis

cmd/agent/container/credentials_server.go

@@ -3,6 +3,7 @@ package container
 import (
 	"bytes"
 	"context"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"net"
@@ -147,7 +148,11 @@ func (cmd *CredentialsServerCmd) Run(ctx context.Context, port int, runnerPort i
 
 	// configure git ssh signature helper
 	if cmd.GitUserSigningKey != "" {
-		err = gitsshsigning.ConfigureHelper(cmd.User, cmd.GitUserSigningKey, log)
+		decodedKey, err := base64.StdEncoding.DecodeString(cmd.GitUserSigningKey)
+		if err != nil {
+			return fmt.Errorf("decode git ssh signature key: %w", err)
+		}
+		err = gitsshsigning.ConfigureHelper(cmd.User, string(decodedKey), log)
 		if err != nil {
 			return fmt.Errorf("configure git ssh signature helper: %w", err)
 		}

pkg/tunnel/services.go

@@ -3,6 +3,7 @@ package tunnel
 import (
 	"bytes"
 	"context"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"math"
@@ -121,7 +122,8 @@ func RunInContainer(
 		if configureGitSSHSignatureHelper {
 			format, userSigningKey, err := gitsshsigning.ExtractGitConfiguration()
 			if err == nil && format == gitsshsigning.GPGFormatSSH && userSigningKey != "" {
-				command += fmt.Sprintf(" --git-user-signing-key %s", userSigningKey)
+				encodedKey := base64.StdEncoding.EncodeToString([]byte(userSigningKey))
+				command += fmt.Sprintf(" --git-user-signing-key %s", encodedKey)
 			}
 		}
 		if configureDockerCredentials {