Skip to content

Manage port in submodule refurl #11305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guillep2k merged 9 commits into from
May 7, 2020
Merged

Manage port in submodule refurl #11305

Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
09e4254
Manage port in submodule refurl
zeripath May 5, 2020
7ecc401
Merge branch 'master' into fix-11304-add-port
lafriks May 5, 2020
e372f4f
fix lint
zeripath May 5, 2020
ee85d13
Merge branch 'fix-11304-add-port' of github.com:zeripath/gitea into f…
zeripath May 5, 2020
055ee79
Merge branch 'master' into fix-11304-add-port
zeripath May 5, 2020
4e70d49
URLJoin is causes a cyclic dependency and possibly isn't what what we…
zeripath May 6, 2020
c2c1431
Protect against leading .. in scp syntax
zeripath May 6, 2020
4e78e11
Merge branch 'master' into fix-11304-add-port
zeripath May 6, 2020
4a7e9f5
Merge branch 'master' into fix-11304-add-port
zeripath May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions modules/git/submodule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import (
"path"
"regexp"
"strings"

"code.gitea.io/gitea/modules/util"
)

var scpSyntax = regexp.MustCompile(`^([a-zA-Z0-9_]+@)?([a-zA-Z0-9._-]+):(.*)$`)
Expand Down Expand Up @@ -73,7 +75,7 @@ func getRefURL(refURL, urlPrefix, repoFullName string) string {
}

if urlPrefixHostname == refHostname {
return prefixURL.Scheme + "://" + urlPrefixHostname + path.Join(prefixURL.Path, path.Clean(pth))
return util.URLJoin(urlPrefix, path.Clean(pth))
}
return "http://" + refHostname + pth
}
Expand All @@ -94,7 +96,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 util.URLJoin(urlPrefix, path.Clean(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
Expand Down