From 0869eae34e8ff7cab18225dac3bc24044e2bc409 Mon Sep 17 00:00:00 2001
From: Walkablenormal <rubenvankomen@gmail.com>
Date: Mon, 24 Apr 2023 22:26:31 +0200
Subject: [PATCH] Mapping the username from key for SSH repo's.

---
 lib/GoGitClient.go | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/lib/GoGitClient.go b/lib/GoGitClient.go
index 661d7175..f8de3c14 100644
--- a/lib/GoGitClient.go
+++ b/lib/GoGitClient.go
@@ -29,27 +29,32 @@ func (t ProgressWrapper) Write(p []byte) (n int, err error) {
 
 func getAuthMethod(r GitRepository) (transport.AuthMethod, error) {
 	if r.Repository.SSHKey.Type == db.AccessKeySSH {
-		var sshKeyBuff = r.Repository.SSHKey.SshKey.PrivateKey
+			var sshKeyBuff = r.Repository.SSHKey.SshKey.PrivateKey
 
-		publicKey, sshErr := ssh.NewPublicKeys("git", []byte(sshKeyBuff), r.Repository.SSHKey.SshKey.Passphrase)
-		if sshErr != nil {
-			r.Logger.Log("Unable to creating ssh auth method")
-			return nil, sshErr
-		}
-		publicKey.HostKeyCallback = ssh2.InsecureIgnoreHostKey()
+			if r.Repository.SSHKey.SshKey.Login == "" {
+					r.Repository.SSHKey.SshKey.Login = "git"
+			}
 
-		return publicKey, sshErr
+			publicKey, sshErr := ssh.NewPublicKeys(r.Repository.SSHKey.SshKey.Login, []byte(sshKeyBuff), r.Repository.SSHKey.SshKey.Passphrase)
+
+			if sshErr != nil {
+					r.Logger.Log("Unable to creating ssh auth method")
+					return nil, sshErr
+			}
+			publicKey.HostKeyCallback = ssh2.InsecureIgnoreHostKey()
+
+			return publicKey, sshErr
 	} else if r.Repository.SSHKey.Type == db.AccessKeyLoginPassword {
-		password := &http.BasicAuth{
-			Username: r.Repository.SSHKey.LoginPassword.Login,
-			Password: r.Repository.SSHKey.LoginPassword.Password,
-		}
+			password := &http.BasicAuth{
+					Username: r.Repository.SSHKey.LoginPassword.Login,
+					Password: r.Repository.SSHKey.LoginPassword.Password,
+			}
 
-		return password, nil
+			return password, nil
 	} else if r.Repository.SSHKey.Type == db.AccessKeyNone {
-		return nil, nil
+			return nil, nil
 	} else {
-		return nil, errors.New("Unsupported auth method")
+			return nil, errors.New("Unsupported auth method")
 	}
 }