vitalif
/
gogs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

router: fix 404 when repository name contains dot 

E.g. atomi.github.io
master
Unknwon 2017-02-20 18:05:34 -05:00
parent 934734a85a
commit 6002d72603
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/web.go
View File

@ -632,14 +632,17 @@ func runWeb(ctx *cli.Context) error {
}, ignSignIn, context.RepoAssignment(), context.RepoRef())
m.Group("/:username", func() {
m.Group("/:reponame", func() {
m.Get("", repo.Home)
m.Get("\\.git$", repo.Home)
m.Group("", func() {
m.Get("/:reponame", repo.Home)
}, ignSignIn, context.RepoAssignment(true), context.RepoRef())
m.Group("/:reponame", func() {
m.Head("/tasks/trigger", repo.TriggerTask)
m.Route("\\.git/*", "GET,POST", ignSignInAndCsrf, repo.HTTPContexter(), repo.HTTP)
})
// Use the regexp to match the repository name validation
m.Group("/:reponame([\\d\\w-_\\.]+\\.git$)", func() {
m.Get("", ignSignIn, context.RepoAssignment(true), context.RepoRef(), repo.Home)
m.Route("/*", "GET,POST", ignSignInAndCsrf, repo.HTTPContexter(), repo.HTTP)
})
})
// ***** END: Repository *****

2
gogs.go
View File

@ -16,7 +16,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
const APP_VER = "0.9.161.0220"
const APP_VER = "0.9.162.0220"
func init() {
setting.AppVer = APP_VER

12
modules/context/repo.go
View File

@ -146,18 +146,18 @@ func RepoAssignment(args ...bool) macaron.Handler {
err error
)
userName := ctx.Params(":username")
repoName := ctx.Params(":reponame")
ownerName := ctx.Params(":username")
repoName := strings.TrimSuffix(ctx.Params(":reponame"), ".git")
refName := ctx.Params(":branchname")
if len(refName) == 0 {
refName = ctx.Params(":path")
}
// Check if the user is the same as the repository owner
if ctx.IsSigned && ctx.User.LowerName == strings.ToLower(userName) {
if ctx.IsSigned && ctx.User.LowerName == strings.ToLower(ownerName) {
owner = ctx.User
} else {
owner, err = models.GetUserByName(userName)
owner, err = models.GetUserByName(ownerName)
if err != nil {
if models.IsErrUserNotExist(err) {
if ctx.Query("go-get") == "1" {
@ -230,9 +230,9 @@ func RepoAssignment(args ...bool) macaron.Handler {
ctx.Data["RepoName"] = ctx.Repo.Repository.Name
ctx.Data["IsBareRepo"] = ctx.Repo.Repository.IsBare
gitRepo, err := git.OpenRepository(models.RepoPath(userName, repoName))
gitRepo, err := git.OpenRepository(models.RepoPath(ownerName, repoName))
if err != nil {
ctx.Handle(500, "RepoAssignment Invalid repo "+models.RepoPath(userName, repoName), err)
ctx.Handle(500, "RepoAssignment Invalid repo "+models.RepoPath(ownerName, repoName), err)
return
}
ctx.Repo.GitRepo = gitRepo

2
templates/.VERSION
View File

@ -1 +1 @@
0.9.161.0220
0.9.162.0220