mirror of
https://gitee.com/gitea/gitea.git
synced 2024-12-02 11:47:49 +08:00
Fix go get (#14758)
* Fix go get * Fix default branch Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
parent
b56c19d819
commit
bd9361384a
@ -29,7 +29,6 @@ import (
|
|||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
"code.gitea.io/gitea/modules/templates"
|
"code.gitea.io/gitea/modules/templates"
|
||||||
"code.gitea.io/gitea/modules/translation"
|
"code.gitea.io/gitea/modules/translation"
|
||||||
"code.gitea.io/gitea/modules/util"
|
|
||||||
"code.gitea.io/gitea/modules/web/middleware"
|
"code.gitea.io/gitea/modules/web/middleware"
|
||||||
|
|
||||||
"gitea.com/go-chi/cache"
|
"gitea.com/go-chi/cache"
|
||||||
@ -613,63 +612,6 @@ func Contexter() func(next http.Handler) http.Handler {
|
|||||||
|
|
||||||
ctx.Flash = f
|
ctx.Flash = f
|
||||||
|
|
||||||
// Quick responses appropriate go-get meta with status 200
|
|
||||||
// regardless of if user have access to the repository,
|
|
||||||
// or the repository does not exist at all.
|
|
||||||
// This is particular a workaround for "go get" command which does not respect
|
|
||||||
// .netrc file.
|
|
||||||
if ctx.Query("go-get") == "1" {
|
|
||||||
ownerName := ctx.Params(":username")
|
|
||||||
repoName := ctx.Params(":reponame")
|
|
||||||
trimmedRepoName := strings.TrimSuffix(repoName, ".git")
|
|
||||||
|
|
||||||
if ownerName == "" || trimmedRepoName == "" {
|
|
||||||
_, _ = ctx.Write([]byte(`<!doctype html>
|
|
||||||
<html>
|
|
||||||
<body>
|
|
||||||
invalid import path
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
`))
|
|
||||||
ctx.Status(400)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
branchName := "master"
|
|
||||||
|
|
||||||
repo, err := models.GetRepositoryByOwnerAndName(ownerName, repoName)
|
|
||||||
if err == nil && len(repo.DefaultBranch) > 0 {
|
|
||||||
branchName = repo.DefaultBranch
|
|
||||||
}
|
|
||||||
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 "
|
|
||||||
}
|
|
||||||
ctx.Header().Set("Content-Type", "text/html")
|
|
||||||
ctx.Status(http.StatusOK)
|
|
||||||
_, _ = ctx.Write([]byte(com.Expand(`<!doctype html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta name="go-import" content="{GoGetImport} git {CloneLink}">
|
|
||||||
<meta name="go-source" content="{GoGetImport} _ {GoDocDirectory} {GoDocFile}">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
go get {Insecure}{GoGetImport}
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
`, map[string]string{
|
|
||||||
"GoGetImport": ComposeGoGetImport(ownerName, trimmedRepoName),
|
|
||||||
"CloneLink": models.ComposeHTTPSCloneURL(ownerName, repoName),
|
|
||||||
"GoDocDirectory": prefix + "{/dir}",
|
|
||||||
"GoDocFile": prefix + "{/dir}/{file}#L{line}",
|
|
||||||
"Insecure": insecure,
|
|
||||||
})))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// If request sends files, parse them here otherwise the Query() can't be parsed and the CsrfToken will be invalid.
|
// If request sends files, parse them here otherwise the Query() can't be parsed and the CsrfToken will be invalid.
|
||||||
if ctx.Req.Method == "POST" && strings.Contains(ctx.Req.Header.Get("Content-Type"), "multipart/form-data") {
|
if ctx.Req.Method == "POST" && strings.Contains(ctx.Req.Header.Get("Content-Type"), "multipart/form-data") {
|
||||||
if err := ctx.Req.ParseMultipartForm(setting.Attachment.MaxSize << 20); err != nil && !strings.Contains(err.Error(), "EOF") { // 32MB max size
|
if err := ctx.Req.ParseMultipartForm(setting.Attachment.MaxSize << 20); err != nil && !strings.Contains(err.Error(), "EOF") { // 32MB max size
|
||||||
|
@ -8,6 +8,7 @@ import (
|
|||||||
"encoding/gob"
|
"encoding/gob"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
"strings"
|
"strings"
|
||||||
@ -23,6 +24,7 @@ import (
|
|||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
"code.gitea.io/gitea/modules/storage"
|
"code.gitea.io/gitea/modules/storage"
|
||||||
"code.gitea.io/gitea/modules/templates"
|
"code.gitea.io/gitea/modules/templates"
|
||||||
|
"code.gitea.io/gitea/modules/util"
|
||||||
"code.gitea.io/gitea/modules/validation"
|
"code.gitea.io/gitea/modules/validation"
|
||||||
"code.gitea.io/gitea/modules/web"
|
"code.gitea.io/gitea/modules/web"
|
||||||
"code.gitea.io/gitea/routers"
|
"code.gitea.io/gitea/routers"
|
||||||
@ -47,6 +49,7 @@ import (
|
|||||||
"github.com/go-chi/chi/middleware"
|
"github.com/go-chi/chi/middleware"
|
||||||
"github.com/prometheus/client_golang/prometheus"
|
"github.com/prometheus/client_golang/prometheus"
|
||||||
"github.com/tstranex/u2f"
|
"github.com/tstranex/u2f"
|
||||||
|
"github.com/unknwon/com"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -216,6 +219,67 @@ func WebRoutes() *web.Route {
|
|||||||
return r
|
return r
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func goGet(ctx *context.Context) {
|
||||||
|
if ctx.Query("go-get") != "1" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Quick responses appropriate go-get meta with status 200
|
||||||
|
// regardless of if user have access to the repository,
|
||||||
|
// or the repository does not exist at all.
|
||||||
|
// This is particular a workaround for "go get" command which does not respect
|
||||||
|
// .netrc file.
|
||||||
|
|
||||||
|
ownerName := ctx.Params(":username")
|
||||||
|
repoName := ctx.Params(":reponame")
|
||||||
|
trimmedRepoName := strings.TrimSuffix(repoName, ".git")
|
||||||
|
|
||||||
|
if ownerName == "" || trimmedRepoName == "" {
|
||||||
|
_, _ = ctx.Write([]byte(`<!doctype html>
|
||||||
|
<html>
|
||||||
|
<body>
|
||||||
|
invalid import path
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
`))
|
||||||
|
ctx.Status(400)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
branchName := setting.Repository.DefaultBranch
|
||||||
|
|
||||||
|
repo, err := models.GetRepositoryByOwnerAndName(ownerName, repoName)
|
||||||
|
if err == nil && len(repo.DefaultBranch) > 0 {
|
||||||
|
branchName = repo.DefaultBranch
|
||||||
|
}
|
||||||
|
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 "
|
||||||
|
}
|
||||||
|
ctx.Header().Set("Content-Type", "text/html")
|
||||||
|
ctx.Status(http.StatusOK)
|
||||||
|
_, _ = ctx.Write([]byte(com.Expand(`<!doctype html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta name="go-import" content="{GoGetImport} git {CloneLink}">
|
||||||
|
<meta name="go-source" content="{GoGetImport} _ {GoDocDirectory} {GoDocFile}">
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
go get {Insecure}{GoGetImport}
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
`, map[string]string{
|
||||||
|
"GoGetImport": context.ComposeGoGetImport(ownerName, trimmedRepoName),
|
||||||
|
"CloneLink": models.ComposeHTTPSCloneURL(ownerName, repoName),
|
||||||
|
"GoDocDirectory": prefix + "{/dir}",
|
||||||
|
"GoDocFile": prefix + "{/dir}/{file}#L{line}",
|
||||||
|
"Insecure": insecure,
|
||||||
|
})))
|
||||||
|
}
|
||||||
|
|
||||||
// RegisterRoutes register routes
|
// RegisterRoutes register routes
|
||||||
func RegisterRoutes(m *web.Route) {
|
func RegisterRoutes(m *web.Route) {
|
||||||
reqSignIn := context.Toggle(&context.ToggleOptions{SignInRequired: true})
|
reqSignIn := context.Toggle(&context.ToggleOptions{SignInRequired: true})
|
||||||
@ -1004,7 +1068,7 @@ func RegisterRoutes(m *web.Route) {
|
|||||||
m.Group("/{username}", func() {
|
m.Group("/{username}", func() {
|
||||||
m.Group("/{reponame}", func() {
|
m.Group("/{reponame}", func() {
|
||||||
m.Get("", repo.SetEditorconfigIfExists, repo.Home)
|
m.Get("", repo.SetEditorconfigIfExists, repo.Home)
|
||||||
}, ignSignIn, context.RepoAssignment(), context.RepoRef(), context.UnitTypes())
|
}, goGet, ignSignIn, context.RepoAssignment(), context.RepoRef(), context.UnitTypes())
|
||||||
|
|
||||||
m.Group("/{reponame}", func() {
|
m.Group("/{reponame}", func() {
|
||||||
m.Group("/info/lfs", func() {
|
m.Group("/info/lfs", func() {
|
||||||
|
Loading…
Reference in New Issue
Block a user