pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Manage port in submodule refurl (#11305)

Browse source 
* Manage port in submodule refurl

Fix #11304

Signed-off-by: Andrew Thornton <art27@cantab.net>

* fix lint

Signed-off-by: Andrew Thornton <art27@cantab.net>

* URLJoin is causes a cyclic dependency and possibly isn't what what we want anyway

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Protect against leading .. in scp syntax

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
zeripath 2020-05-07 15:25:52 +01:00 committed by GitHub
parent 507d0ec57a
commit 71e73db2ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/git/submodule.go
View file

@ -52,10 +52,14 @@ func getRefURL(refURL, urlPrefix, repoFullName string) string {
urlPrefixHostname = prefixURL.Host 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 // FIXME: Need to consider branch - which will require changes in modules/git/commit.go:GetSubModules
// Relative url prefix check (according to git submodule documentation) // Relative url prefix check (according to git submodule documentation)
if strings.HasPrefix(refURI, "./") || strings.HasPrefix(refURI, "../") { 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, "://") { if !strings.Contains(refURI, "://") {
@ -73,7 +77,7 @@ func getRefURL(refURL, urlPrefix, repoFullName string) string {
} }
if urlPrefixHostname == refHostname { 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 return "http://" + refHostname + pth
} }
@ -94,7 +98,7 @@ func getRefURL(refURL, urlPrefix, repoFullName string) string {
for _, scheme := range supportedSchemes { for _, scheme := range supportedSchemes {
if ref.Scheme == scheme { if ref.Scheme == scheme {
if urlPrefixHostname == refHostname { 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" { } else if ref.Scheme == "http" || ref.Scheme == "https" {
if len(ref.User.Username()) > 0 { if len(ref.User.Username()) > 0 {
return ref.Scheme + "://" + fmt.Sprintf("%v", ref.User) + "@" + ref.Host + ref.Path return ref.Scheme + "://" + fmt.Sprintf("%v", ref.User) + "@" + ref.Host + ref.Path