diff options
| author | Unknwon <u@gogs.io> | 2018-12-03 13:36:11 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2018-12-03 13:36:11 -0500 |
| commit | 6690023555e033ea25adb1f5bbcfac85d3ac9a25 (patch) | |
| tree | 3c70feed82826852d7d91099f898ca1804843f7c /pkg | |
| parent | a7e8187a0d52cb45468dec76f96a087d63c27da9 (diff) | |
pkg/context: use host address and apply insecure flag for go-get=1 when needed (#5305)
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/context/context.go | 15 | ||||
| -rw-r--r-- | pkg/setting/setting.go | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/pkg/context/context.go b/pkg/context/context.go index 08e3b6ea..85f49cc6 100644 --- a/pkg/context/context.go +++ b/pkg/context/context.go @@ -263,13 +263,11 @@ func Contexter() macaron.Handler { branchName = repo.DefaultBranch } - // Non-80 port needs to match port number in import path as well - host := setting.Domain - if setting.HTTPPort != "80" { - host += ":" + setting.HTTPPort - } - prefix := setting.AppURL + path.Join(ownerName, repoName, "src", branchName) + insecureFlag := "" + if !strings.HasPrefix(setting.AppURL, "https://") { + insecureFlag = "--insecure " + } c.PlainText(http.StatusOK, []byte(com.Expand(`<!doctype html> <html> <head> @@ -277,14 +275,15 @@ func Contexter() macaron.Handler { <meta name="go-source" content="{GoGetImport} _ {GoDocDirectory} {GoDocFile}"> </head> <body> - go get {GoGetImport} + go get {InsecureFlag}{GoGetImport} </body> </html> `, map[string]string{ - "GoGetImport": path.Join(host, setting.AppSubURL, repo.FullName()), + "GoGetImport": path.Join(setting.HostAddress, setting.AppSubURL, repo.FullName()), "CloneLink": models.ComposeHTTPSCloneURL(ownerName, repoName), "GoDocDirectory": prefix + "{/dir}", "GoDocFile": prefix + "{/dir}/{file}#L{line}", + "InsecureFlag": insecureFlag, }))) return } diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 8191e4c8..b65de982 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -61,6 +61,7 @@ var ( AppSubURLDepth int // Number of slashes AppPath string AppDataPath string + HostAddress string // AppURL without protocol and slashes // Server settings Protocol Scheme @@ -463,6 +464,7 @@ func NewContext() { // This value is empty if site does not have sub-url. AppSubURL = strings.TrimSuffix(url.Path, "/") AppSubURLDepth = strings.Count(AppSubURL, "/") + HostAddress = url.Host Protocol = SCHEME_HTTP if sec.Key("PROTOCOL").String() == "https" { |