USEFULL/gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2025-05-31 11:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

pkg/context: use host address and apply insecure flag for go-get=1 when needed (#5305)

Browse Source
This commit is contained in:
Unknwon 2018-12-03 13:36:11 -05:00
parent a7e8187a0d
commit 6690023555
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/context/context.go
View File

@ -263,13 +263,11 @@ func Contexter() macaron.Handler {
branchName = repo.DefaultBranch 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) 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> c.PlainText(http.StatusOK, []byte(com.Expand(`<!doctype html>
<html> <html>
<head> <head>
@ -277,14 +275,15 @@ 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 {InsecureFlag}{GoGetImport}
</body> </body>
</html> </html>
`, map[string]string{ `, 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), "CloneLink": models.ComposeHTTPSCloneURL(ownerName, repoName),
"GoDocDirectory": prefix + "{/dir}", "GoDocDirectory": prefix + "{/dir}",
"GoDocFile": prefix + "{/dir}/{file}#L{line}", "GoDocFile": prefix + "{/dir}/{file}#L{line}",
"InsecureFlag": insecureFlag,
}))) })))
return return
} }

2
pkg/setting/setting.go
View File

@ -61,6 +61,7 @@ var (
AppSubURLDepth int // Number of slashes AppSubURLDepth int // Number of slashes
AppPath string AppPath string
AppDataPath string AppDataPath string
HostAddress string // AppURL without protocol and slashes
// Server settings // Server settings
Protocol Scheme Protocol Scheme
@ -463,6 +464,7 @@ func NewContext() {
// This value is empty if site does not have sub-url. // This value is empty if site does not have sub-url.
AppSubURL = strings.TrimSuffix(url.Path, "/") AppSubURL = strings.TrimSuffix(url.Path, "/")
AppSubURLDepth = strings.Count(AppSubURL, "/") AppSubURLDepth = strings.Count(AppSubURL, "/")
HostAddress = url.Host
Protocol = SCHEME_HTTP Protocol = SCHEME_HTTP
if sec.Key("PROTOCOL").String() == "https" { if sec.Key("PROTOCOL").String() == "https" {