mirror of
https://gitea.com/gitea/tea.git
synced 2025-10-11 16:35:26 +02:00
add test for matching logins (#820)
Reviewed-on: https://gitea.com/gitea/tea/pulls/820
This commit is contained in:
@@ -14,6 +14,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"code.gitea.io/tea/modules/config"
|
"code.gitea.io/tea/modules/config"
|
||||||
|
"code.gitea.io/tea/modules/debug"
|
||||||
"code.gitea.io/tea/modules/git"
|
"code.gitea.io/tea/modules/git"
|
||||||
"code.gitea.io/tea/modules/theme"
|
"code.gitea.io/tea/modules/theme"
|
||||||
"code.gitea.io/tea/modules/utils"
|
"code.gitea.io/tea/modules/utils"
|
||||||
@@ -95,6 +96,12 @@ func InitCommand(cmd *cli.Command) *TeaContext {
|
|||||||
remoteFlag = config.GetPreferences().FlagDefaults.Remote
|
remoteFlag = config.GetPreferences().FlagDefaults.Remote
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if repoPath == "" {
|
||||||
|
if repoPath, err = os.Getwd(); err != nil {
|
||||||
|
log.Fatal(err.Error())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// try to read local git repo & extract context: if repoFlag specifies a valid path, read repo in that dir,
|
// try to read local git repo & extract context: if repoFlag specifies a valid path, read repo in that dir,
|
||||||
// otherwise attempt PWD. if no repo is found, continue with default login
|
// otherwise attempt PWD. if no repo is found, continue with default login
|
||||||
if c.LocalRepo, c.Login, c.RepoSlug, err = contextFromLocalRepo(repoPath, remoteFlag); err != nil {
|
if c.LocalRepo, c.Login, c.RepoSlug, err = contextFromLocalRepo(repoPath, remoteFlag); err != nil {
|
||||||
@@ -168,6 +175,7 @@ func contextFromLocalRepo(repoPath, remoteValue string) (*git.TeaRepo, *config.L
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return repo, nil, "", err
|
return repo, nil, "", err
|
||||||
}
|
}
|
||||||
|
debug.Printf("Get git config %v of %s in repo %s", gitConfig, remoteValue, repoPath)
|
||||||
|
|
||||||
if len(gitConfig.Remotes) == 0 {
|
if len(gitConfig.Remotes) == 0 {
|
||||||
return repo, nil, "", errNotAGiteaRepo
|
return repo, nil, "", errNotAGiteaRepo
|
||||||
@@ -206,37 +214,69 @@ func contextFromLocalRepo(repoPath, remoteValue string) (*git.TeaRepo, *config.L
|
|||||||
|
|
||||||
remoteConfig, ok := gitConfig.Remotes[remoteValue]
|
remoteConfig, ok := gitConfig.Remotes[remoteValue]
|
||||||
if !ok || remoteConfig == nil {
|
if !ok || remoteConfig == nil {
|
||||||
return repo, nil, "", fmt.Errorf("Remote '%s' not found in this Git repository", remoteValue)
|
return repo, nil, "", fmt.Errorf("remote '%s' not found in this Git repository", remoteValue)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
debug.Printf("Get remote configurations %v of %s in repo %s", remoteConfig, remoteValue, repoPath)
|
||||||
|
|
||||||
logins, err := config.GetLogins()
|
logins, err := config.GetLogins()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return repo, nil, "", err
|
return repo, nil, "", err
|
||||||
}
|
}
|
||||||
for _, l := range logins {
|
for _, u := range remoteConfig.URLs {
|
||||||
sshHost := l.GetSSHHost()
|
if l, p, err := MatchLogins(u, logins); err == nil {
|
||||||
for _, u := range remoteConfig.URLs {
|
return repo, l, p, nil
|
||||||
p, err := git.ParseURL(u)
|
|
||||||
if err != nil {
|
|
||||||
return repo, nil, "", fmt.Errorf("Git remote URL parse failed: %s", err.Error())
|
|
||||||
}
|
|
||||||
if strings.EqualFold(p.Scheme, "http") || strings.EqualFold(p.Scheme, "https") {
|
|
||||||
if strings.HasPrefix(u, l.URL) {
|
|
||||||
ps := strings.Split(p.Path, "/")
|
|
||||||
path := strings.Join(ps[len(ps)-2:], "/")
|
|
||||||
return repo, &l, strings.TrimSuffix(path, ".git"), nil
|
|
||||||
}
|
|
||||||
} else if strings.EqualFold(p.Scheme, "ssh") {
|
|
||||||
if sshHost == p.Host || sshHost == p.Hostname() {
|
|
||||||
return repo, &l, strings.TrimLeft(p.Path, "/"), nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return repo, nil, "", errNotAGiteaRepo
|
return repo, nil, "", errNotAGiteaRepo
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MatchLogins matches the given remoteURL against the provided logins and returns
|
||||||
|
// the first matching login
|
||||||
|
// remoteURL could be like:
|
||||||
|
//
|
||||||
|
// https://gitea.com/owner/repo.git
|
||||||
|
// http://gitea.com/owner/repo.git
|
||||||
|
// ssh://gitea.com/owner/repo.git
|
||||||
|
// git@gitea.com:owner/repo.git
|
||||||
|
func MatchLogins(remoteURL string, logins []config.Login) (*config.Login, string, error) {
|
||||||
|
for _, l := range logins {
|
||||||
|
debug.Printf("Matching remote URL '%s' against %v login", remoteURL, l)
|
||||||
|
sshHost := l.GetSSHHost()
|
||||||
|
atIdx := strings.Index(remoteURL, "@")
|
||||||
|
colonIdx := strings.Index(remoteURL, ":")
|
||||||
|
if atIdx > 0 && colonIdx > atIdx {
|
||||||
|
domain := remoteURL[atIdx+1 : colonIdx]
|
||||||
|
if domain == sshHost {
|
||||||
|
return &l, strings.TrimSuffix(remoteURL[colonIdx+1:], ".git"), nil
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
p, err := git.ParseURL(remoteURL)
|
||||||
|
if err != nil {
|
||||||
|
return nil, "", fmt.Errorf("git remote URL parse failed: %s", err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
switch {
|
||||||
|
case strings.EqualFold(p.Scheme, "http") || strings.EqualFold(p.Scheme, "https"):
|
||||||
|
if strings.HasPrefix(remoteURL, l.URL) {
|
||||||
|
ps := strings.Split(p.Path, "/")
|
||||||
|
path := strings.Join(ps[len(ps)-2:], "/")
|
||||||
|
return &l, strings.TrimSuffix(path, ".git"), nil
|
||||||
|
}
|
||||||
|
case strings.EqualFold(p.Scheme, "ssh"):
|
||||||
|
if sshHost == p.Host || sshHost == p.Hostname() {
|
||||||
|
return &l, strings.TrimLeft(p.Path, "/"), nil
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
// unknown scheme
|
||||||
|
return nil, "", fmt.Errorf("git remote URL parse failed: %s", "unknown scheme "+p.Scheme)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil, "", errNotAGiteaRepo
|
||||||
|
}
|
||||||
|
|
||||||
// GetLoginByEnvVar returns a login based on environment variables, or nil if no login can be created
|
// GetLoginByEnvVar returns a login based on environment variables, or nil if no login can be created
|
||||||
func GetLoginByEnvVar() *config.Login {
|
func GetLoginByEnvVar() *config.Login {
|
||||||
var token string
|
var token string
|
||||||
|
47
modules/context/context_test.go
Normal file
47
modules/context/context_test.go
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
// Copyright 2025 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package context
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"code.gitea.io/tea/modules/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Test_MatchLogins(t *testing.T) {
|
||||||
|
kases := []struct {
|
||||||
|
remoteURL string
|
||||||
|
logins []config.Login
|
||||||
|
matchedLoginName string
|
||||||
|
expectedRepoPath string
|
||||||
|
hasError bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
remoteURL: "https://gitea.com/owner/repo.git",
|
||||||
|
logins: []config.Login{{Name: "gitea.com", URL: "https://gitea.com"}},
|
||||||
|
matchedLoginName: "gitea.com",
|
||||||
|
expectedRepoPath: "owner/repo",
|
||||||
|
hasError: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
remoteURL: "git@gitea.com:owner/repo.git",
|
||||||
|
logins: []config.Login{{Name: "gitea.com", URL: "https://gitea.com"}},
|
||||||
|
matchedLoginName: "gitea.com",
|
||||||
|
expectedRepoPath: "owner/repo",
|
||||||
|
hasError: false,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, kase := range kases {
|
||||||
|
t.Run(kase.remoteURL, func(t *testing.T) {
|
||||||
|
_, repoPath, err := MatchLogins(kase.remoteURL, kase.logins)
|
||||||
|
if (err != nil) != kase.hasError {
|
||||||
|
t.Errorf("Expected error: %v, got: %v", kase.hasError, err)
|
||||||
|
}
|
||||||
|
if repoPath != kase.expectedRepoPath {
|
||||||
|
t.Errorf("Expected repo path: %s, got: %s", kase.expectedRepoPath, repoPath)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user