Browse Source
Handle insecure and ports in go get (#7041)
* Handle insecure and ports in go get * Fix IsExternalURL for non-standard portstags/v1.21.12.1
zeripath
GitHub
6 years ago
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 4 deletions
Unified View
Diff Options
-
+9 -1modules/context/context.go
-
+4 -1modules/context/repo.go
-
+2 -1modules/util/url.go
-
+1 -1modules/util/util_test.go
+ 9
- 1
modules/context/context.go
View File
| @@ -257,6 +257,13 @@ func Contexter() macaron.Handler { | |||||
| branchName = repo.DefaultBranch | branchName = repo.DefaultBranch | ||||
| } | } | ||||
| prefix := setting.AppURL + path.Join(url.PathEscape(ownerName), url.PathEscape(repoName), "src", "branch", util.PathEscapeSegments(branchName)) | prefix := setting.AppURL + path.Join(url.PathEscape(ownerName), url.PathEscape(repoName), "src", "branch", util.PathEscapeSegments(branchName)) | ||||
| appURL, _ := url.Parse(setting.AppURL) | |||||
| insecure := "" | |||||
| if appURL.Scheme == string(setting.HTTP) { | |||||
| insecure = "--insecure " | |||||
| } | |||||
| c.Header().Set("Content-Type", "text/html") | c.Header().Set("Content-Type", "text/html") | ||||
| c.WriteHeader(http.StatusOK) | c.WriteHeader(http.StatusOK) | ||||
| c.Write([]byte(com.Expand(`<!doctype html> | c.Write([]byte(com.Expand(`<!doctype html> | ||||
| @@ -266,7 +273,7 @@ func Contexter() macaron.Handler { | |||||
| <meta name="go-source" content="{GoGetImport} _ {GoDocDirectory} {GoDocFile}"> | <meta name="go-source" content="{GoGetImport} _ {GoDocDirectory} {GoDocFile}"> | ||||
| </head> | </head> | ||||
| <body> | <body> | ||||
| go get {GoGetImport} | |||||
| go get {Insecure}{GoGetImport} | |||||
| </body> | </body> | ||||
| </html> | </html> | ||||
| `, map[string]string{ | `, map[string]string{ | ||||
| @@ -274,6 +281,7 @@ func Contexter() macaron.Handler { | |||||
| "CloneLink": models.ComposeHTTPSCloneURL(ownerName, repoName), | "CloneLink": models.ComposeHTTPSCloneURL(ownerName, repoName), | ||||
| "GoDocDirectory": prefix + "{/dir}", | "GoDocDirectory": prefix + "{/dir}", | ||||
| "GoDocFile": prefix + "{/dir}/{file}#L{line}", | "GoDocFile": prefix + "{/dir}/{file}#L{line}", | ||||
| "Insecure": insecure, | |||||
| }))) | }))) | ||||
| return | return | ||||
| } | } | ||||
+ 4
- 1
modules/context/repo.go
View File
| @@ -188,7 +188,10 @@ func RetrieveBaseRepo(ctx *Context, repo *models.Repository) { | |||||
| // ComposeGoGetImport returns go-get-import meta content. | // ComposeGoGetImport returns go-get-import meta content. | ||||
| func ComposeGoGetImport(owner, repo string) string { | func ComposeGoGetImport(owner, repo string) string { | ||||
| return path.Join(setting.Domain, setting.AppSubURL, url.PathEscape(owner), url.PathEscape(repo)) | |||||
| /// setting.AppUrl is guaranteed to be parse as url | |||||
| appURL, _ := url.Parse(setting.AppURL) | |||||
| return path.Join(appURL.Host, setting.AppSubURL, url.PathEscape(owner), url.PathEscape(repo)) | |||||
| } | } | ||||
| // EarlyResponseForGoGetMeta responses appropriate go-get meta with status 200 | // EarlyResponseForGoGetMeta responses appropriate go-get meta with status 200 | ||||
+ 2
- 1
modules/util/url.go
View File
| @@ -52,7 +52,8 @@ func IsExternalURL(rawURL string) bool { | |||||
| if err != nil { | if err != nil { | ||||
| return true | return true | ||||
| } | } | ||||
| if len(parsed.Host) != 0 && strings.Replace(parsed.Host, "www.", "", 1) != strings.Replace(setting.Domain, "www.", "", 1) { | |||||
| appURL, _ := url.Parse(setting.AppURL) | |||||
| if len(parsed.Host) != 0 && strings.Replace(parsed.Host, "www.", "", 1) != strings.Replace(appURL.Host, "www.", "", 1) { | |||||
| return true | return true | ||||
| } | } | ||||
| return false | return false | ||||
+ 1
- 1
modules/util/util_test.go
View File
| @@ -46,7 +46,7 @@ func TestURLJoin(t *testing.T) { | |||||
| } | } | ||||
| func TestIsExternalURL(t *testing.T) { | func TestIsExternalURL(t *testing.T) { | ||||
| setting.Domain = "try.gitea.io" | |||||
| setting.AppURL = "https://try.gitea.io" | |||||
| type test struct { | type test struct { | ||||
| Expected bool | Expected bool | ||||
| RawURL string | RawURL string | ||||