Kiu/Semaphore
Kiu/Semaphore
1
0
Fork 0
mirror of https://github.com/semaphoreui/semaphore.git synced 2024-11-23 20:35:24 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Mapping the username from key for SSH repo's.

Browse Source
This commit is contained in:
Walkablenormal 2023-04-24 22:26:31 +02:00
parent 864d8bd8aa
commit 0869eae34e
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/GoGitClient.go
View File

@ -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")
}
}