gitea-mirror/tea
1
0
Fork 0
mirror of https://gitea.com/gitea/tea.git synced 2024-06-03 10:11:22 +05:30
Code Issues Packages Projects Releases Wiki Activity

make SSHHOST include port, like a URL's host

Browse source
This commit is contained in:
Grady Wong 2023-05-07 18:51:46 +08:00
parent 16f3430174
commit ee27407835
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/config/login.go
View file

@ -228,5 +228,5 @@ func (l *Login) GetSSHHost() string {
return ""
}
return u.Hostname()
return u.Host
}

2
modules/context/context.go
View file

@ -223,7 +223,7 @@ func contextFromLocalRepo(repoPath, remoteValue string) (*git.TeaRepo, *config.L
return repo, &l, strings.TrimSuffix(path, ".git"), nil
}
} else if strings.EqualFold(p.Scheme, "ssh") {
if sshHost == p.Hostname() {
if sshHost == p.Host {
return repo, &l, strings.TrimLeft(p.Path, "/"), nil
}
}

4
modules/task/login_create.go
View file

@ -90,8 +90,8 @@ func CreateLogin(name, token, user, passwd, sshKey, giteaURL, sshCertPrincipal,
}
// we do not have a method to get SSH config from api,
// so we just use the hostname
login.SSHHost = serverURL.Hostname()
// so we just use the host
login.SSHHost = serverURL.Host
if len(sshKey) == 0 {
login.SSHKey, err = findSSHKey(client)