Fix go-get URL generation (#5905) (#5907)

lafriks · web-flow · commit 3f802a284644 · 2019-01-30T23:29:44.000+02:00
diff --git a/models/repo.go b/models/repo.go
@@ -11,6 +11,7 @@ import (
 	"fmt"
 	"html/template"
 	"io/ioutil"
+	"net/url"
 	"os"
 	"os/exec"
 	"path"
@@ -824,7 +825,7 @@ type CloneLink struct {
 
 // ComposeHTTPSCloneURL returns HTTPS clone URL based on given owner and repository name.
 func ComposeHTTPSCloneURL(owner, repo string) string {
-	return fmt.Sprintf("%s%s/%s.git", setting.AppURL, owner, repo)
+	return fmt.Sprintf("%s%s/%s.git", setting.AppURL, url.QueryEscape(owner), url.QueryEscape(repo))
 }
 
 func (repo *Repository) cloneLink(e Engine, isUncyclo bool) *CloneLink {
diff --git a/modules/context/context.go b/modules/context/context.go
@@ -209,7 +209,7 @@ func Contexter() macaron.Handler {
 			if err == nil && len(repo.DefaultBranch) > 0 {
 				branchName = repo.DefaultBranch
 			}
-			prefix := setting.AppURL + path.Join(ownerName, repoName, "src", "branch", branchName)
+			prefix := setting.AppURL + path.Join(url.QueryEscape(ownerName), url.QueryEscape(repoName), "src", "branch", branchName)
 			c.Header().Set("Content-Type", "text/html")
 			c.WriteHeader(http.StatusOK)
 			c.Write([]byte(com.Expand(`<!doctype html>
diff --git a/modules/context/repo.go b/modules/context/repo.go
@@ -8,6 +8,7 @@ package context
 import (
 	"fmt"
 	"io/ioutil"
+	"net/url"
 	"path"
 	"strings"
 
@@ -162,7 +163,7 @@ func RetrieveBaseRepo(ctx *Context, repo *models.Repository) {
 
 // ComposeGoGetImport returns go-get-import meta content.
 func ComposeGoGetImport(owner, repo string) string {
-	return path.Join(setting.Domain, setting.AppSubURL, owner, repo)
+	return path.Join(setting.Domain, setting.AppSubURL, url.QueryEscape(owner), url.QueryEscape(repo))
 }
 
 // EarlyResponseForGoGetMeta responses appropriate go-get meta with status 200

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ func Contexter() macaron.Handler {`
`209`	`209`	`if err == nil && len(repo.DefaultBranch) > 0 {`
`210`	`210`	`branchName = repo.DefaultBranch`
`211`	`211`	`}`
`212`		`- prefix := setting.AppURL + path.Join(ownerName, repoName, "src", "branch", branchName)`
	`212`	`+ prefix := setting.AppURL + path.Join(url.QueryEscape(ownerName), url.QueryEscape(repoName), "src", "branch", branchName)`
`213`	`213`	`c.Header().Set("Content-Type", "text/html")`
`214`	`214`	`c.WriteHeader(http.StatusOK)`
`215`	`215`	c.Write([]byte(com.Expand(`<!doctype html>