diff options
| author | Ethan Koenig <etk39@cornell.edu> | 2017-07-01 22:03:57 -0400 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-07-02 10:03:57 +0800 |
| commit | f99489d5c522663cfc14b9b65539966844f3ee6b (patch) | |
| tree | 5c0338b278df3fa156d2d45ef7058f492b67b4ac /routers | |
| parent | fea902adc8a6e94646e621a974258417f3d68914 (diff) | |
| download | gitea-f99489d5c522663cfc14b9b65539966844f3ee6b.tar.gz gitea-f99489d5c522663cfc14b9b65539966844f3ee6b.zip | |
Fix API for branches with slashes (#2096)
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/api/v1/api.go | 2 | ||||
| -rw-r--r-- | routers/api/v1/repo/branch.go | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 0e356b1f90..56bb3b0f3b 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -364,7 +364,7 @@ func RegisterRoutes(m *macaron.Macaron) { Post(bind(api.CreateForkOption{}), repo.CreateFork) m.Group("/branches", func() { m.Get("", repo.ListBranches) - m.Get("/:branchname", repo.GetBranch) + m.Get("/*", context.RepoRef(), repo.GetBranch) }) m.Group("/keys", func() { m.Combo("").Get(repo.ListDeployKeys). diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index 489fbe6b4e..aed630f558 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -15,7 +15,14 @@ import ( // GetBranch get a branch of a repository // see https://github.com/gogits/go-gogs-client/wiki/Repositories#get-branch func GetBranch(ctx *context.APIContext) { - branch, err := ctx.Repo.Repository.GetBranch(ctx.Params(":branchname")) + if ctx.Repo.TreePath != "" { + // if TreePath != "", then URL contained extra slashes + // (i.e. "master/subbranch" instead of "master"), so branch does + // not exist + ctx.Status(404) + return + } + branch, err := ctx.Repo.Repository.GetBranch(ctx.Repo.BranchName) if err != nil { if models.IsErrBranchNotExist(err) { ctx.Error(404, "GetBranch", err) |