From 19626b93f8d04fd72cf8fc3abb6c53666b44537b Mon Sep 17 00:00:00 2001 From: zeripath Date: Thu, 7 May 2020 16:41:40 +0100 Subject: [PATCH] Manage port in submodule refurl (#11305) (#11323) * Manage port in submodule refurl Fix #11304 Signed-off-by: Andrew Thornton * fix lint Signed-off-by: Andrew Thornton * URLJoin is causes a cyclic dependency and possibly isn't what what we want anyway Signed-off-by: Andrew Thornton * Protect against leading .. in scp syntax Signed-off-by: Andrew Thornton Co-authored-by: Lauris BH Co-authored-by: Lauris BH --- modules/git/submodule.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/git/submodule.go b/modules/git/submodule.go index 2527eac81..222a5e4f8 100644 --- a/modules/git/submodule.go +++ b/modules/git/submodule.go @@ -52,10 +52,14 @@ func getRefURL(refURL, urlPrefix, repoFullName string) string { urlPrefixHostname = prefixURL.Host } + if strings.HasSuffix(urlPrefix, "/") { + urlPrefix = urlPrefix[:len(urlPrefix)-1] + } + // FIXME: Need to consider branch - which will require changes in modules/git/commit.go:GetSubModules // Relative url prefix check (according to git submodule documentation) if strings.HasPrefix(refURI, "./") || strings.HasPrefix(refURI, "../") { - return urlPrefix + path.Clean(path.Join(repoFullName, refURI)) + return urlPrefix + path.Clean(path.Join("/", repoFullName, refURI)) } if !strings.Contains(refURI, "://") { @@ -73,7 +77,7 @@ func getRefURL(refURL, urlPrefix, repoFullName string) string { } if urlPrefixHostname == refHostname { - return prefixURL.Scheme + "://" + urlPrefixHostname + path.Join(prefixURL.Path, path.Clean(pth)) + return urlPrefix + path.Clean(path.Join("/", pth)) } return "http://" + refHostname + pth } @@ -94,7 +98,7 @@ func getRefURL(refURL, urlPrefix, repoFullName string) string { for _, scheme := range supportedSchemes { if ref.Scheme == scheme { if urlPrefixHostname == refHostname { - return prefixURL.Scheme + "://" + prefixURL.Host + path.Join(prefixURL.Path, ref.Path) + return urlPrefix + path.Clean(path.Join("/", ref.Path)) } else if ref.Scheme == "http" || ref.Scheme == "https" { if len(ref.User.Username()) > 0 { return ref.Scheme + "://" + fmt.Sprintf("%v", ref.User) + "@" + ref.Host + ref.Path