From 0bf41c2d5042b4d91259321876c61fb060f228e5 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 10 Nov 2018 19:45:31 +0800 Subject: [PATCH 01/31] fix units permission problems --- models/repo.go | 10 ++++- modules/context/permission.go | 59 ++++++++++++++++++++++++++++ modules/context/repo.go | 53 +++++++++---------------- routers/api/v1/api.go | 24 +++++------ routers/api/v1/repo/collaborators.go | 8 ++-- routers/api/v1/repo/file.go | 2 +- routers/api/v1/repo/issue.go | 15 ++++--- routers/api/v1/repo/issue_label.go | 40 +++++++++---------- routers/api/v1/repo/label.go | 6 +-- routers/api/v1/repo/pull.go | 6 +-- routers/api/v1/repo/repo.go | 2 +- routers/repo/branch.go | 4 +- routers/repo/issue.go | 14 +++---- routers/repo/release.go | 5 ++- routers/repo/view.go | 6 +-- routers/repo/wiki.go | 2 + routers/routes/routes.go | 39 ++++++++++++------ templates/repo/release/list.tmpl | 4 +- templates/repo/wiki/pages.tmpl | 2 +- templates/repo/wiki/start.tmpl | 2 +- templates/repo/wiki/view.tmpl | 2 +- 21 files changed, 186 insertions(+), 119 deletions(-) create mode 100644 modules/context/permission.go diff --git a/models/repo.go b/models/repo.go index b7be50e9d17a..24c9051e0127 100644 --- a/models/repo.go +++ b/models/repo.go @@ -191,8 +191,9 @@ type Repository struct { IsMirror bool `xorm:"INDEX"` *Mirror `xorm:"-"` - ExternalMetas map[string]string `xorm:"-"` - Units []*RepoUnit `xorm:"-"` + ExternalMetas map[string]string `xorm:"-"` + Units []*RepoUnit `xorm:"-"` + UnitsMode map[UnitType]AccessMode `xorm:"-"` IsFork bool `xorm:"INDEX NOT NULL DEFAULT false"` ForkID int64 `xorm:"INDEX"` @@ -369,11 +370,16 @@ func (repo *Repository) getUnitsByUserID(e Engine, userID int64, isAdmin bool) ( return err } + repo.UnitsMode = make(map[UnitType]AccessMode) // unique var newRepoUnits = make([]*RepoUnit, 0, len(repo.Units)) for _, u := range repo.Units { for _, team := range teams { if team.unitEnabled(e, u.Type) { + m := repo.UnitsMode[u.Type] + if m < team.Authorize { + repo.UnitsMode[u.Type] = m + } newRepoUnits = append(newRepoUnits, u) break } diff --git a/modules/context/permission.go b/modules/context/permission.go new file mode 100644 index 000000000000..967cffc488b5 --- /dev/null +++ b/modules/context/permission.go @@ -0,0 +1,59 @@ +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package context + +import "code.gitea.io/gitea/models" + +// Permission contains all the permissions related variables to a repository +type Permission struct { + AccessMode models.AccessMode + Units []*models.RepoUnit + UnitsMode map[models.UnitType]models.AccessMode +} + +// IsOwner returns true if current user is the owner of repository. +func (p *Permission) IsOwner() bool { + return p.AccessMode >= models.AccessModeOwner +} + +// IsAdmin returns true if current user has admin or higher access of repository. +func (p *Permission) IsAdmin() bool { + return p.AccessMode >= models.AccessModeAdmin +} + +// HasAccess returns true if the current user has at least read access to any unit of this repository +func (p *Permission) HasAccess() bool { + if p.UnitsMode == nil { + return p.AccessMode >= models.AccessModeRead + } + return len(p.UnitsMode) > 0 +} + +// UnitAccessMode returns current user accessmode to the specify unit of the repository +func (p *Permission) UnitAccessMode(unitType models.UnitType) models.AccessMode { + if p.UnitsMode == nil { + return p.AccessMode + } + return p.UnitsMode[unitType] +} + +// CanAccess returns true if user has read access to the unit of the repository +func (p *Permission) CanAccess(unitType models.UnitType) bool { + return p.UnitAccessMode(unitType) >= models.AccessModeRead +} + +// CanWrite returns true if user could write to this unit +func (p *Permission) CanWrite(unitType models.UnitType) bool { + return p.UnitAccessMode(unitType) >= models.AccessModeWrite +} + +// CanWriteIssuesOrPulls returns true if isPull is true and user could write to pull requests and +// returns true if isPull is false and user could write to issues +func (p *Permission) CanWriteIssuesOrPulls(isPull bool) bool { + if isPull { + return p.CanWrite(models.UnitTypePullRequests) + } + return p.CanWrite(models.UnitTypeIssues) +} diff --git a/modules/context/repo.go b/modules/context/repo.go index be08bc4c77f9..8f1d381f9cb0 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -32,7 +32,7 @@ type PullRequest struct { // Repository contains information to operate a repository type Repository struct { - AccessMode models.AccessMode + Permission IsWatching bool IsViewBranch bool IsViewTag bool @@ -54,34 +54,14 @@ type Repository struct { PullRequest *PullRequest } -// IsOwner returns true if current user is the owner of repository. -func (r *Repository) IsOwner() bool { - return r.AccessMode >= models.AccessModeOwner -} - -// IsAdmin returns true if current user has admin or higher access of repository. -func (r *Repository) IsAdmin() bool { - return r.AccessMode >= models.AccessModeAdmin -} - -// IsWriter returns true if current user has write or higher access of repository. -func (r *Repository) IsWriter() bool { - return r.AccessMode >= models.AccessModeWrite -} - -// HasAccess returns true if the current user has at least read access for this repository -func (r *Repository) HasAccess() bool { - return r.AccessMode >= models.AccessModeRead -} - // CanEnableEditor returns true if repository is editable and user has proper access level. func (r *Repository) CanEnableEditor() bool { - return r.Repository.CanEnableEditor() && r.IsViewBranch && r.IsWriter() + return r.Permission.CanWrite(models.UnitTypeCode) && r.Repository.CanEnableEditor() && r.IsViewBranch } // CanCreateBranch returns true if repository is editable and user has proper access level. func (r *Repository) CanCreateBranch() bool { - return r.Repository.CanCreateBranch() && r.IsWriter() + return r.Permission.CanWrite(models.UnitTypeCode) && r.Repository.CanCreateBranch() } // CanCommitToBranch returns true if repository is editable and user has proper access level @@ -101,12 +81,12 @@ func (r *Repository) CanUseTimetracker(issue *models.Issue, user *models.User) b // 2. Is the user a contributor, admin, poster or assignee and do the repository policies require this? isAssigned, _ := models.IsUserAssignedToIssue(issue, user) return r.Repository.IsTimetrackerEnabled() && (!r.Repository.AllowOnlyContributorsToTrackTime() || - r.IsWriter() || issue.IsPoster(user.ID) || isAssigned) + r.Permission.CanWrite(models.UnitTypeIssues) || issue.IsPoster(user.ID) || isAssigned) } // CanCreateIssueDependencies returns whether or not a user can create dependencies. func (r *Repository) CanCreateIssueDependencies(user *models.User) bool { - return r.Repository.IsDependenciesEnabled() && r.IsWriter() + return r.Permission.CanWrite(models.UnitTypeIssues) && r.Repository.IsDependenciesEnabled() } // GetCommitsCount returns cached commit count for current view @@ -223,7 +203,7 @@ func RedirectToRepo(ctx *Context, redirectRepoID int64) { func repoAssignment(ctx *Context, repo *models.Repository) { // Admin has super access. if ctx.IsSigned && ctx.User.IsAdmin { - ctx.Repo.AccessMode = models.AccessModeOwner + ctx.Repo.Permission.AccessMode = models.AccessModeOwner } else { var userID int64 if ctx.User != nil { @@ -234,11 +214,11 @@ func repoAssignment(ctx *Context, repo *models.Repository) { ctx.ServerError("AccessLevel", err) return } - ctx.Repo.AccessMode = mode + ctx.Repo.Permission.AccessMode = mode } // Check access. - if ctx.Repo.AccessMode == models.AccessModeNone { + if ctx.Repo.Permission.AccessMode == models.AccessModeNone { if ctx.Query("go-get") == "1" { EarlyResponseForGoGetMeta(ctx) return @@ -379,9 +359,10 @@ func RepoAssignment() macaron.Handler { ctx.Data["Title"] = owner.Name + "/" + repo.Name ctx.Data["Repository"] = repo ctx.Data["Owner"] = ctx.Repo.Repository.Owner - ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner() - ctx.Data["IsRepositoryAdmin"] = ctx.Repo.IsAdmin() - ctx.Data["IsRepositoryWriter"] = ctx.Repo.IsWriter() + ctx.Data["IsRepositoryOwner"] = ctx.Repo.Permission.IsOwner() + ctx.Data["IsRepositoryAdmin"] = ctx.Repo.Permission.IsAdmin() + // FIXME: IsRepositoryWriter will only be used on codes related operations. + ctx.Data["IsRepositoryWriter"] = ctx.Repo.Permission.CanWrite(models.UnitTypeCode) if ctx.Data["CanSignedUserFork"], err = ctx.Repo.Repository.CanUserFork(ctx.User); err != nil { ctx.ServerError("CanUserFork", err) @@ -435,7 +416,7 @@ func RepoAssignment() macaron.Handler { } // People who have push access or have forked repository can propose a new pull request. - if ctx.Repo.IsWriter() || (ctx.IsSigned && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID)) { + if ctx.Repo.CanWrite(models.UnitTypeCode) || (ctx.IsSigned && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID)) { // Pull request is allowed if this is a fork repository // and base repository accepts pull requests. if repo.BaseRepo != nil && repo.BaseRepo.AllowsPulls() { @@ -671,10 +652,10 @@ func RequireRepoAdmin() macaron.Handler { } } -// RequireRepoWriter returns a macaron middleware for requiring repository write permission -func RequireRepoWriter() macaron.Handler { +// RequireRepoWriter returns a macaron middleware for requiring repository write to code permission +func RequireRepoWriter(unitType models.UnitType) macaron.Handler { return func(ctx *Context) { - if !ctx.IsSigned || (!ctx.Repo.IsWriter() && !ctx.User.IsAdmin) { + if !ctx.IsSigned || (!ctx.Repo.CanWrite(unitType) && !ctx.User.IsAdmin) { ctx.NotFound(ctx.Req.RequestURI, nil) return } @@ -698,6 +679,8 @@ func LoadRepoUnits() macaron.Handler { ctx.ServerError("LoadUnitsByUserID", err) return } + ctx.Repo.Permission.Units = ctx.Repo.Repository.Units + ctx.Repo.Permission.UnitsMode = ctx.Repo.Repository.UnitsMode } } diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 0be8f84836f3..52f84c7e0b6b 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -152,6 +152,7 @@ func repoAssignment() macaron.Handler { return } repo.Owner = owner + ctx.Repo.Repository = repo if ctx.IsSigned && ctx.User.IsAdmin { ctx.Repo.AccessMode = models.AccessModeOwner @@ -168,8 +169,6 @@ func repoAssignment() macaron.Handler { ctx.Status(404) return } - - ctx.Repo.Repository = repo } } @@ -205,12 +204,15 @@ func reqAdmin() macaron.Handler { } } -func reqRepoWriter() macaron.Handler { +func reqRepoWriter(unitTypes ...models.UnitType) macaron.Handler { return func(ctx *context.Context) { - if !ctx.Repo.IsWriter() { - ctx.Error(403) - return + for _, unitType := range unitTypes { + if ctx.Repo.CanWrite(unitType) { + return + } } + + ctx.Error(403) } } @@ -453,7 +455,7 @@ func RegisterRoutes(m *macaron.Macaron) { Delete(repo.DeleteHook) m.Post("/tests", context.RepoRef(), repo.TestHook) }) - }, reqToken(), reqRepoWriter()) + }, reqToken(), reqRepoWriter(models.UnitTypeCode)) m.Group("/collaborators", func() { m.Get("", repo.ListCollaborators) m.Combo("/:collaborator").Get(repo.IsCollaborator). @@ -473,7 +475,7 @@ func RegisterRoutes(m *macaron.Macaron) { Post(bind(api.CreateKeyOption{}), repo.CreateDeployKey) m.Combo("/:id").Get(repo.GetDeployKey). Delete(repo.DeleteDeploykey) - }, reqToken(), reqRepoWriter()) + }, reqToken(), reqRepoWriter(models.UnitTypeCode)) m.Group("/times", func() { m.Combo("").Get(repo.ListTrackedTimesByRepository) m.Combo("/:timetrackingusername").Get(repo.ListTrackedTimesByUser) @@ -524,10 +526,10 @@ func RegisterRoutes(m *macaron.Macaron) { }) m.Group("/milestones", func() { m.Combo("").Get(repo.ListMilestones). - Post(reqToken(), reqRepoWriter(), bind(api.CreateMilestoneOption{}), repo.CreateMilestone) + Post(reqToken(), reqRepoWriter(models.UnitTypeIssues, models.UnitTypePullRequests), bind(api.CreateMilestoneOption{}), repo.CreateMilestone) m.Combo("/:id").Get(repo.GetMilestone). - Patch(reqToken(), reqRepoWriter(), bind(api.EditMilestoneOption{}), repo.EditMilestone). - Delete(reqToken(), reqRepoWriter(), repo.DeleteMilestone) + Patch(reqToken(), reqRepoWriter(models.UnitTypeIssues, models.UnitTypePullRequests), bind(api.EditMilestoneOption{}), repo.EditMilestone). + Delete(reqToken(), reqRepoWriter(models.UnitTypeIssues, models.UnitTypePullRequests), repo.DeleteMilestone) }) m.Get("/stargazers", repo.ListStargazers) m.Get("/subscribers", repo.ListSubscribers) diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go index c52472b0f872..200392e903e4 100644 --- a/routers/api/v1/repo/collaborators.go +++ b/routers/api/v1/repo/collaborators.go @@ -34,7 +34,7 @@ func ListCollaborators(ctx *context.APIContext) { // responses: // "200": // "$ref": "#/responses/UserList" - if !ctx.Repo.IsWriter() { + if !ctx.Repo.CanWrite(models.UnitTypeCode) { ctx.Error(403, "", "User does not have push access") return } @@ -78,7 +78,7 @@ func IsCollaborator(ctx *context.APIContext) { // "$ref": "#/responses/empty" // "404": // "$ref": "#/responses/empty" - if !ctx.Repo.IsWriter() { + if !ctx.Repo.CanWrite(models.UnitTypeCode) { ctx.Error(403, "", "User does not have push access") return } @@ -133,7 +133,7 @@ func AddCollaborator(ctx *context.APIContext, form api.AddCollaboratorOption) { // responses: // "204": // "$ref": "#/responses/empty" - if !ctx.Repo.IsWriter() { + if !ctx.Repo.CanWrite(models.UnitTypeCode) { ctx.Error(403, "", "User does not have push access") return } @@ -193,7 +193,7 @@ func DeleteCollaborator(ctx *context.APIContext) { // responses: // "204": // "$ref": "#/responses/empty" - if !ctx.Repo.IsWriter() { + if !ctx.Repo.CanWrite(models.UnitTypeCode) { ctx.Error(403, "", "User does not have push access") return } diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go index 610247bc27af..a04dd39e0242 100644 --- a/routers/api/v1/repo/file.go +++ b/routers/api/v1/repo/file.go @@ -38,7 +38,7 @@ func GetRawFile(ctx *context.APIContext) { // responses: // 200: // description: success - if !ctx.Repo.HasAccess() { + if !ctx.Repo.CanAccess(models.UnitTypeCode) { ctx.Status(404) return } diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index cd78135a6216..7a8ed09b4864 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -169,7 +169,7 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) { // "$ref": "#/responses/Issue" var deadlineUnix util.TimeStamp - if form.Deadline != nil && ctx.Repo.IsWriter() { + if form.Deadline != nil && ctx.Repo.CanWrite(models.UnitTypeIssues) { deadlineUnix = util.TimeStamp(form.Deadline.Unix()) } @@ -184,7 +184,7 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) { var assigneeIDs = make([]int64, 0) var err error - if ctx.Repo.IsWriter() { + if ctx.Repo.CanWrite(models.UnitTypeIssues) { issue.MilestoneID = form.Milestone assigneeIDs, err = models.MakeIDsFromAPIAssigneesToAdd(form.Assignee, form.Assignees) if err != nil { @@ -274,7 +274,7 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) { return } - if !issue.IsPoster(ctx.User.ID) && !ctx.Repo.IsWriter() { + if !issue.IsPoster(ctx.User.ID) && !ctx.Repo.CanWrite(models.UnitTypeIssues) { ctx.Status(403) return } @@ -288,7 +288,7 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) { // Update the deadline var deadlineUnix util.TimeStamp - if form.Deadline != nil && !form.Deadline.IsZero() && ctx.Repo.IsWriter() { + if form.Deadline != nil && !form.Deadline.IsZero() && ctx.Repo.CanWrite(models.UnitTypeIssues) { deadlineUnix = util.TimeStamp(form.Deadline.Unix()) } @@ -305,8 +305,7 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) { // Pass one or more user logins to replace the set of assignees on this Issue. // Send an empty array ([]) to clear all assignees from the Issue. - if ctx.Repo.IsWriter() && (form.Assignees != nil || form.Assignee != nil) { - + if ctx.Repo.CanWrite(models.UnitTypeIssues) && (form.Assignees != nil || form.Assignee != nil) { oneAssignee := "" if form.Assignee != nil { oneAssignee = *form.Assignee @@ -319,7 +318,7 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) { } } - if ctx.Repo.IsWriter() && form.Milestone != nil && + if ctx.Repo.CanWrite(models.UnitTypeIssues) && form.Milestone != nil && issue.MilestoneID != *form.Milestone { oldMilestoneID := issue.MilestoneID issue.MilestoneID = *form.Milestone @@ -403,7 +402,7 @@ func UpdateIssueDeadline(ctx *context.APIContext, form api.EditDeadlineOption) { return } - if !ctx.Repo.IsWriter() { + if !ctx.Repo.CanWrite(models.UnitTypeIssues) { ctx.Status(403) return } diff --git a/routers/api/v1/repo/issue_label.go b/routers/api/v1/repo/issue_label.go index 35defa25b57d..f006ee888e6e 100644 --- a/routers/api/v1/repo/issue_label.go +++ b/routers/api/v1/repo/issue_label.go @@ -90,11 +90,6 @@ func AddIssueLabels(ctx *context.APIContext, form api.IssueLabelsOption) { // responses: // "200": // "$ref": "#/responses/LabelList" - if !ctx.Repo.IsWriter() { - ctx.Status(403) - return - } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) if err != nil { if models.IsErrIssueNotExist(err) { @@ -105,6 +100,11 @@ func AddIssueLabels(ctx *context.APIContext, form api.IssueLabelsOption) { return } + if !ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) { + ctx.Status(403) + return + } + labels, err := models.GetLabelsInRepoByIDs(ctx.Repo.Repository.ID, form.Labels) if err != nil { ctx.Error(500, "GetLabelsInRepoByIDs", err) @@ -162,11 +162,6 @@ func DeleteIssueLabel(ctx *context.APIContext) { // responses: // "204": // "$ref": "#/responses/empty" - if !ctx.Repo.IsWriter() { - ctx.Status(403) - return - } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) if err != nil { if models.IsErrIssueNotExist(err) { @@ -177,6 +172,11 @@ func DeleteIssueLabel(ctx *context.APIContext) { return } + if !ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) { + ctx.Status(403) + return + } + label, err := models.GetLabelInRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")) if err != nil { if models.IsErrLabelNotExist(err) { @@ -228,11 +228,6 @@ func ReplaceIssueLabels(ctx *context.APIContext, form api.IssueLabelsOption) { // responses: // "200": // "$ref": "#/responses/LabelList" - if !ctx.Repo.IsWriter() { - ctx.Status(403) - return - } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) if err != nil { if models.IsErrIssueNotExist(err) { @@ -243,6 +238,11 @@ func ReplaceIssueLabels(ctx *context.APIContext, form api.IssueLabelsOption) { return } + if !ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) { + ctx.Status(403) + return + } + labels, err := models.GetLabelsInRepoByIDs(ctx.Repo.Repository.ID, form.Labels) if err != nil { ctx.Error(500, "GetLabelsInRepoByIDs", err) @@ -294,11 +294,6 @@ func ClearIssueLabels(ctx *context.APIContext) { // responses: // "204": // "$ref": "#/responses/empty" - if !ctx.Repo.IsWriter() { - ctx.Status(403) - return - } - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) if err != nil { if models.IsErrIssueNotExist(err) { @@ -309,6 +304,11 @@ func ClearIssueLabels(ctx *context.APIContext) { return } + if !ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) { + ctx.Status(403) + return + } + if err := issue.ClearLabels(ctx.User); err != nil { ctx.Error(500, "ClearLabels", err) return diff --git a/routers/api/v1/repo/label.go b/routers/api/v1/repo/label.go index 359ccf0e41ec..91ed30ec006e 100644 --- a/routers/api/v1/repo/label.go +++ b/routers/api/v1/repo/label.go @@ -123,7 +123,7 @@ func CreateLabel(ctx *context.APIContext, form api.CreateLabelOption) { // responses: // "201": // "$ref": "#/responses/Label" - if !ctx.Repo.IsWriter() { + if !ctx.Repo.CanWrite(models.UnitTypeIssues) && !ctx.Repo.CanWrite(models.UnitTypePullRequests) { ctx.Status(403) return } @@ -173,7 +173,7 @@ func EditLabel(ctx *context.APIContext, form api.EditLabelOption) { // responses: // "200": // "$ref": "#/responses/Label" - if !ctx.Repo.IsWriter() { + if !ctx.Repo.CanWrite(models.UnitTypeIssues) && !ctx.Repo.CanWrite(models.UnitTypePullRequests) { ctx.Status(403) return } @@ -226,7 +226,7 @@ func DeleteLabel(ctx *context.APIContext) { // responses: // "204": // "$ref": "#/responses/empty" - if !ctx.Repo.IsWriter() { + if !ctx.Repo.CanWrite(models.UnitTypeIssues) && !ctx.Repo.CanWrite(models.UnitTypePullRequests) { ctx.Status(403) return } diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index 83ef886d7d31..c0891793b25b 100644 --- a/routers/api/v1/repo/pull.go +++ b/routers/api/v1/repo/pull.go @@ -351,7 +351,7 @@ func EditPullRequest(ctx *context.APIContext, form api.EditPullRequestOption) { pr.LoadIssue() issue := pr.Issue - if !issue.IsPoster(ctx.User.ID) && !ctx.Repo.IsWriter() { + if !issue.IsPoster(ctx.User.ID) && !ctx.Repo.CanWrite(models.UnitTypePullRequests) { ctx.Status(403) return } @@ -382,7 +382,7 @@ func EditPullRequest(ctx *context.APIContext, form api.EditPullRequestOption) { // Pass one or more user logins to replace the set of assignees on this Issue. // Send an empty array ([]) to clear all assignees from the Issue. - if ctx.Repo.IsWriter() && (form.Assignees != nil || len(form.Assignee) > 0) { + if ctx.Repo.CanWrite(models.UnitTypePullRequests) && (form.Assignees != nil || len(form.Assignee) > 0) { err = models.UpdateAPIAssignee(issue, form.Assignee, form.Assignees, ctx.User) if err != nil { @@ -395,7 +395,7 @@ func EditPullRequest(ctx *context.APIContext, form api.EditPullRequestOption) { } } - if ctx.Repo.IsWriter() && form.Milestone != 0 && + if ctx.Repo.CanWrite(models.UnitTypePullRequests) && form.Milestone != 0 && issue.MilestoneID != form.Milestone { oldMilestoneID := issue.MilestoneID issue.MilestoneID = form.Milestone diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index bf6346eebdfc..f75b6807f198 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -553,7 +553,7 @@ func MirrorSync(ctx *context.APIContext) { // "$ref": "#/responses/empty" repo := ctx.Repo.Repository - if !ctx.Repo.IsWriter() { + if !ctx.Repo.CanWrite(models.UnitTypeCode) { ctx.Error(403, "MirrorSync", "Must have write access") } diff --git a/routers/repo/branch.go b/routers/repo/branch.go index 7b1e2a8bbe7b..2c009f55ab70 100644 --- a/routers/repo/branch.go +++ b/routers/repo/branch.go @@ -33,7 +33,7 @@ func Branches(ctx *context.Context) { ctx.Data["Title"] = "Branches" ctx.Data["IsRepoToolbarBranches"] = true ctx.Data["DefaultBranch"] = ctx.Repo.Repository.DefaultBranch - ctx.Data["IsWriter"] = ctx.Repo.IsWriter() + ctx.Data["IsWriter"] = ctx.Repo.CanWrite(models.UnitTypeCode) ctx.Data["IsMirror"] = ctx.Repo.Repository.IsMirror ctx.Data["PageIsViewCode"] = true ctx.Data["PageIsBranches"] = true @@ -161,7 +161,7 @@ func loadBranches(ctx *context.Context) []*Branch { } } - if ctx.Repo.IsWriter() { + if ctx.Repo.CanWrite(models.UnitTypeCode) { deletedBranches, err := getDeletedBranches(ctx) if err != nil { ctx.ServerError("getDeletedBranches", err) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 08bdf311f912..6fd15cdd42ab 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -280,7 +280,7 @@ func RetrieveRepoMilestonesAndAssignees(ctx *context.Context, repo *models.Repos // RetrieveRepoMetas find all the meta information of a repository func RetrieveRepoMetas(ctx *context.Context, repo *models.Repository) []*models.Label { - if !ctx.Repo.IsWriter() { + if !ctx.Repo.CanWrite(models.UnitTypeIssues) { return nil } @@ -380,7 +380,7 @@ func ValidateRepoMetas(ctx *context.Context, form auth.CreateIssueForm) ([]int64 return nil, nil, 0 } - if !ctx.Repo.IsWriter() { + if !ctx.Repo.CanWrite(models.UnitTypeIssues) { return nil, nil, 0 } @@ -616,7 +616,7 @@ func ViewIssue(ctx *context.Context) { ctx.Data["Labels"] = labels // Check milestone and assignee. - if ctx.Repo.IsWriter() { + if ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) { RetrieveRepoMilestonesAndAssignees(ctx, repo) if ctx.Written() { return @@ -818,7 +818,7 @@ func ViewIssue(ctx *context.Context) { ctx.Data["NumParticipants"] = len(participants) ctx.Data["Issue"] = issue ctx.Data["ReadOnly"] = true - ctx.Data["IsIssueOwner"] = ctx.Repo.IsWriter() || (ctx.IsSigned && issue.IsPoster(ctx.User.ID)) + ctx.Data["IsIssueOwner"] = ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) || (ctx.IsSigned && issue.IsPoster(ctx.User.ID)) ctx.Data["SignInLink"] = setting.AppSubURL + "/user/login?redirect_to=" + ctx.Data["Link"].(string) ctx.HTML(200, tplIssueView) } @@ -890,7 +890,7 @@ func UpdateIssueTitle(ctx *context.Context) { return } - if !ctx.IsSigned || (!issue.IsPoster(ctx.User.ID) && !ctx.Repo.IsWriter()) { + if !ctx.IsSigned || (!issue.IsPoster(ctx.User.ID) && !ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull)) { ctx.Error(403) return } @@ -918,7 +918,7 @@ func UpdateIssueContent(ctx *context.Context) { return } - if !ctx.IsSigned || (ctx.User.ID != issue.PosterID && !ctx.Repo.IsWriter()) { + if !ctx.IsSigned || (ctx.User.ID != issue.PosterID && !ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull)) { ctx.Error(403) return } @@ -1051,7 +1051,7 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) { var comment *models.Comment defer func() { // Check if issue admin/poster changes the status of issue. - if (ctx.Repo.IsWriter() || (ctx.IsSigned && issue.IsPoster(ctx.User.ID))) && + if (ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) || (ctx.IsSigned && issue.IsPoster(ctx.User.ID))) && (form.Status == "reopen" || form.Status == "close") && !(issue.IsPull && issue.PullRequest.HasMerged) { diff --git a/routers/repo/release.go b/routers/repo/release.go index bae87efdcdc8..33abf0741231 100644 --- a/routers/repo/release.go +++ b/routers/repo/release.go @@ -65,8 +65,11 @@ func Releases(ctx *context.Context) { limit = 10 } + writeAccess := ctx.Repo.CanWrite(models.UnitTypeReleases) + ctx.Data["CanCreateRelease"] = writeAccess + opts := models.FindReleasesOptions{ - IncludeDrafts: ctx.Repo.IsWriter(), + IncludeDrafts: writeAccess, IncludeTags: true, } diff --git a/routers/repo/view.go b/routers/repo/view.go index 657fe315a2a7..f00329f9a9be 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -137,7 +137,7 @@ func renderDirectory(ctx *context.Context, treeLink string) { ctx.Data["LatestCommitStatus"] = models.CalcCommitStatus(statuses) // Check permission to add or upload new file. - if ctx.Repo.IsWriter() && ctx.Repo.IsViewBranch { + if ctx.Repo.CanWrite(models.UnitTypeCode) && ctx.Repo.IsViewBranch { ctx.Data["CanAddFile"] = true ctx.Data["CanUploadFile"] = setting.Repository.Upload.Enabled } @@ -256,7 +256,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.edit_this_file") } else if !ctx.Repo.IsViewBranch { ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.must_be_on_a_branch") - } else if !ctx.Repo.IsWriter() { + } else if !ctx.Repo.CanWrite(models.UnitTypeCode) { ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.fork_before_edit") } @@ -275,7 +275,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.delete_this_file") } else if !ctx.Repo.IsViewBranch { ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.must_be_on_a_branch") - } else if !ctx.Repo.IsWriter() { + } else if !ctx.Repo.CanWrite(models.UnitTypeCode) { ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.must_have_write_access") } } diff --git a/routers/repo/wiki.go b/routers/repo/wiki.go index 3220ab134d46..b319c258d22b 100644 --- a/routers/repo/wiki.go +++ b/routers/repo/wiki.go @@ -200,6 +200,7 @@ func renderWikiPage(ctx *context.Context, isViewPage bool) (*git.Repository, *gi // Wiki renders single wiki page func Wiki(ctx *context.Context) { ctx.Data["PageIsWiki"] = true + ctx.Data["CanWriteWiki"] = ctx.Repo.CanWrite(models.UnitTypeWiki) if !ctx.Repo.Repository.HasWiki() { ctx.Data["Title"] = ctx.Tr("repo.wiki") @@ -237,6 +238,7 @@ func Wiki(ctx *context.Context) { func WikiPages(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.wiki.pages") ctx.Data["PageIsWiki"] = true + ctx.Data["CanWriteWiki"] = ctx.Repo.CanWrite(models.UnitTypeWiki) if !ctx.Repo.Repository.HasWiki() { ctx.Redirect(ctx.Repo.RepoLink + "/wiki") diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 1c1bcd8f9535..388093fc2911 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -393,7 +393,20 @@ func RegisterRoutes(m *macaron.Macaron) { } reqRepoAdmin := context.RequireRepoAdmin() - reqRepoWriter := context.RequireRepoWriter() + reqRepoCodeWriter := context.RequireRepoWriter(models.UnitTypeCode) + reqRepoReleaseWriter := context.RequireRepoWriter(models.UnitTypeReleases) + reqRepoWikiWriter := context.RequireRepoWriter(models.UnitTypeWiki) + reqRepoPullsWriter := context.RequireRepoWriter(models.UnitTypePullRequests) + reqRepoIssuesOrPullsWriter := func() macaron.Handler { + return func(ctx *context.Context) { + if !ctx.IsSigned || (!ctx.Repo.CanWrite(models.UnitTypeIssues) && + !ctx.Repo.CanWrite(models.UnitTypePullRequests) && + !ctx.User.IsAdmin) { + ctx.NotFound(ctx.Req.RequestURI, nil) + return + } + } + } // ***** START: Organization ***** m.Group("/org", func() { @@ -545,10 +558,10 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/reactions/:action", bindIgnErr(auth.ReactionForm{}), repo.ChangeIssueReaction) }) - m.Post("/labels", reqRepoWriter, repo.UpdateIssueLabel) - m.Post("/milestone", reqRepoWriter, repo.UpdateIssueMilestone) - m.Post("/assignee", reqRepoWriter, repo.UpdateIssueAssignee) - m.Post("/status", reqRepoWriter, repo.UpdateIssueStatus) + m.Post("/labels", reqRepoIssuesOrPullsWriter, repo.UpdateIssueLabel) + m.Post("/milestone", reqRepoIssuesOrPullsWriter, repo.UpdateIssueMilestone) + m.Post("/assignee", reqRepoIssuesOrPullsWriter, repo.UpdateIssueAssignee) + m.Post("/status", reqRepoIssuesOrPullsWriter, repo.UpdateIssueStatus) }) m.Group("/comments/:id", func() { m.Post("", repo.UpdateCommentContent) @@ -560,7 +573,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/edit", bindIgnErr(auth.CreateLabelForm{}), repo.UpdateLabel) m.Post("/delete", repo.DeleteLabel) m.Post("/initialize", bindIgnErr(auth.InitializeLabelsForm{}), repo.InitializeLabels) - }, reqRepoWriter, context.RepoRef(), context.CheckAnyUnit(models.UnitTypeIssues, models.UnitTypePullRequests)) + }, reqRepoIssuesOrPullsWriter, context.RepoRef()) m.Group("/milestones", func() { m.Combo("/new").Get(repo.NewMilestone). Post(bindIgnErr(auth.CreateMilestoneForm{}), repo.NewMilestonePost) @@ -568,7 +581,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/:id/edit", bindIgnErr(auth.CreateMilestoneForm{}), repo.EditMilestonePost) m.Get("/:id/:action", repo.ChangeMilestonStatus) m.Post("/delete", repo.DeleteMilestone) - }, reqRepoWriter, context.RepoRef(), context.CheckAnyUnit(models.UnitTypeIssues, models.UnitTypePullRequests)) + }, reqRepoIssuesOrPullsWriter, context.RepoRef()) m.Combo("/compare/*", repo.MustAllowPulls, repo.SetEditorconfigIfExists). Get(repo.SetDiffViewStyle, repo.CompareAndPullRequest). @@ -591,7 +604,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/upload-file", repo.UploadFileToServer) m.Post("/upload-remove", bindIgnErr(auth.RemoveUploadFileForm{}), repo.RemoveUploadFileFromServer) }, context.RepoRef(), repo.MustBeEditable, repo.MustBeAbleToUpload) - }, repo.MustBeNotBare, reqRepoWriter) + }, repo.MustBeNotBare, reqRepoCodeWriter) m.Group("/branches", func() { m.Group("/_new/", func() { @@ -601,7 +614,7 @@ func RegisterRoutes(m *macaron.Macaron) { }, bindIgnErr(auth.NewBranchForm{})) m.Post("/delete", repo.DeleteBranchPost) m.Post("/restore", repo.RestoreBranchPost) - }, reqRepoWriter, repo.MustBeNotBare, context.CheckUnit(models.UnitTypeCode)) + }, reqRepoCodeWriter, repo.MustBeNotBare) }, reqSignIn, context.RepoAssignment(), context.UnitTypes(), context.LoadRepoUnits()) @@ -614,11 +627,11 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/new", repo.NewRelease) m.Post("/new", bindIgnErr(auth.NewReleaseForm{}), repo.NewReleasePost) m.Post("/delete", repo.DeleteRelease) - }, reqSignIn, repo.MustBeNotBare, reqRepoWriter, context.RepoRef()) + }, reqSignIn, repo.MustBeNotBare, reqRepoReleaseWriter, context.RepoRef()) m.Group("/releases", func() { m.Get("/edit/*", repo.EditRelease) m.Post("/edit/*", bindIgnErr(auth.EditReleaseForm{}), repo.EditReleasePost) - }, reqSignIn, repo.MustBeNotBare, reqRepoWriter, func(ctx *context.Context) { + }, reqSignIn, repo.MustBeNotBare, reqRepoReleaseWriter, func(ctx *context.Context) { var err error ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetBranchCommit(ctx.Repo.Repository.DefaultBranch) if err != nil { @@ -656,7 +669,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Combo("/:page/_edit").Get(repo.EditWiki). Post(bindIgnErr(auth.NewWikiForm{}), repo.EditWikiPost) m.Post("/:page/delete", repo.DeleteWikiPagePost) - }, reqSignIn, reqRepoWriter) + }, reqSignIn, reqRepoWikiWriter) }, repo.MustEnableWiki, context.RepoRef()) m.Group("/wiki", func() { @@ -678,7 +691,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get(".diff", repo.DownloadPullDiff) m.Get(".patch", repo.DownloadPullPatch) m.Get("/commits", context.RepoRef(), repo.ViewPullCommits) - m.Post("/merge", reqRepoWriter, bindIgnErr(auth.MergePullRequestForm{}), repo.MergePullRequest) + m.Post("/merge", reqRepoPullsWriter, bindIgnErr(auth.MergePullRequestForm{}), repo.MergePullRequest) m.Post("/cleanup", context.RepoRef(), repo.CleanUpPullRequest) m.Group("/files", func() { m.Get("", context.RepoRef(), repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.SetWhitespaceBehavior, repo.ViewPullFiles) diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 7337b8ca0ed2..8e1ce06f5dea 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -5,7 +5,7 @@ {{template "base/alert" .}}

{{.i18n.Tr "repo.release.releases"}} - {{if .IsRepositoryWriter}} + {{if .CanCreateRelease}}
{{.i18n.Tr "repo.release.new_release"}} @@ -50,7 +50,7 @@ {{else}}

{{.Title}} - {{if $.IsRepositoryWriter}}({{$.i18n.Tr "repo.release.edit"}}){{end}} + {{if $.CanCreateRelease}}({{$.i18n.Tr "repo.release.edit"}}){{end}}

diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl index 2829b6137473..61903423f390 100644 --- a/templates/repo/wiki/pages.tmpl +++ b/templates/repo/wiki/pages.tmpl @@ -4,7 +4,7 @@

{{.i18n.Tr "repo.wiki.pages"}} - {{if and .IsRepositoryWriter (not .IsRepositoryMirror)}} + {{if and .CanWriteWiki (not .IsRepositoryMirror)}}
{{.i18n.Tr "repo.wiki.new_page_button"}}
diff --git a/templates/repo/wiki/start.tmpl b/templates/repo/wiki/start.tmpl index 1b8d52a587b8..0341e8067b1f 100644 --- a/templates/repo/wiki/start.tmpl +++ b/templates/repo/wiki/start.tmpl @@ -6,7 +6,7 @@

{{.i18n.Tr "repo.wiki.welcome"}}

{{.i18n.Tr "repo.wiki.welcome_desc"}}

- {{if and .IsRepositoryWriter (not .Repository.IsMirror)}} + {{if and .CanWriteWiki (not .Repository.IsMirror)}} {{.i18n.Tr "repo.wiki.create_first_page"}} {{end}}
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 93b7c1064011..dd2de2a04138 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -63,7 +63,7 @@
- {{if and .IsRepositoryWriter (not .Repository.IsMirror)}} + {{if and .CanWriteWiki (not .Repository.IsMirror)}}
{{.i18n.Tr "repo.wiki.edit_page_button"}} {{.i18n.Tr "repo.wiki.new_page_button"}} From 15f80b9ed6a70f2fb0a1bf2b2f4f8655cfdd3f56 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 11 Nov 2018 09:56:23 +0800 Subject: [PATCH 02/31] fix some bugs and merge LoadUnits to repoAssignment --- models/repo.go | 2 +- modules/context/permission.go | 7 ++- modules/context/repo.go | 43 +++++++++---------- routers/repo/issue.go | 2 +- routers/routes/routes.go | 25 ++++------- templates/repo/bare.tmpl | 2 +- templates/repo/issue/labels.tmpl | 8 ++-- templates/repo/issue/milestone_new.tmpl | 2 +- templates/repo/issue/milestones.tmpl | 6 +-- .../repo/issue/view_content/sidebar.tmpl | 10 ++--- 10 files changed, 51 insertions(+), 56 deletions(-) diff --git a/models/repo.go b/models/repo.go index 24c9051e0127..e851246e6f36 100644 --- a/models/repo.go +++ b/models/repo.go @@ -378,7 +378,7 @@ func (repo *Repository) getUnitsByUserID(e Engine, userID int64, isAdmin bool) ( if team.unitEnabled(e, u.Type) { m := repo.UnitsMode[u.Type] if m < team.Authorize { - repo.UnitsMode[u.Type] = m + repo.UnitsMode[u.Type] = team.Authorize } newRepoUnits = append(newRepoUnits, u) break diff --git a/modules/context/permission.go b/modules/context/permission.go index 967cffc488b5..96f14fb71434 100644 --- a/modules/context/permission.go +++ b/modules/context/permission.go @@ -4,7 +4,11 @@ package context -import "code.gitea.io/gitea/models" +import ( + "fmt" + + "code.gitea.io/gitea/models" +) // Permission contains all the permissions related variables to a repository type Permission struct { @@ -46,6 +50,7 @@ func (p *Permission) CanAccess(unitType models.UnitType) bool { // CanWrite returns true if user could write to this unit func (p *Permission) CanWrite(unitType models.UnitType) bool { + fmt.Println("p:", unitType, p.UnitsMode) return p.UnitAccessMode(unitType) >= models.AccessModeWrite } diff --git a/modules/context/repo.go b/modules/context/repo.go index 8f1d381f9cb0..c2cd18707417 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -201,11 +201,11 @@ func RedirectToRepo(ctx *Context, redirectRepoID int64) { } func repoAssignment(ctx *Context, repo *models.Repository) { + var userID int64 // Admin has super access. if ctx.IsSigned && ctx.User.IsAdmin { ctx.Repo.Permission.AccessMode = models.AccessModeOwner } else { - var userID int64 if ctx.User != nil { userID = ctx.User.ID } @@ -217,6 +217,14 @@ func repoAssignment(ctx *Context, repo *models.Repository) { ctx.Repo.Permission.AccessMode = mode } + err := repo.LoadUnitsByUserID(userID, ctx.Repo.IsAdmin()) + if err != nil { + ctx.ServerError("LoadUnitsByUserID", err) + return + } + ctx.Repo.Permission.Units = repo.Units + ctx.Repo.Permission.UnitsMode = repo.UnitsMode + // Check access. if ctx.Repo.Permission.AccessMode == models.AccessModeNone { if ctx.Query("go-get") == "1" { @@ -359,10 +367,11 @@ func RepoAssignment() macaron.Handler { ctx.Data["Title"] = owner.Name + "/" + repo.Name ctx.Data["Repository"] = repo ctx.Data["Owner"] = ctx.Repo.Repository.Owner - ctx.Data["IsRepositoryOwner"] = ctx.Repo.Permission.IsOwner() - ctx.Data["IsRepositoryAdmin"] = ctx.Repo.Permission.IsAdmin() - // FIXME: IsRepositoryWriter will only be used on codes related operations. - ctx.Data["IsRepositoryWriter"] = ctx.Repo.Permission.CanWrite(models.UnitTypeCode) + ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner() + ctx.Data["IsRepositoryAdmin"] = ctx.Repo.IsAdmin() + ctx.Data["CanWriteCode"] = ctx.Repo.CanWrite(models.UnitTypeCode) + ctx.Data["CanWriteIssues"] = ctx.Repo.CanWrite(models.UnitTypeIssues) + ctx.Data["CanWritePulls"] = ctx.Repo.CanWrite(models.UnitTypePullRequests) if ctx.Data["CanSignedUserFork"], err = ctx.Repo.Repository.CanUserFork(ctx.User); err != nil { ctx.ServerError("CanUserFork", err) @@ -662,25 +671,15 @@ func RequireRepoWriter(unitType models.UnitType) macaron.Handler { } } -// LoadRepoUnits loads repsitory's units, it should be called after repository and user loaded -func LoadRepoUnits() macaron.Handler { +// RequireRepoWriterOr returns a macaron middleware for requiring repository write to one of the unit permission +func RequireRepoWriterOr(unitTypes ...models.UnitType) macaron.Handler { return func(ctx *Context) { - var isAdmin bool - if ctx.User != nil && ctx.User.IsAdmin { - isAdmin = true - } - - var userID int64 - if ctx.User != nil { - userID = ctx.User.ID - } - err := ctx.Repo.Repository.LoadUnitsByUserID(userID, isAdmin) - if err != nil { - ctx.ServerError("LoadUnitsByUserID", err) - return + for _, unitType := range unitTypes { + if ctx.Repo.CanWrite(unitType) { + return + } } - ctx.Repo.Permission.Units = ctx.Repo.Repository.Units - ctx.Repo.Permission.UnitsMode = ctx.Repo.Repository.UnitsMode + ctx.NotFound(ctx.Req.RequestURI, nil) } } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 6fd15cdd42ab..43dea84480cb 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -779,7 +779,7 @@ func ViewIssue(ctx *context.Context) { } prConfig := prUnit.PullRequestsConfig() - ctx.Data["AllowMerge"] = ctx.Data["IsRepositoryWriter"] + ctx.Data["AllowMerge"] = ctx.Repo.CanWrite(models.UnitTypeCode) if err := pull.CheckUserAllowedToMerge(ctx.User); err != nil { if !models.IsErrNotAllowedToMerge(err) { ctx.ServerError("CheckUserAllowedToMerge", err) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 388093fc2911..788aef9191cc 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -397,16 +397,7 @@ func RegisterRoutes(m *macaron.Macaron) { reqRepoReleaseWriter := context.RequireRepoWriter(models.UnitTypeReleases) reqRepoWikiWriter := context.RequireRepoWriter(models.UnitTypeWiki) reqRepoPullsWriter := context.RequireRepoWriter(models.UnitTypePullRequests) - reqRepoIssuesOrPullsWriter := func() macaron.Handler { - return func(ctx *context.Context) { - if !ctx.IsSigned || (!ctx.Repo.CanWrite(models.UnitTypeIssues) && - !ctx.Repo.CanWrite(models.UnitTypePullRequests) && - !ctx.User.IsAdmin) { - ctx.NotFound(ctx.Req.RequestURI, nil) - return - } - } - } + reqRepoIssuesOrPullsWriter := context.RequireRepoWriterOr(models.UnitTypeIssues, models.UnitTypePullRequests) // ***** START: Organization ***** m.Group("/org", func() { @@ -476,7 +467,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/fork", func() { m.Combo("/:repoid").Get(repo.Fork). Post(bindIgnErr(auth.CreateRepoForm{}), repo.ForkPost) - }, context.RepoIDAssignment(), context.UnitTypes(), context.LoadRepoUnits(), context.CheckUnit(models.UnitTypeCode)) + }, context.RepoIDAssignment(), context.UnitTypes(), context.CheckUnit(models.UnitTypeCode)) }, reqSignIn) m.Group("/:username/:reponame", func() { @@ -527,7 +518,7 @@ func RegisterRoutes(m *macaron.Macaron) { }, func(ctx *context.Context) { ctx.Data["PageIsSettings"] = true }) - }, reqSignIn, context.RepoAssignment(), reqRepoAdmin, context.UnitTypes(), context.LoadRepoUnits(), context.RepoRef()) + }, reqSignIn, context.RepoAssignment(), reqRepoAdmin, context.UnitTypes(), context.RepoRef()) m.Get("/:username/:reponame/action/:action", reqSignIn, context.RepoAssignment(), repo.Action) @@ -616,7 +607,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/restore", repo.RestoreBranchPost) }, reqRepoCodeWriter, repo.MustBeNotBare) - }, reqSignIn, context.RepoAssignment(), context.UnitTypes(), context.LoadRepoUnits()) + }, reqSignIn, context.RepoAssignment(), context.UnitTypes()) // Releases m.Group("/:username/:reponame", func() { @@ -645,7 +636,7 @@ func RegisterRoutes(m *macaron.Macaron) { } ctx.Data["CommitsCount"] = ctx.Repo.CommitsCount }) - }, context.RepoAssignment(), context.UnitTypes(), context.LoadRepoUnits(), context.CheckUnit(models.UnitTypeReleases)) + }, context.RepoAssignment(), context.UnitTypes(), context.CheckUnit(models.UnitTypeReleases)) m.Group("/:username/:reponame", func() { m.Post("/topics", repo.TopicsPost) @@ -740,18 +731,18 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/compare/:before([a-z0-9]{40})\\.\\.\\.:after([a-z0-9]{40})", repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.MustBeNotBare, context.CheckUnit(models.UnitTypeCode), repo.CompareDiff) - }, ignSignIn, context.RepoAssignment(), context.UnitTypes(), context.LoadRepoUnits()) + }, ignSignIn, context.RepoAssignment(), context.UnitTypes()) m.Group("/:username/:reponame", func() { m.Get("/stars", repo.Stars) m.Get("/watchers", repo.Watchers) m.Get("/search", context.CheckUnit(models.UnitTypeCode), repo.Search) - }, ignSignIn, context.RepoAssignment(), context.RepoRef(), context.UnitTypes(), context.LoadRepoUnits()) + }, ignSignIn, context.RepoAssignment(), context.RepoRef(), context.UnitTypes()) m.Group("/:username", func() { m.Group("/:reponame", func() { m.Get("", repo.SetEditorconfigIfExists, repo.Home) m.Get("\\.git$", repo.SetEditorconfigIfExists, repo.Home) - }, ignSignIn, context.RepoAssignment(), context.RepoRef(), context.UnitTypes(), context.LoadRepoUnits()) + }, ignSignIn, context.RepoAssignment(), context.RepoRef(), context.UnitTypes()) m.Group("/:reponame", func() { m.Group("\\.git/info/lfs", func() { diff --git a/templates/repo/bare.tmpl b/templates/repo/bare.tmpl index f1e1d585425c..ec4be2bdea68 100644 --- a/templates/repo/bare.tmpl +++ b/templates/repo/bare.tmpl @@ -5,7 +5,7 @@
{{template "base/alert" .}} - {{if .IsRepositoryWriter}} + {{if .CanWriteCode}}

{{.i18n.Tr "repo.quick_guide"}}

diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl index 38d914520635..c89d3740ee7f 100644 --- a/templates/repo/issue/labels.tmpl +++ b/templates/repo/issue/labels.tmpl @@ -4,7 +4,7 @@
{{template "repo/issue/navbar" .}} - {{if .IsRepositoryWriter}} + {{if or .CanWriteIssues .CanWritePulls}}
{{.i18n.Tr "repo.issues.new_label"}}
@@ -57,7 +57,7 @@ {{template "base/alert" .}}
{{.i18n.Tr "repo.issues.label_count" .NumLabels}}
- {{if and $.IsRepositoryWriter (eq .NumLabels 0)}} + {{if and (or $.CanWriteIssues $.CanWritePulls) (eq .NumLabels 0)}}
@@ -105,7 +105,7 @@ {{$.i18n.Tr "repo.issues.label_open_issues" .NumOpenIssues}}
- {{if $.IsRepositoryWriter}} + {{if or $.CanWriteIssues $.CanWritePulls}} {{$.i18n.Tr "repo.issues.label_delete"}} {{$.i18n.Tr "repo.issues.label_edit"}} {{end}} @@ -117,7 +117,7 @@
-{{if .IsRepositoryWriter}} +{{if or $.CanWriteIssues $.CanWritePulls}}
diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl index bd2f79389ac0..30a7d7ebbb3d 100644 --- a/templates/repo/issue/milestone_new.tmpl +++ b/templates/repo/issue/milestone_new.tmpl @@ -4,7 +4,7 @@
{{template "repo/issue/navbar" .}} - {{if and .IsRepositoryWriter .PageIsEditMilestone}} + {{if and (or .CanWriteIssues .CanWritePulls) .PageIsEditMilestone}}
{{.i18n.Tr "repo.milestones.new"}}
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 75bd8db8ed35..7b98c0cf56f4 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -4,7 +4,7 @@
{{template "repo/issue/navbar" .}} - {{if .IsRepositoryWriter}} + {{if or .CanWriteIssues .CanWritePulls}}
{{.i18n.Tr "repo.milestones.new"}}
@@ -67,7 +67,7 @@ {{if .TotalTrackedTime}} {{.TotalTrackedTime|Sec2Time}}{{end}}
- {{if $.IsRepositoryWriter}} + {{if or $.CanWriteIssues $.CanWritePulls}}
{{$.i18n.Tr "repo.issues.label_edit"}} {{if .IsClosed}} @@ -111,7 +111,7 @@
-{{if .IsRepositoryWriter}} +{{if or .CanWriteIssues .CanWritePulls}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index fa7a05512dde..b696cbcfdc05 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -2,7 +2,7 @@
{{template "repo/issue/branch_selector_field" .}} -
+
{{.i18n.Tr "repo.issues.new.labels"}} @@ -27,7 +27,7 @@
-
+
{{.i18n.Tr "repo.issues.new.milestone"}} @@ -68,7 +68,7 @@
-
+
{{.i18n.Tr "repo.issues.new.assignees"}} @@ -223,7 +223,7 @@ {{if .Issue.IsOverdue}} {{.i18n.Tr "repo.issues.due_date_overdue"}} {{end}} - {{if and .IsSigned .IsRepositoryWriter}} + {{if and .IsSigned (or .CanWriteIssues .CanWritePulls)}}
{{$.i18n.Tr "repo.issues.due_date_form_edit"}} - {{$.i18n.Tr "repo.issues.due_date_form_remove"}} @@ -233,7 +233,7 @@

{{.i18n.Tr "repo.issues.due_date_not_set"}}

{{end}} - {{if and .IsSigned .IsRepositoryWriter}} + {{if and .IsSigned (or .CanWriteIssues .CanWritePulls)}}

- {{if .IsIssueOwner}} + {{if or .IsIssueWriter .IsIssuePoster}}
{{.i18n.Tr "repo.issues.edit"}}
From d80fea2c74df1f326c573bbe7d1505070bbca906 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 11 Nov 2018 13:21:10 +0800 Subject: [PATCH 04/31] remove unused codes --- models/repo.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/models/repo.go b/models/repo.go index e851246e6f36..b7be50e9d17a 100644 --- a/models/repo.go +++ b/models/repo.go @@ -191,9 +191,8 @@ type Repository struct { IsMirror bool `xorm:"INDEX"` *Mirror `xorm:"-"` - ExternalMetas map[string]string `xorm:"-"` - Units []*RepoUnit `xorm:"-"` - UnitsMode map[UnitType]AccessMode `xorm:"-"` + ExternalMetas map[string]string `xorm:"-"` + Units []*RepoUnit `xorm:"-"` IsFork bool `xorm:"INDEX NOT NULL DEFAULT false"` ForkID int64 `xorm:"INDEX"` @@ -370,16 +369,11 @@ func (repo *Repository) getUnitsByUserID(e Engine, userID int64, isAdmin bool) ( return err } - repo.UnitsMode = make(map[UnitType]AccessMode) // unique var newRepoUnits = make([]*RepoUnit, 0, len(repo.Units)) for _, u := range repo.Units { for _, team := range teams { if team.unitEnabled(e, u.Type) { - m := repo.UnitsMode[u.Type] - if m < team.Authorize { - repo.UnitsMode[u.Type] = team.Authorize - } newRepoUnits = append(newRepoUnits, u) break } From fb4a2cbd43f18fc21209e8ad9772dbfccbbd0ef1 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 11 Nov 2018 13:49:22 +0800 Subject: [PATCH 05/31] fix routes units check --- modules/context/repo.go | 26 ++++++++++++++++++++++++-- routers/routes/routes.go | 36 ++++++++++++++++++++---------------- 2 files changed, 44 insertions(+), 18 deletions(-) diff --git a/modules/context/repo.go b/modules/context/repo.go index 931c994276da..88ffc182c1b2 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -640,10 +640,10 @@ func RequireRepoAdmin() macaron.Handler { } } -// RequireRepoWriter returns a macaron middleware for requiring repository write to code permission +// RequireRepoWriter returns a macaron middleware for requiring repository write to the specify unitType func RequireRepoWriter(unitType models.UnitType) macaron.Handler { return func(ctx *Context) { - if !ctx.IsSigned || (!ctx.Repo.CanWrite(unitType) && !ctx.User.IsAdmin) { + if !ctx.Repo.CanWrite(unitType) { ctx.NotFound(ctx.Req.RequestURI, nil) return } @@ -662,6 +662,28 @@ func RequireRepoWriterOr(unitTypes ...models.UnitType) macaron.Handler { } } +// RequireRepoReader returns a macaron middleware for requiring repository read to the specify unitType +func RequireRepoReader(unitType models.UnitType) macaron.Handler { + return func(ctx *Context) { + if !ctx.Repo.CanAccess(unitType) { + ctx.NotFound(ctx.Req.RequestURI, nil) + return + } + } +} + +// RequireRepoReaderOr returns a macaron middleware for requiring repository write to one of the unit permission +func RequireRepoReaderOr(unitTypes ...models.UnitType) macaron.Handler { + return func(ctx *Context) { + for _, unitType := range unitTypes { + if ctx.Repo.CanAccess(unitType) { + return + } + } + ctx.NotFound(ctx.Req.RequestURI, nil) + } +} + // CheckUnit will check whether unit type is enabled func CheckUnit(unitType models.UnitType) macaron.Handler { return func(ctx *Context) { diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 788aef9191cc..0372f6ec76e2 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -394,10 +394,14 @@ func RegisterRoutes(m *macaron.Macaron) { reqRepoAdmin := context.RequireRepoAdmin() reqRepoCodeWriter := context.RequireRepoWriter(models.UnitTypeCode) + reqRepoCodeReader := context.RequireRepoReader(models.UnitTypeCode) reqRepoReleaseWriter := context.RequireRepoWriter(models.UnitTypeReleases) + reqRepoReleaseReader := context.RequireRepoReader(models.UnitTypeReleases) reqRepoWikiWriter := context.RequireRepoWriter(models.UnitTypeWiki) + reqRepoIssueWriter := context.RequireRepoWriter(models.UnitTypeIssues) reqRepoPullsWriter := context.RequireRepoWriter(models.UnitTypePullRequests) reqRepoIssuesOrPullsWriter := context.RequireRepoWriterOr(models.UnitTypeIssues, models.UnitTypePullRequests) + reqRepoIssuesOrPullsReader := context.RequireRepoReaderOr(models.UnitTypeIssues, models.UnitTypePullRequests) // ***** START: Organization ***** m.Group("/org", func() { @@ -467,7 +471,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/fork", func() { m.Combo("/:repoid").Get(repo.Fork). Post(bindIgnErr(auth.CreateRepoForm{}), repo.ForkPost) - }, context.RepoIDAssignment(), context.UnitTypes(), context.CheckUnit(models.UnitTypeCode)) + }, context.RepoIDAssignment(), context.UnitTypes(), reqRepoCodeReader) }, reqSignIn) m.Group("/:username/:reponame", func() { @@ -526,7 +530,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/issues", func() { m.Combo("/new").Get(context.RepoRef(), repo.NewIssue). Post(bindIgnErr(auth.CreateIssueForm{}), repo.NewIssuePost) - }, context.CheckUnit(models.UnitTypeIssues)) + }, reqRepoIssueWriter) // FIXME: should use different URLs but mostly same logic for comments of issue and pull reuqest. // So they can apply their own enable/disable logic on routers. m.Group("/issues", func() { @@ -558,7 +562,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("", repo.UpdateCommentContent) m.Post("/delete", repo.DeleteComment) m.Post("/reactions/:action", bindIgnErr(auth.ReactionForm{}), repo.ChangeCommentReaction) - }, context.CheckAnyUnit(models.UnitTypeIssues, models.UnitTypePullRequests)) + }, reqRepoIssuesOrPullsReader) m.Group("/labels", func() { m.Post("/new", bindIgnErr(auth.CreateLabelForm{}), repo.NewLabel) m.Post("/edit", bindIgnErr(auth.CreateLabelForm{}), repo.UpdateLabel) @@ -636,7 +640,7 @@ func RegisterRoutes(m *macaron.Macaron) { } ctx.Data["CommitsCount"] = ctx.Repo.CommitsCount }) - }, context.RepoAssignment(), context.UnitTypes(), context.CheckUnit(models.UnitTypeReleases)) + }, context.RepoAssignment(), context.UnitTypes(), reqRepoReleaseReader) m.Group("/:username/:reponame", func() { m.Post("/topics", repo.TopicsPost) @@ -646,8 +650,8 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("", func() { m.Get("/^:type(issues|pulls)$", repo.RetrieveLabels, repo.Issues) m.Get("/^:type(issues|pulls)$/:index", repo.ViewIssue) - m.Get("/labels/", context.CheckAnyUnit(models.UnitTypeIssues, models.UnitTypePullRequests), repo.RetrieveLabels, repo.Labels) - m.Get("/milestones", context.CheckAnyUnit(models.UnitTypeIssues, models.UnitTypePullRequests), repo.Milestones) + m.Get("/labels/", reqRepoIssuesOrPullsReader, repo.RetrieveLabels, repo.Labels) + m.Get("/milestones", reqRepoIssuesOrPullsReader, repo.Milestones) }, context.RepoRef()) m.Group("/wiki", func() { @@ -670,13 +674,13 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/activity", func() { m.Get("", repo.Activity) m.Get("/:period", repo.Activity) - }, context.RepoRef(), repo.MustBeNotBare, context.CheckAnyUnit(models.UnitTypePullRequests, models.UnitTypeIssues, models.UnitTypeReleases)) + }, context.RepoRef(), repo.MustBeNotBare, context.RequireRepoReaderOr(models.UnitTypePullRequests, models.UnitTypeIssues, models.UnitTypeReleases)) - m.Get("/archive/*", repo.MustBeNotBare, context.CheckUnit(models.UnitTypeCode), repo.Download) + m.Get("/archive/*", repo.MustBeNotBare, reqRepoCodeReader, repo.Download) m.Group("/branches", func() { m.Get("", repo.Branches) - }, repo.MustBeNotBare, context.RepoRef(), context.CheckUnit(models.UnitTypeCode)) + }, repo.MustBeNotBare, context.RepoRef(), reqRepoCodeReader) m.Group("/pulls/:index", func() { m.Get(".diff", repo.DownloadPullDiff) @@ -700,7 +704,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/blob/:sha", context.RepoRefByType(context.RepoRefBlob), repo.DownloadByID) // "/*" route is deprecated, and kept for backward compatibility m.Get("/*", context.RepoRefByType(context.RepoRefLegacy), repo.SingleDownload) - }, repo.MustBeNotBare, context.CheckUnit(models.UnitTypeCode)) + }, repo.MustBeNotBare, reqRepoCodeReader) m.Group("/commits", func() { m.Get("/branch/*", context.RepoRefByType(context.RepoRefBranch), repo.RefCommits) @@ -708,12 +712,12 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/commit/*", context.RepoRefByType(context.RepoRefCommit), repo.RefCommits) // "/*" route is deprecated, and kept for backward compatibility m.Get("/*", context.RepoRefByType(context.RepoRefLegacy), repo.RefCommits) - }, repo.MustBeNotBare, context.CheckUnit(models.UnitTypeCode)) + }, repo.MustBeNotBare, reqRepoCodeReader) m.Group("", func() { m.Get("/graph", repo.Graph) m.Get("/commit/:sha([a-f0-9]{7,40})$", repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.Diff) - }, repo.MustBeNotBare, context.RepoRef(), context.CheckUnit(models.UnitTypeCode)) + }, repo.MustBeNotBare, context.RepoRef(), reqRepoCodeReader) m.Group("/src", func() { m.Get("/branch/*", context.RepoRefByType(context.RepoRefBranch), repo.Home) @@ -725,17 +729,17 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("", func() { m.Get("/forks", repo.Forks) - }, context.RepoRef(), context.CheckUnit(models.UnitTypeCode)) + }, context.RepoRef(), reqRepoCodeReader) m.Get("/commit/:sha([a-f0-9]{7,40})\\.:ext(patch|diff)", - repo.MustBeNotBare, context.CheckUnit(models.UnitTypeCode), repo.RawDiff) + repo.MustBeNotBare, reqRepoCodeReader, repo.RawDiff) m.Get("/compare/:before([a-z0-9]{40})\\.\\.\\.:after([a-z0-9]{40})", repo.SetEditorconfigIfExists, - repo.SetDiffViewStyle, repo.MustBeNotBare, context.CheckUnit(models.UnitTypeCode), repo.CompareDiff) + repo.SetDiffViewStyle, repo.MustBeNotBare, reqRepoCodeReader, repo.CompareDiff) }, ignSignIn, context.RepoAssignment(), context.UnitTypes()) m.Group("/:username/:reponame", func() { m.Get("/stars", repo.Stars) m.Get("/watchers", repo.Watchers) - m.Get("/search", context.CheckUnit(models.UnitTypeCode), repo.Search) + m.Get("/search", reqRepoCodeReader, repo.Search) }, ignSignIn, context.RepoAssignment(), context.RepoRef(), context.UnitTypes()) m.Group("/:username", func() { From a21bfde663bf1452e55d7ce41aaef57bbcddb1ca Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 11 Nov 2018 22:21:00 +0800 Subject: [PATCH 06/31] improve permission check --- cmd/serv.go | 12 +----------- models/repo.go | 5 ----- models/repo_permission.go | 17 +++++++++++++++-- modules/context/repo.go | 3 --- modules/private/internal.go | 16 +++++++++++----- routers/private/internal.go | 19 ++++++++++++++++--- routers/repo/http.go | 37 ++++++++++--------------------------- routers/repo/view.go | 4 ++-- 8 files changed, 55 insertions(+), 58 deletions(-) diff --git a/cmd/serv.go b/cmd/serv.go index ca042e2b2b70..9e018aecc262 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -236,7 +236,7 @@ func runServ(c *cli.Context) error { user.Name, repoPath) } - mode, err := private.AccessLevel(user.ID, repo.ID) + mode, err := private.CheckUnitUser(user.ID, repo.ID, user.IsAdmin, unitType) if err != nil { fail("Internal error", "Failed to check access: %v", err) } else if *mode < requestedMode { @@ -249,16 +249,6 @@ func runServ(c *cli.Context) error { user.Name, requestedMode, repoPath) } - check, err := private.CheckUnitUser(user.ID, repo.ID, user.IsAdmin, unitType) - if err != nil { - fail("You do not have allowed for this action", "Failed to access internal api: [user.Name: %s, repoPath: %s]", user.Name, repoPath) - } - if !check { - fail("You do not have allowed for this action", - "User %s does not have allowed access to repository %s 's code", - user.Name, repoPath) - } - os.Setenv(models.EnvPusherName, user.Name) os.Setenv(models.EnvPusherID, fmt.Sprintf("%d", user.ID)) } diff --git a/models/repo.go b/models/repo.go index b7be50e9d17a..3be17680df3f 100644 --- a/models/repo.go +++ b/models/repo.go @@ -337,11 +337,6 @@ func (repo *Repository) checkUnitUser(e Engine, userID int64, isAdmin bool, unit return false } -// LoadUnitsByUserID loads units according userID's permissions -func (repo *Repository) LoadUnitsByUserID(userID int64, isAdmin bool) error { - return repo.getUnitsByUserID(x, userID, isAdmin) -} - func (repo *Repository) getUnitsByUserID(e Engine, userID int64, isAdmin bool) (err error) { if repo.Units != nil { return nil diff --git a/models/repo_permission.go b/models/repo_permission.go index c90163ba7430..af8bd538de49 100644 --- a/models/repo_permission.go +++ b/models/repo_permission.go @@ -32,7 +32,12 @@ func (p *Permission) HasAccess() bool { // UnitAccessMode returns current user accessmode to the specify unit of the repository func (p *Permission) UnitAccessMode(unitType UnitType) AccessMode { if p.UnitsMode == nil { - return p.AccessMode + for _, u := range p.Units { + if u.Type == unitType { + return p.AccessMode + } + } + return AccessModeNone } return p.UnitsMode[unitType] } @@ -62,7 +67,8 @@ func GetUserRepoPermission(repo *Repository, user *User) (Permission, error) { } func getUserRepoPermission(e Engine, repo *Repository, user *User) (perm Permission, err error) { - // anonymous user visit private repo. TODO: anonymous user visit public unit of private repo??? + // anonymous user visit private repo. + // TODO: anonymous user visit public unit of private repo??? if user == nil && repo.IsPrivate { perm.AccessMode = AccessModeNone return @@ -99,6 +105,13 @@ func getUserRepoPermission(e Engine, repo *Repository, user *User) (perm Permiss return } + // Collaborators on organization repos will not be limited by teams units + if isCollaborator, err := repo.isCollaborator(e, user.ID); err != nil { + return perm, err + } else if isCollaborator { + return perm, nil + } + teams, err := getUserRepoTeams(e, repo.OwnerID, user.ID, repo.ID) if err != nil { return diff --git a/modules/context/repo.go b/modules/context/repo.go index 88ffc182c1b2..14f5fb2cc8cd 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -422,9 +422,6 @@ func RepoAssignment() macaron.Handler { ctx.Repo.PullRequest.HeadInfo = ctx.Repo.BranchName } } - - // Reset repo units as otherwise user specific units wont be loaded later - ctx.Repo.Repository.Units = nil } ctx.Data["PullRequestCtx"] = ctx.Repo.PullRequest diff --git a/modules/private/internal.go b/modules/private/internal.go index f4ac1c515a4b..351ff57213f8 100644 --- a/modules/private/internal.go +++ b/modules/private/internal.go @@ -51,20 +51,26 @@ func newInternalRequest(url, method string) *httplib.Request { } // CheckUnitUser check whether user could visit the unit of this repository -func CheckUnitUser(userID, repoID int64, isAdmin bool, unitType models.UnitType) (bool, error) { +func CheckUnitUser(userID, repoID int64, isAdmin bool, unitType models.UnitType) (*models.AccessMode, error) { reqURL := setting.LocalURL + fmt.Sprintf("api/internal/repositories/%d/user/%d/checkunituser?isAdmin=%t&unitType=%d", repoID, userID, isAdmin, unitType) log.GitLogger.Trace("AccessLevel: %s", reqURL) resp, err := newInternalRequest(reqURL, "GET").Response() if err != nil { - return false, err + return nil, err } defer resp.Body.Close() - if resp.StatusCode == 200 { - return true, nil + if resp.StatusCode != 200 { + return nil, fmt.Errorf("Failed to CheckUnitUser: %s", decodeJSONError(resp).Err) } - return false, nil + + var a models.AccessMode + if err := json.NewDecoder(resp.Body).Decode(&a); err != nil { + return nil, err + } + + return &a, nil } // AccessLevel returns the Access a user has to a repository. Will return NoneAccess if the diff --git a/routers/private/internal.go b/routers/private/internal.go index 23e0122642b3..c9f9e4fcb8b7 100644 --- a/routers/private/internal.go +++ b/routers/private/internal.go @@ -70,11 +70,24 @@ func CheckUnitUser(ctx *macaron.Context) { }) return } - if repo.CheckUnitUser(userID, ctx.QueryBool("isAdmin"), models.UnitType(ctx.QueryInt("unitType"))) { - ctx.PlainText(200, []byte("success")) + + user, err := models.GetUserByID(userID) + if err != nil { + ctx.JSON(500, map[string]interface{}{ + "err": err.Error(), + }) return } - ctx.PlainText(404, []byte("no access")) + + perm, err := models.GetUserRepoPermission(repo, user) + if err != nil { + ctx.JSON(500, map[string]interface{}{ + "err": err.Error(), + }) + return + } + + ctx.JSON(200, perm.UnitAccessMode(models.UnitType(ctx.QueryInt("unitType")))) } // RegisterRoutes registers all internal APIs routes to web application. diff --git a/routers/repo/http.go b/routers/repo/http.go index 5b469754adf5..35c03af7cfb6 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -182,36 +182,19 @@ func HTTP(ctx *context.Context) { } } - if !isPublicPull { - has, err := models.HasAccess(authUser.ID, repo, accessMode) - if err != nil { - ctx.ServerError("HasAccess", err) - return - } else if !has { - if accessMode == models.AccessModeRead { - has, err = models.HasAccess(authUser.ID, repo, models.AccessModeWrite) - if err != nil { - ctx.ServerError("HasAccess2", err) - return - } else if !has { - ctx.HandleText(http.StatusForbidden, "User permission denied") - return - } - } else { - ctx.HandleText(http.StatusForbidden, "User permission denied") - return - } - } + perm, err := models.GetUserRepoPermission(repo, authUser) + if err != nil { + ctx.ServerError("GetUserRepoPermission", err) + return + } - if !isPull && repo.IsMirror { - ctx.HandleText(http.StatusForbidden, "mirror repository is read-only") - return - } + if perm.UnitAccessMode(unitType) < accessMode { + ctx.HandleText(http.StatusForbidden, "User permission denied") + return } - if !repo.CheckUnitUser(authUser.ID, authUser.IsAdmin, unitType) { - ctx.HandleText(http.StatusForbidden, fmt.Sprintf("User %s does not have allowed access to repository %s 's code", - authUser.Name, repo.RepoPath())) + if !isPull && repo.IsMirror { + ctx.HandleText(http.StatusForbidden, "mirror repository is read-only") return } diff --git a/routers/repo/view.go b/routers/repo/view.go index f00329f9a9be..78a305aa28aa 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -282,9 +282,9 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st // Home render repository home page func Home(ctx *context.Context) { - if len(ctx.Repo.Repository.Units) > 0 { + if len(ctx.Repo.Units) > 0 { var firstUnit *models.Unit - for _, repoUnit := range ctx.Repo.Repository.Units { + for _, repoUnit := range ctx.Repo.Units { if repoUnit.Type == models.UnitTypeCode { renderCode(ctx) return From 422ba40b5dcd9cd24f58d931e27480907250555b Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 12 Nov 2018 11:23:04 +0800 Subject: [PATCH 07/31] add unit tests for permission --- models/fixtures/repo_unit.yml | 86 +++++++++++- models/fixtures/repository.yml | 2 +- models/fixtures/team.yml | 27 ++++ models/fixtures/team_repo.yml | 18 +++ models/fixtures/team_unit.yml | 15 ++ models/fixtures/team_user.yml | 18 +++ models/repo.go | 52 +------ models/repo_permission.go | 28 +++- models/repo_permission_test.go | 246 +++++++++++++++++++++++++++++++++ modules/context/repo.go | 18 --- routers/api/v1/api.go | 2 +- routers/repo/issue.go | 4 +- 12 files changed, 441 insertions(+), 75 deletions(-) create mode 100644 models/repo_permission_test.go diff --git a/models/fixtures/repo_unit.yml b/models/fixtures/repo_unit.yml index 581f9d6ed560..2fde65b05bfe 100644 --- a/models/fixtures/repo_unit.yml +++ b/models/fixtures/repo_unit.yml @@ -108,4 +108,88 @@ repo_id: 33 type: 5 config: "{}" - created_unix: 1535593231 \ No newline at end of file + created_unix: 1535593231 + +- + id: 17 + repo_id: 4 + type: 4 + config: "{}" + created_unix: 946684810 + +- + id: 18 + repo_id: 4 + type: 5 + config: "{}" + created_unix: 946684810 + +- + id: 19 + repo_id: 4 + type: 1 + config: "{}" + created_unix: 946684810 + +- + id: 20 + repo_id: 4 + type: 2 + config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}" + created_unix: 946684810 + +- + id: 21 + repo_id: 4 + type: 3 + config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowSquash\":true}" + created_unix: 946684810 + +- + id: 22 + repo_id: 2 + type: 4 + config: "{}" + created_unix: 946684810 + +- + id: 23 + repo_id: 2 + type: 5 + config: "{}" + created_unix: 946684810 + +- + id: 24 + repo_id: 2 + type: 1 + config: "{}" + created_unix: 946684810 + +- + id: 25 + repo_id: 32 + type: 1 + config: "{}" + created_unix: 1524304355 + +- + id: 26 + repo_id: 32 + type: 2 + config: "{}" + created_unix: 1524304355 + +- + id: 27 + repo_id: 24 + type: 1 + config: "{}" + created_unix: 1524304355 + +- + id: 28 + repo_id: 24 + type: 2 + config: "{}" + created_unix: 1524304355 \ No newline at end of file diff --git a/models/fixtures/repository.yml b/models/fixtures/repository.yml index c2987b965867..aa96656530ae 100644 --- a/models/fixtures/repository.yml +++ b/models/fixtures/repository.yml @@ -391,7 +391,7 @@ is_mirror: false - - id: 32 + id: 32 # org public repo owner_id: 3 lower_name: repo21 name: repo21 diff --git a/models/fixtures/team.yml b/models/fixtures/team.yml index 4b4a1d798b4e..2d0dd9cd56ca 100644 --- a/models/fixtures/team.yml +++ b/models/fixtures/team.yml @@ -51,3 +51,30 @@ authorize: 4 # owner num_repos: 2 num_members: 1 + +- + id: 7 + org_id: 3 + lower_name: test_team + name: test_team + authorize: 2 # write + num_repos: 1 + num_members: 1 + +- + id: 8 + org_id: 17 + lower_name: test_team + name: test_team + authorize: 2 # write + num_repos: 1 + num_members: 1 + +- + id: 9 + org_id: 17 + lower_name: review_team + name: review_team + authorize: 1 # read + num_repos: 1 + num_members: 1 \ No newline at end of file diff --git a/models/fixtures/team_repo.yml b/models/fixtures/team_repo.yml index b324e094151f..a523a90b204d 100644 --- a/models/fixtures/team_repo.yml +++ b/models/fixtures/team_repo.yml @@ -45,3 +45,21 @@ org_id: 3 team_id: 1 repo_id: 32 + +- + id: 9 + org_id: 3 + team_id: 7 + repo_id: 32 + +- + id: 10 + org_id: 17 + team_id: 8 + repo_id: 24 + +- + id: 11 + org_id: 17 + team_id: 9 + repo_id: 24 \ No newline at end of file diff --git a/models/fixtures/team_unit.yml b/models/fixtures/team_unit.yml index ad5466a5c133..943745c000f9 100644 --- a/models/fixtures/team_unit.yml +++ b/models/fixtures/team_unit.yml @@ -207,3 +207,18 @@ id: 42 team_id: 6 type: 7 + +- + id: 43 + team_id: 7 + type: 2 # issues + +- + id: 44 + team_id: 8 + type: 2 # issues + +- + id: 45 + team_id: 9 + type: 1 # code \ No newline at end of file diff --git a/models/fixtures/team_user.yml b/models/fixtures/team_user.yml index b1dfcdfdef8a..e20b5c9684bf 100644 --- a/models/fixtures/team_user.yml +++ b/models/fixtures/team_user.yml @@ -44,4 +44,22 @@ id: 8 org_id: 19 team_id: 6 + uid: 20 + +- + id: 9 + org_id: 3 + team_id: 7 + uid: 15 + +- + id: 10 + org_id: 17 + team_id: 8 + uid: 2 + +- + id: 11 + org_id: 17 + team_id: 9 uid: 20 \ No newline at end of file diff --git a/models/repo.go b/models/repo.go index 3be17680df3f..5db73c566e20 100644 --- a/models/repo.go +++ b/models/repo.go @@ -325,58 +325,16 @@ func (repo *Repository) CheckUnitUser(userID int64, isAdmin bool, unitType UnitT } func (repo *Repository) checkUnitUser(e Engine, userID int64, isAdmin bool, unitType UnitType) bool { - if err := repo.getUnitsByUserID(e, userID, isAdmin); err != nil { + user, err := getUserByID(e, userID) + if err != nil { return false } - - for _, unit := range repo.Units { - if unit.Type == unitType { - return true - } - } - return false -} - -func (repo *Repository) getUnitsByUserID(e Engine, userID int64, isAdmin bool) (err error) { - if repo.Units != nil { - return nil - } - - if err = repo.getUnits(e); err != nil { - return err - } else if err = repo.getOwner(e); err != nil { - return err - } - - if !repo.Owner.IsOrganization() || userID == 0 || isAdmin || !repo.IsPrivate { - return nil - } - - // Collaborators will not be limited - if isCollaborator, err := repo.isCollaborator(e, userID); err != nil { - return err - } else if isCollaborator { - return nil - } - - teams, err := getUserRepoTeams(e, repo.OwnerID, userID, repo.ID) + perm, err := getUserRepoPermission(e, repo, user) if err != nil { - return err - } - - // unique - var newRepoUnits = make([]*RepoUnit, 0, len(repo.Units)) - for _, u := range repo.Units { - for _, team := range teams { - if team.unitEnabled(e, u.Type) { - newRepoUnits = append(newRepoUnits, u) - break - } - } + return false } - repo.Units = newRepoUnits - return nil + return perm.CanAccess(unitType) } // UnitEnabled if this repository has the given unit enabled diff --git a/models/repo_permission.go b/models/repo_permission.go index af8bd538de49..5a1b40e91939 100644 --- a/models/repo_permission.go +++ b/models/repo_permission.go @@ -47,6 +47,16 @@ func (p *Permission) CanAccess(unitType UnitType) bool { return p.UnitAccessMode(unitType) >= AccessModeRead } +// CanAccessAny returns true if user has read access to any of the units of the repository +func (p *Permission) CanAccessAny(unitTypes ...UnitType) bool { + for _, u := range unitTypes { + if p.CanAccess(u) { + return true + } + } + return false +} + // CanWrite returns true if user could write to this unit func (p *Permission) CanWrite(unitType UnitType) bool { return p.UnitAccessMode(unitType) >= AccessModeWrite @@ -105,19 +115,23 @@ func getUserRepoPermission(e Engine, repo *Repository, user *User) (perm Permiss return } - // Collaborators on organization repos will not be limited by teams units + perm.UnitsMode = make(map[UnitType]AccessMode) + + // Collaborators on organization if isCollaborator, err := repo.isCollaborator(e, user.ID); err != nil { return perm, err } else if isCollaborator { - return perm, nil + for _, u := range repo.Units { + perm.UnitsMode[u.Type] = perm.AccessMode + } } + // get units mode from teams teams, err := getUserRepoTeams(e, repo.OwnerID, user.ID, repo.ID) if err != nil { return } - perm.UnitsMode = make(map[UnitType]AccessMode) for _, u := range repo.Units { var found bool for _, team := range teams { @@ -130,13 +144,17 @@ func getUserRepoPermission(e Engine, repo *Repository, user *User) (perm Permiss } } + // for a public repo on an organization, user have read permission on non-team defined units. if !found && !repo.IsPrivate { - perm.UnitsMode[u.Type] = AccessModeRead + if _, ok := perm.UnitsMode[u.Type]; !ok { + perm.UnitsMode[u.Type] = AccessModeRead + } } } + // remove no permission units perm.Units = make([]*RepoUnit, 0, len(repo.Units)) - for t, _ := range perm.UnitsMode { + for t := range perm.UnitsMode { for _, u := range repo.Units { if u.Type == t { perm.Units = append(perm.Units, u) diff --git a/models/repo_permission_test.go b/models/repo_permission_test.go new file mode 100644 index 000000000000..570ad84a0577 --- /dev/null +++ b/models/repo_permission_test.go @@ -0,0 +1,246 @@ +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package models + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestRepoPermissionPublicNonOrgRepo(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + + // public non-organization repo + repo := AssertExistsAndLoadBean(t, &Repository{ID: 4}).(*Repository) + assert.NoError(t, repo.getUnits(x)) + + // plain user + user := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User) + perm, err := GetUserRepoPermission(repo, user) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.False(t, perm.CanWrite(unit.Type)) + } + + // change to collaborator + assert.NoError(t, repo.AddCollaborator(user)) + perm, err = GetUserRepoPermission(repo, user) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.True(t, perm.CanWrite(unit.Type)) + } + + // collaborator + collaborator := AssertExistsAndLoadBean(t, &User{ID: 4}).(*User) + perm, err = GetUserRepoPermission(repo, collaborator) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.True(t, perm.CanWrite(unit.Type)) + } + + // owner + owner := AssertExistsAndLoadBean(t, &User{ID: 5}).(*User) + perm, err = GetUserRepoPermission(repo, owner) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.True(t, perm.CanWrite(unit.Type)) + } + + // admin + admin := AssertExistsAndLoadBean(t, &User{ID: 1}).(*User) + perm, err = GetUserRepoPermission(repo, admin) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.True(t, perm.CanWrite(unit.Type)) + } +} + +func TestRepoPermissionPrivateNonOrgRepo(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + + // private non-organization repo + repo := AssertExistsAndLoadBean(t, &Repository{ID: 2}).(*Repository) + assert.NoError(t, repo.getUnits(x)) + + // plain user + user := AssertExistsAndLoadBean(t, &User{ID: 4}).(*User) + perm, err := GetUserRepoPermission(repo, user) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.False(t, perm.CanAccess(unit.Type)) + assert.False(t, perm.CanWrite(unit.Type)) + } + + // change to collaborator to default write access + assert.NoError(t, repo.AddCollaborator(user)) + perm, err = GetUserRepoPermission(repo, user) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.True(t, perm.CanWrite(unit.Type)) + } + + assert.NoError(t, repo.ChangeCollaborationAccessMode(user.ID, AccessModeRead)) + perm, err = GetUserRepoPermission(repo, user) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.False(t, perm.CanWrite(unit.Type)) + } + + // owner + owner := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User) + perm, err = GetUserRepoPermission(repo, owner) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.True(t, perm.CanWrite(unit.Type)) + } + + // admin + admin := AssertExistsAndLoadBean(t, &User{ID: 1}).(*User) + perm, err = GetUserRepoPermission(repo, admin) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.True(t, perm.CanWrite(unit.Type)) + } +} + +func TestRepoPermissionPublicOrgRepo(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + + // public organization repo + repo := AssertExistsAndLoadBean(t, &Repository{ID: 32}).(*Repository) + assert.NoError(t, repo.getUnits(x)) + + // plain user + user := AssertExistsAndLoadBean(t, &User{ID: 5}).(*User) + perm, err := GetUserRepoPermission(repo, user) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.False(t, perm.CanWrite(unit.Type)) + } + + // change to collaborator to default write access + assert.NoError(t, repo.AddCollaborator(user)) + perm, err = GetUserRepoPermission(repo, user) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.True(t, perm.CanWrite(unit.Type)) + } + + assert.NoError(t, repo.ChangeCollaborationAccessMode(user.ID, AccessModeRead)) + perm, err = GetUserRepoPermission(repo, user) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.False(t, perm.CanWrite(unit.Type)) + } + + // org memeber team owner + owner := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User) + perm, err = GetUserRepoPermission(repo, owner) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.True(t, perm.CanWrite(unit.Type)) + } + + // org memeber team tester + member := AssertExistsAndLoadBean(t, &User{ID: 15}).(*User) + perm, err = GetUserRepoPermission(repo, member) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + } + assert.True(t, perm.CanWrite(UnitTypeIssues)) + assert.False(t, perm.CanWrite(UnitTypeCode)) + + // admin + admin := AssertExistsAndLoadBean(t, &User{ID: 1}).(*User) + perm, err = GetUserRepoPermission(repo, admin) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.True(t, perm.CanWrite(unit.Type)) + } +} + +func TestRepoPermissionPrivateOrgRepo(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + + // private organization repo + repo := AssertExistsAndLoadBean(t, &Repository{ID: 24}).(*Repository) + assert.NoError(t, repo.getUnits(x)) + + // plain user + user := AssertExistsAndLoadBean(t, &User{ID: 5}).(*User) + perm, err := GetUserRepoPermission(repo, user) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.False(t, perm.CanAccess(unit.Type)) + assert.False(t, perm.CanWrite(unit.Type)) + } + + // change to collaborator to default write access + assert.NoError(t, repo.AddCollaborator(user)) + perm, err = GetUserRepoPermission(repo, user) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.True(t, perm.CanWrite(unit.Type)) + } + + assert.NoError(t, repo.ChangeCollaborationAccessMode(user.ID, AccessModeRead)) + perm, err = GetUserRepoPermission(repo, user) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.False(t, perm.CanWrite(unit.Type)) + } + + // org memeber team owner + owner := AssertExistsAndLoadBean(t, &User{ID: 15}).(*User) + perm, err = GetUserRepoPermission(repo, owner) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.True(t, perm.CanWrite(unit.Type)) + } + + // org memeber team tester + tester := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User) + perm, err = GetUserRepoPermission(repo, tester) + assert.NoError(t, err) + assert.True(t, perm.CanWrite(UnitTypeIssues)) + assert.False(t, perm.CanWrite(UnitTypeCode)) + assert.False(t, perm.CanAccess(UnitTypeCode)) + + // org memeber team reviewer + reviewer := AssertExistsAndLoadBean(t, &User{ID: 20}).(*User) + perm, err = GetUserRepoPermission(repo, reviewer) + assert.NoError(t, err) + assert.False(t, perm.CanAccess(UnitTypeIssues)) + assert.False(t, perm.CanWrite(UnitTypeCode)) + assert.True(t, perm.CanAccess(UnitTypeCode)) + + // admin + admin := AssertExistsAndLoadBean(t, &User{ID: 1}).(*User) + perm, err = GetUserRepoPermission(repo, admin) + assert.NoError(t, err) + for _, unit := range repo.Units { + assert.True(t, perm.CanAccess(unit.Type)) + assert.True(t, perm.CanWrite(unit.Type)) + } +} diff --git a/modules/context/repo.go b/modules/context/repo.go index 14f5fb2cc8cd..1b51939466a9 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -681,24 +681,6 @@ func RequireRepoReaderOr(unitTypes ...models.UnitType) macaron.Handler { } } -// CheckUnit will check whether unit type is enabled -func CheckUnit(unitType models.UnitType) macaron.Handler { - return func(ctx *Context) { - if !ctx.Repo.Repository.UnitEnabled(unitType) { - ctx.NotFound("CheckUnit", fmt.Errorf("%s: %v", ctx.Tr("units.error.unit_not_allowed"), unitType)) - } - } -} - -// CheckAnyUnit will check whether any of the unit types are enabled -func CheckAnyUnit(unitTypes ...models.UnitType) macaron.Handler { - return func(ctx *Context) { - if !ctx.Repo.Repository.AnyUnitEnabled(unitTypes...) { - ctx.NotFound("CheckAnyUnit", fmt.Errorf("%s: %v", ctx.Tr("units.error.unit_not_allowed"), unitTypes)) - } - } -} - // GitHookService checks if repository Git hooks service has been enabled. func GitHookService() macaron.Handler { return func(ctx *Context) { diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 31f746dfaafb..585e4c6e5bfb 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -310,7 +310,7 @@ func orgAssignment(args ...bool) macaron.Handler { } func mustEnableIssues(ctx *context.APIContext) { - if !ctx.Repo.Repository.UnitEnabled(models.UnitTypeIssues) { + if !ctx.Repo.CanAccess(models.UnitTypeIssues) { ctx.Status(404) return } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 304d110b69a7..ec8a25cf633e 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -64,8 +64,8 @@ var ( // MustEnableIssues check if repository enable internal issues func MustEnableIssues(ctx *context.Context) { - if !ctx.Repo.Repository.UnitEnabled(models.UnitTypeIssues) && - !ctx.Repo.Repository.UnitEnabled(models.UnitTypeExternalTracker) { + if !ctx.Repo.CanAccess(models.UnitTypeIssues) && + !ctx.Repo.CanAccess(models.UnitTypeExternalTracker) { ctx.NotFound("MustEnableIssues", nil) return } From dae595b0f6dbc7e6a057eafb5ff8560c4cbdbf19 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 12 Nov 2018 11:32:11 +0800 Subject: [PATCH 08/31] fix typo --- models/repo_permission_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/models/repo_permission_test.go b/models/repo_permission_test.go index 570ad84a0577..055bc3a4423a 100644 --- a/models/repo_permission_test.go +++ b/models/repo_permission_test.go @@ -148,7 +148,7 @@ func TestRepoPermissionPublicOrgRepo(t *testing.T) { assert.False(t, perm.CanWrite(unit.Type)) } - // org memeber team owner + // org member team owner owner := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User) perm, err = GetUserRepoPermission(repo, owner) assert.NoError(t, err) @@ -157,7 +157,7 @@ func TestRepoPermissionPublicOrgRepo(t *testing.T) { assert.True(t, perm.CanWrite(unit.Type)) } - // org memeber team tester + // org member team tester member := AssertExistsAndLoadBean(t, &User{ID: 15}).(*User) perm, err = GetUserRepoPermission(repo, member) assert.NoError(t, err) @@ -210,7 +210,7 @@ func TestRepoPermissionPrivateOrgRepo(t *testing.T) { assert.False(t, perm.CanWrite(unit.Type)) } - // org memeber team owner + // org member team owner owner := AssertExistsAndLoadBean(t, &User{ID: 15}).(*User) perm, err = GetUserRepoPermission(repo, owner) assert.NoError(t, err) @@ -219,7 +219,7 @@ func TestRepoPermissionPrivateOrgRepo(t *testing.T) { assert.True(t, perm.CanWrite(unit.Type)) } - // org memeber team tester + // org member team tester tester := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User) perm, err = GetUserRepoPermission(repo, tester) assert.NoError(t, err) @@ -227,7 +227,7 @@ func TestRepoPermissionPrivateOrgRepo(t *testing.T) { assert.False(t, perm.CanWrite(UnitTypeCode)) assert.False(t, perm.CanAccess(UnitTypeCode)) - // org memeber team reviewer + // org member team reviewer reviewer := AssertExistsAndLoadBean(t, &User{ID: 20}).(*User) perm, err = GetUserRepoPermission(repo, reviewer) assert.NoError(t, err) From 6bed0d4422273d49996054a4cfc082e6d8d19ce8 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 12 Nov 2018 13:36:03 +0800 Subject: [PATCH 09/31] fix tests --- models/fixtures/user.yml | 4 ++-- models/org_test.go | 3 ++- models/user_test.go | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/models/fixtures/user.yml b/models/fixtures/user.yml index b3850e35991c..dc3de2a2e185 100644 --- a/models/fixtures/user.yml +++ b/models/fixtures/user.yml @@ -47,7 +47,7 @@ avatar_email: user3@example.com num_repos: 3 num_members: 2 - num_teams: 2 + num_teams: 3 - id: 4 @@ -266,7 +266,7 @@ num_repos: 2 is_active: true num_members: 2 - num_teams: 1 + num_teams: 3 - id: 18 diff --git a/models/org_test.go b/models/org_test.go index c54e7a93bf19..4790f6997137 100644 --- a/models/org_test.go +++ b/models/org_test.go @@ -84,9 +84,10 @@ func TestUser_GetTeams(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) org := AssertExistsAndLoadBean(t, &User{ID: 3}).(*User) assert.NoError(t, org.GetTeams()) - if assert.Len(t, org.Teams, 2) { + if assert.Len(t, org.Teams, 3) { assert.Equal(t, int64(1), org.Teams[0].ID) assert.Equal(t, int64(2), org.Teams[1].ID) + assert.Equal(t, int64(7), org.Teams[2].ID) } } diff --git a/models/user_test.go b/models/user_test.go index 4713b6864c45..ba700d36599d 100644 --- a/models/user_test.go +++ b/models/user_test.go @@ -169,7 +169,7 @@ func TestGetOrgRepositoryIDs(t *testing.T) { accessibleRepos, err := user2.GetOrgRepositoryIDs() assert.NoError(t, err) // User 2's team has access to private repos 3, 5, repo 32 is a public repo of the organization - assert.Equal(t, []int64{3, 5, 32}, accessibleRepos) + assert.Equal(t, []int64{3, 5, 23, 24, 32}, accessibleRepos) accessibleRepos, err = user4.GetOrgRepositoryIDs() assert.NoError(t, err) From d5ba3a040ca8c70ff0442cfe4b6924f13f02d9bd Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 12 Nov 2018 14:29:30 +0800 Subject: [PATCH 10/31] fix some routes --- routers/api/v1/api.go | 54 ++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 585e4c6e5bfb..49baff36bcb9 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -204,6 +204,24 @@ func reqAdmin() macaron.Handler { } } +func reqOwner() macaron.Handler { + return func(ctx *context.Context) { + if !ctx.Repo.IsAdmin() { + ctx.Error(403) + return + } + } +} + +func reqRepoReader(unitType models.UnitType) macaron.Handler { + return func(ctx *context.Context) { + if !ctx.Repo.CanAccess(unitType) { + ctx.Error(403) + return + } + } +} + func reqRepoWriter(unitTypes ...models.UnitType) macaron.Handler { return func(ctx *context.Context) { for _, unitType := range unitTypes { @@ -317,15 +335,15 @@ func mustEnableIssues(ctx *context.APIContext) { } func mustAllowPulls(ctx *context.Context) { - if !ctx.Repo.Repository.AllowsPulls() { + if !(ctx.Repo.Repository.CanEnablePulls() && ctx.Repo.CanAccess(models.UnitTypePullRequests)) { ctx.Status(404) return } } func mustEnableIssuesOrPulls(ctx *context.Context) { - if !ctx.Repo.Repository.UnitEnabled(models.UnitTypeIssues) && - !ctx.Repo.Repository.AllowsPulls() { + if !ctx.Repo.CanAccess(models.UnitTypeIssues) && + !(ctx.Repo.Repository.CanEnablePulls() && ctx.Repo.CanAccess(models.UnitTypePullRequests)) { ctx.Status(404) return } @@ -519,10 +537,10 @@ func RegisterRoutes(m *macaron.Macaron) { }, mustEnableIssuesOrPulls) m.Group("/labels", func() { m.Combo("").Get(repo.ListLabels). - Post(reqToken(), bind(api.CreateLabelOption{}), repo.CreateLabel) + Post(reqToken(), reqRepoWriter(models.UnitTypeIssues, models.UnitTypePullRequests), bind(api.CreateLabelOption{}), repo.CreateLabel) m.Combo("/:id").Get(repo.GetLabel). - Patch(reqToken(), bind(api.EditLabelOption{}), repo.EditLabel). - Delete(reqToken(), repo.DeleteLabel) + Patch(reqToken(), reqRepoWriter(models.UnitTypeIssues, models.UnitTypePullRequests), bind(api.EditLabelOption{}), repo.EditLabel). + Delete(reqToken(), reqRepoWriter(models.UnitTypeIssues, models.UnitTypePullRequests), repo.DeleteLabel) }) m.Group("/milestones", func() { m.Combo("").Get(repo.ListMilestones). @@ -540,36 +558,36 @@ func RegisterRoutes(m *macaron.Macaron) { }) m.Group("/releases", func() { m.Combo("").Get(repo.ListReleases). - Post(reqToken(), reqRepoWriter(), context.ReferencesGitRepo(), bind(api.CreateReleaseOption{}), repo.CreateRelease) + Post(reqToken(), reqRepoWriter(models.UnitTypeReleases), context.ReferencesGitRepo(), bind(api.CreateReleaseOption{}), repo.CreateRelease) m.Group("/:id", func() { m.Combo("").Get(repo.GetRelease). - Patch(reqToken(), reqRepoWriter(), context.ReferencesGitRepo(), bind(api.EditReleaseOption{}), repo.EditRelease). - Delete(reqToken(), reqRepoWriter(), repo.DeleteRelease) + Patch(reqToken(), reqRepoWriter(models.UnitTypeReleases), context.ReferencesGitRepo(), bind(api.EditReleaseOption{}), repo.EditRelease). + Delete(reqToken(), reqRepoWriter(models.UnitTypeReleases), repo.DeleteRelease) m.Group("/assets", func() { m.Combo("").Get(repo.ListReleaseAttachments). - Post(reqToken(), reqRepoWriter(), repo.CreateReleaseAttachment) + Post(reqToken(), reqRepoWriter(models.UnitTypeReleases), repo.CreateReleaseAttachment) m.Combo("/:asset").Get(repo.GetReleaseAttachment). - Patch(reqToken(), reqRepoWriter(), bind(api.EditAttachmentOptions{}), repo.EditReleaseAttachment). - Delete(reqToken(), reqRepoWriter(), repo.DeleteReleaseAttachment) + Patch(reqToken(), reqRepoWriter(models.UnitTypeReleases), bind(api.EditAttachmentOptions{}), repo.EditReleaseAttachment). + Delete(reqToken(), reqRepoWriter(models.UnitTypeReleases), repo.DeleteReleaseAttachment) }) }) - }) - m.Post("/mirror-sync", reqToken(), reqRepoWriter(), repo.MirrorSync) + }, reqRepoReader(models.UnitTypeReleases)) + m.Post("/mirror-sync", reqToken(), reqRepoWriter(models.UnitTypeCode), repo.MirrorSync) m.Get("/editorconfig/:filename", context.RepoRef(), repo.GetEditorconfig) m.Group("/pulls", func() { m.Combo("").Get(bind(api.ListPullRequestsOptions{}), repo.ListPullRequests). - Post(reqToken(), reqRepoWriter(), bind(api.CreatePullRequestOption{}), repo.CreatePullRequest) + Post(reqToken(), bind(api.CreatePullRequestOption{}), repo.CreatePullRequest) m.Group("/:index", func() { m.Combo("").Get(repo.GetPullRequest). - Patch(reqToken(), reqRepoWriter(), bind(api.EditPullRequestOption{}), repo.EditPullRequest) + Patch(reqToken(), reqRepoWriter(models.UnitTypePullRequests), bind(api.EditPullRequestOption{}), repo.EditPullRequest) m.Combo("/merge").Get(repo.IsPullRequestMerged). - Post(reqToken(), reqRepoWriter(), bind(auth.MergePullRequestForm{}), repo.MergePullRequest) + Post(reqToken(), reqRepoWriter(models.UnitTypePullRequests), bind(auth.MergePullRequestForm{}), repo.MergePullRequest) }) }, mustAllowPulls, context.ReferencesGitRepo()) m.Group("/statuses", func() { m.Combo("/:sha").Get(repo.GetCommitStatuses). - Post(reqToken(), reqRepoWriter(), bind(api.CreateStatusOption{}), repo.NewCommitStatus) + Post(reqToken(), bind(api.CreateStatusOption{}), repo.NewCommitStatus) }) m.Group("/commits/:ref", func() { m.Get("/status", repo.GetCombinedCommitStatusByRef) From 426980d3e5deedde3cf73d438181f2b6b694fa4f Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 12 Nov 2018 15:28:55 +0800 Subject: [PATCH 11/31] fix api permission check --- routers/api/v1/api.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 49baff36bcb9..f36af8220399 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -71,7 +71,6 @@ import ( "code.gitea.io/gitea/routers/api/v1/repo" _ "code.gitea.io/gitea/routers/api/v1/swagger" // for swagger generation "code.gitea.io/gitea/routers/api/v1/user" - "code.gitea.io/gitea/routers/api/v1/utils" api "code.gitea.io/sdk/gitea" "github.com/go-macaron/binding" @@ -154,15 +153,10 @@ func repoAssignment() macaron.Handler { repo.Owner = owner ctx.Repo.Repository = repo - if ctx.IsSigned && ctx.User.IsAdmin { - ctx.Repo.AccessMode = models.AccessModeOwner - } else { - mode, err := models.AccessLevel(utils.UserID(ctx), repo) - if err != nil { - ctx.Error(500, "AccessLevel", err) - return - } - ctx.Repo.AccessMode = mode + ctx.Repo.Permission, err = models.GetUserRepoPermission(repo, ctx.User) + if err != nil { + ctx.Error(500, "GetUserRepoPermission", err) + return } if !ctx.Repo.HasAccess() { From 50d12875666a0e1b2fc7f2e00d135a4688c43506 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 12 Nov 2018 22:16:42 +0800 Subject: [PATCH 12/31] improve permission check --- routers/api/v1/api.go | 49 ++++++++++++++++++++-------- routers/api/v1/repo/collaborators.go | 17 ---------- routers/api/v1/repo/file.go | 5 --- routers/api/v1/repo/label.go | 15 --------- routers/api/v1/repo/release.go | 12 ------- routers/api/v1/repo/repo.go | 10 ++---- routers/repo/activity.go | 6 ++-- routers/repo/issue.go | 8 ++--- routers/repo/wiki.go | 4 +-- 9 files changed, 47 insertions(+), 79 deletions(-) diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index f36af8220399..b5eedf06e473 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -189,7 +189,8 @@ func reqBasicAuth() macaron.Handler { } } -func reqAdmin() macaron.Handler { +// reqSiteAdmin user should be the site admin +func reqSiteAdmin() macaron.Handler { return func(ctx *context.Context) { if !ctx.IsSigned || !ctx.User.IsAdmin { ctx.Error(403) @@ -198,7 +199,18 @@ func reqAdmin() macaron.Handler { } } +// reqOwner user should be the owner of the repo. func reqOwner() macaron.Handler { + return func(ctx *context.Context) { + if !ctx.Repo.IsOwner() { + ctx.Error(403) + return + } + } +} + +// reqAdmin user should be an owner or a collaborator with admin write of a repository +func reqAdmin() macaron.Handler { return func(ctx *context.Context) { if !ctx.Repo.IsAdmin() { ctx.Error(403) @@ -216,6 +228,15 @@ func reqRepoReader(unitType models.UnitType) macaron.Handler { } } +func reqAnyRepoReader() macaron.Handler { + return func(ctx *context.Context) { + if !ctx.Repo.HasAccess() { + ctx.Error(403) + return + } + } +} + func reqRepoWriter(unitTypes ...models.UnitType) macaron.Handler { return func(ctx *context.Context) { for _, unitType := range unitTypes { @@ -457,7 +478,8 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/migrate", reqToken(), bind(auth.MigrateRepoForm{}), repo.Migrate) m.Group("/:username/:reponame", func() { - m.Combo("").Get(repo.Get).Delete(reqToken(), repo.Delete) + m.Combo("").Get(reqAnyRepoReader(), repo.Get). + Delete(reqToken(), reqOwner(), repo.Delete) m.Group("/hooks", func() { m.Combo("").Get(repo.ListHooks). Post(bind(api.CreateHookOption{}), repo.CreateHook) @@ -467,21 +489,21 @@ func RegisterRoutes(m *macaron.Macaron) { Delete(repo.DeleteHook) m.Post("/tests", context.RepoRef(), repo.TestHook) }) - }, reqToken(), reqRepoWriter(models.UnitTypeCode)) + }, reqToken(), reqAdmin()) m.Group("/collaborators", func() { m.Get("", repo.ListCollaborators) m.Combo("/:collaborator").Get(repo.IsCollaborator). Put(bind(api.AddCollaboratorOption{}), repo.AddCollaborator). Delete(repo.DeleteCollaborator) - }, reqToken()) - m.Get("/raw/*", context.RepoRefByType(context.RepoRefAny), repo.GetRawFile) - m.Get("/archive/*", repo.GetArchive) + }, reqToken(), reqAdmin()) + m.Get("/raw/*", context.RepoRefByType(context.RepoRefAny), reqRepoReader(models.UnitTypeCode), repo.GetRawFile) + m.Get("/archive/*", reqRepoReader(models.UnitTypeCode), repo.GetArchive) m.Combo("/forks").Get(repo.ListForks). - Post(reqToken(), bind(api.CreateForkOption{}), repo.CreateFork) + Post(reqToken(), reqRepoReader(models.UnitTypeCode), bind(api.CreateForkOption{}), repo.CreateFork) m.Group("/branches", func() { m.Get("", repo.ListBranches) m.Get("/*", context.RepoRefByType(context.RepoRefBranch), repo.GetBranch) - }) + }, reqRepoReader(models.UnitTypeCode)) m.Group("/keys", func() { m.Combo("").Get(repo.ListDeployKeys). Post(bind(api.CreateKeyOption{}), repo.CreateDeployKey) @@ -491,7 +513,6 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/times", func() { m.Combo("").Get(repo.ListTrackedTimesByRepository) m.Combo("/:timetrackingusername").Get(repo.ListTrackedTimesByUser) - }, mustEnableIssues) m.Group("/issues", func() { m.Combo("").Get(repo.ListIssues). @@ -567,7 +588,7 @@ func RegisterRoutes(m *macaron.Macaron) { }) }, reqRepoReader(models.UnitTypeReleases)) m.Post("/mirror-sync", reqToken(), reqRepoWriter(models.UnitTypeCode), repo.MirrorSync) - m.Get("/editorconfig/:filename", context.RepoRef(), repo.GetEditorconfig) + m.Get("/editorconfig/:filename", context.RepoRef(), reqRepoReader(models.UnitTypeCode), repo.GetEditorconfig) m.Group("/pulls", func() { m.Combo("").Get(bind(api.ListPullRequestsOptions{}), repo.ListPullRequests). Post(reqToken(), bind(api.CreatePullRequestOption{}), repo.CreatePullRequest) @@ -582,15 +603,15 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/statuses", func() { m.Combo("/:sha").Get(repo.GetCommitStatuses). Post(reqToken(), bind(api.CreateStatusOption{}), repo.NewCommitStatus) - }) + }, reqRepoReader(models.UnitTypeCode)) m.Group("/commits/:ref", func() { m.Get("/status", repo.GetCombinedCommitStatusByRef) m.Get("/statuses", repo.GetCommitStatusesByRef) - }) + }, reqRepoReader(models.UnitTypeCode)) m.Group("/git", func() { m.Get("/refs", repo.GetGitAllRefs) m.Get("/refs/*", repo.GetGitRefs) - }) + }, reqRepoReader(models.UnitTypeCode)) }, repoAssignment()) }) @@ -659,7 +680,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/repos", bind(api.CreateRepoOption{}), admin.CreateRepo) }) }) - }, reqToken(), reqAdmin()) + }, reqToken(), reqSiteAdmin()) m.Group("/topics", func() { m.Get("/search", repo.TopicSearch) diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go index 5bb80abb1a3c..2f254f71033d 100644 --- a/routers/api/v1/repo/collaborators.go +++ b/routers/api/v1/repo/collaborators.go @@ -35,10 +35,6 @@ func ListCollaborators(ctx *context.APIContext) { // responses: // "200": // "$ref": "#/responses/UserList" - if !ctx.Repo.CanWrite(models.UnitTypeCode) { - ctx.Error(403, "", "User does not have push access") - return - } collaborators, err := ctx.Repo.Repository.GetCollaborators() if err != nil { ctx.Error(500, "ListCollaborators", err) @@ -79,10 +75,6 @@ func IsCollaborator(ctx *context.APIContext) { // "$ref": "#/responses/empty" // "404": // "$ref": "#/responses/empty" - if !ctx.Repo.CanWrite(models.UnitTypeCode) { - ctx.Error(403, "", "User does not have push access") - return - } user, err := models.GetUserByName(ctx.Params(":collaborator")) if err != nil { if models.IsErrUserNotExist(err) { @@ -134,10 +126,6 @@ func AddCollaborator(ctx *context.APIContext, form api.AddCollaboratorOption) { // responses: // "204": // "$ref": "#/responses/empty" - if !ctx.Repo.CanWrite(models.UnitTypeCode) { - ctx.Error(403, "", "User does not have push access") - return - } collaborator, err := models.GetUserByName(ctx.Params(":collaborator")) if err != nil { if models.IsErrUserNotExist(err) { @@ -194,11 +182,6 @@ func DeleteCollaborator(ctx *context.APIContext) { // responses: // "204": // "$ref": "#/responses/empty" - if !ctx.Repo.CanWrite(models.UnitTypeCode) { - ctx.Error(403, "", "User does not have push access") - return - } - collaborator, err := models.GetUserByName(ctx.Params(":collaborator")) if err != nil { if models.IsErrUserNotExist(err) { diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go index 88d7a1ea2b71..81f2332089d9 100644 --- a/routers/api/v1/repo/file.go +++ b/routers/api/v1/repo/file.go @@ -39,11 +39,6 @@ func GetRawFile(ctx *context.APIContext) { // responses: // 200: // description: success - if !ctx.Repo.CanAccess(models.UnitTypeCode) { - ctx.Status(404) - return - } - if ctx.Repo.Repository.IsBare { ctx.Status(404) return diff --git a/routers/api/v1/repo/label.go b/routers/api/v1/repo/label.go index 2efaace5bdc4..df7a37004191 100644 --- a/routers/api/v1/repo/label.go +++ b/routers/api/v1/repo/label.go @@ -124,11 +124,6 @@ func CreateLabel(ctx *context.APIContext, form api.CreateLabelOption) { // responses: // "201": // "$ref": "#/responses/Label" - if !ctx.Repo.CanWrite(models.UnitTypeIssues) && !ctx.Repo.CanWrite(models.UnitTypePullRequests) { - ctx.Status(403) - return - } - label := &models.Label{ Name: form.Name, Color: form.Color, @@ -174,11 +169,6 @@ func EditLabel(ctx *context.APIContext, form api.EditLabelOption) { // responses: // "200": // "$ref": "#/responses/Label" - if !ctx.Repo.CanWrite(models.UnitTypeIssues) && !ctx.Repo.CanWrite(models.UnitTypePullRequests) { - ctx.Status(403) - return - } - label, err := models.GetLabelInRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")) if err != nil { if models.IsErrLabelNotExist(err) { @@ -227,11 +217,6 @@ func DeleteLabel(ctx *context.APIContext) { // responses: // "204": // "$ref": "#/responses/empty" - if !ctx.Repo.CanWrite(models.UnitTypeIssues) && !ctx.Repo.CanWrite(models.UnitTypePullRequests) { - ctx.Status(403) - return - } - if err := models.DeleteLabel(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")); err != nil { ctx.Error(500, "DeleteLabel", err) return diff --git a/routers/api/v1/repo/release.go b/routers/api/v1/repo/release.go index 282ff582c509..caa2905e9307 100644 --- a/routers/api/v1/repo/release.go +++ b/routers/api/v1/repo/release.go @@ -122,10 +122,6 @@ func CreateRelease(ctx *context.APIContext, form api.CreateReleaseOption) { // responses: // "201": // "$ref": "#/responses/Release" - if ctx.Repo.AccessMode < models.AccessModeWrite { - ctx.Status(403) - return - } rel, err := models.GetRelease(ctx.Repo.Repository.ID, form.TagName) if err != nil { if !models.IsErrReleaseNotExist(err) { @@ -209,10 +205,6 @@ func EditRelease(ctx *context.APIContext, form api.EditReleaseOption) { // responses: // "200": // "$ref": "#/responses/Release" - if ctx.Repo.AccessMode < models.AccessModeWrite { - ctx.Status(403) - return - } id := ctx.ParamsInt64(":id") rel, err := models.GetReleaseByID(id) if err != nil && !models.IsErrReleaseNotExist(err) { @@ -285,10 +277,6 @@ func DeleteRelease(ctx *context.APIContext) { // responses: // "204": // "$ref": "#/responses/empty" - if ctx.Repo.AccessMode < models.AccessModeWrite { - ctx.Status(403) - return - } id := ctx.ParamsInt64(":id") rel, err := models.GetReleaseByID(id) if err != nil && !models.IsErrReleaseNotExist(err) { diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index a56f69697400..9ce15ae1688d 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -470,15 +470,15 @@ func GetByID(ctx *context.APIContext) { return } - access, err := models.AccessLevel(ctx.User.ID, repo) + perm, err := models.GetUserRepoPermission(repo, ctx.User) if err != nil { ctx.Error(500, "AccessLevel", err) return - } else if access < models.AccessModeRead { + } else if !perm.HasAccess() { ctx.Status(404) return } - ctx.JSON(200, repo.APIFormat(access)) + ctx.JSON(200, repo.APIFormat(perm.AccessMode)) } // Delete one repository @@ -504,10 +504,6 @@ func Delete(ctx *context.APIContext) { // "$ref": "#/responses/empty" // "403": // "$ref": "#/responses/forbidden" - if !ctx.Repo.IsAdmin() { - ctx.Error(403, "", "Must have admin rights") - return - } owner := ctx.Repo.Owner repo := ctx.Repo.Repository diff --git a/routers/repo/activity.go b/routers/repo/activity.go index a0a25dc936b2..7168728e76aa 100644 --- a/routers/repo/activity.go +++ b/routers/repo/activity.go @@ -45,9 +45,9 @@ func Activity(ctx *context.Context) { var err error if ctx.Data["Activity"], err = models.GetActivityStats(ctx.Repo.Repository.ID, timeFrom, - ctx.Repo.Repository.UnitEnabled(models.UnitTypeReleases), - ctx.Repo.Repository.UnitEnabled(models.UnitTypeIssues), - ctx.Repo.Repository.UnitEnabled(models.UnitTypePullRequests)); err != nil { + ctx.Repo.CanAccess(models.UnitTypeReleases), + ctx.Repo.CanAccess(models.UnitTypeIssues), + ctx.Repo.CanAccess(models.UnitTypePullRequests)); err != nil { ctx.ServerError("GetActivityStats", err) return } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index ec8a25cf633e..72558c4c2e8e 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -844,8 +844,8 @@ func GetActionIssue(ctx *context.Context) *models.Issue { } func checkIssueRights(ctx *context.Context, issue *models.Issue) { - if issue.IsPull && !ctx.Repo.Repository.UnitEnabled(models.UnitTypePullRequests) || - !issue.IsPull && !ctx.Repo.Repository.UnitEnabled(models.UnitTypeIssues) { + if issue.IsPull && !ctx.Repo.CanAccess(models.UnitTypePullRequests) || + !issue.IsPull && !ctx.Repo.CanAccess(models.UnitTypeIssues) { ctx.NotFound("IssueOrPullRequestUnitNotAllowed", nil) } } @@ -870,8 +870,8 @@ func getActionIssues(ctx *context.Context) []*models.Issue { return nil } // Check access rights for all issues - issueUnitEnabled := ctx.Repo.Repository.UnitEnabled(models.UnitTypeIssues) - prUnitEnabled := ctx.Repo.Repository.UnitEnabled(models.UnitTypePullRequests) + issueUnitEnabled := ctx.Repo.CanAccess(models.UnitTypeIssues) + prUnitEnabled := ctx.Repo.CanAccess(models.UnitTypePullRequests) for _, issue := range issues { if issue.IsPull && !prUnitEnabled || !issue.IsPull && !issueUnitEnabled { ctx.NotFound("IssueOrPullRequestUnitNotAllowed", nil) diff --git a/routers/repo/wiki.go b/routers/repo/wiki.go index f1bd191286ed..a36e0977edd6 100644 --- a/routers/repo/wiki.go +++ b/routers/repo/wiki.go @@ -31,8 +31,8 @@ const ( // MustEnableWiki check if wiki is enabled, if external then redirect func MustEnableWiki(ctx *context.Context) { - if !ctx.Repo.Repository.UnitEnabled(models.UnitTypeWiki) && - !ctx.Repo.Repository.UnitEnabled(models.UnitTypeExternalWiki) { + if !ctx.Repo.CanAccess(models.UnitTypeWiki) && + !ctx.Repo.CanAccess(models.UnitTypeExternalWiki) { ctx.NotFound("MustEnableWiki", nil) return } From 95d9a58bddf6fe24bda20f01deaca1e7c3ebfd75 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 13 Nov 2018 11:14:06 +0800 Subject: [PATCH 13/31] fix some permission check --- models/repo.go | 5 -- modules/context/permission.go | 64 +++++++++++++++++++ modules/context/repo.go | 55 +--------------- routers/repo/issue.go | 4 +- routers/repo/pull.go | 8 ++- templates/repo/activity.tmpl | 10 +-- templates/repo/diff/comments.tmpl | 2 +- templates/repo/header.tmpl | 20 +++--- templates/repo/home.tmpl | 4 +- .../repo/issue/view_content/comments.tmpl | 2 +- templates/repo/release/list.tmpl | 4 +- templates/repo/settings/options.tmpl | 6 +- templates/repo/settings/webhook/history.tmpl | 2 +- templates/repo/sub_menu.tmpl | 4 +- 14 files changed, 101 insertions(+), 89 deletions(-) create mode 100644 modules/context/permission.go diff --git a/models/repo.go b/models/repo.go index 5db73c566e20..cca82d86b467 100644 --- a/models/repo.go +++ b/models/repo.go @@ -657,11 +657,6 @@ func (repo *Repository) UpdateSize() error { return repo.updateSize(x) } -// CanBeForked returns true if repository meets the requirements of being forked. -func (repo *Repository) CanBeForked() bool { - return !repo.IsBare && repo.UnitEnabled(UnitTypeCode) -} - // CanUserFork returns true if specified user can fork repository. func (repo *Repository) CanUserFork(user *User) (bool, error) { if user == nil { diff --git a/modules/context/permission.go b/modules/context/permission.go new file mode 100644 index 000000000000..f9621f9da48a --- /dev/null +++ b/modules/context/permission.go @@ -0,0 +1,64 @@ +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package context + +import ( + "code.gitea.io/gitea/models" + macaron "gopkg.in/macaron.v1" +) + +// RequireRepoAdmin returns a macaron middleware for requiring repository admin permission +func RequireRepoAdmin() macaron.Handler { + return func(ctx *Context) { + if !ctx.IsSigned || (!ctx.Repo.IsAdmin() && !ctx.User.IsAdmin) { + ctx.NotFound(ctx.Req.RequestURI, nil) + return + } + } +} + +// RequireRepoWriter returns a macaron middleware for requiring repository write to the specify unitType +func RequireRepoWriter(unitType models.UnitType) macaron.Handler { + return func(ctx *Context) { + if !ctx.Repo.CanWrite(unitType) { + ctx.NotFound(ctx.Req.RequestURI, nil) + return + } + } +} + +// RequireRepoWriterOr returns a macaron middleware for requiring repository write to one of the unit permission +func RequireRepoWriterOr(unitTypes ...models.UnitType) macaron.Handler { + return func(ctx *Context) { + for _, unitType := range unitTypes { + if ctx.Repo.CanWrite(unitType) { + return + } + } + ctx.NotFound(ctx.Req.RequestURI, nil) + } +} + +// RequireRepoReader returns a macaron middleware for requiring repository read to the specify unitType +func RequireRepoReader(unitType models.UnitType) macaron.Handler { + return func(ctx *Context) { + if !ctx.Repo.CanAccess(unitType) { + ctx.NotFound(ctx.Req.RequestURI, nil) + return + } + } +} + +// RequireRepoReaderOr returns a macaron middleware for requiring repository write to one of the unit permission +func RequireRepoReaderOr(unitTypes ...models.UnitType) macaron.Handler { + return func(ctx *Context) { + for _, unitType := range unitTypes { + if ctx.Repo.CanAccess(unitType) { + return + } + } + ctx.NotFound(ctx.Req.RequestURI, nil) + } +} diff --git a/modules/context/repo.go b/modules/context/repo.go index 1b51939466a9..e40fde25b17f 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -218,6 +218,7 @@ func repoAssignment(ctx *Context, repo *models.Repository) { return } ctx.Data["HasAccess"] = true + ctx.Data["Permission"] = &ctx.Repo.Permission if repo.IsMirror { var err error @@ -627,60 +628,6 @@ func RepoRefByType(refType RepoRefType) macaron.Handler { } } -// RequireRepoAdmin returns a macaron middleware for requiring repository admin permission -func RequireRepoAdmin() macaron.Handler { - return func(ctx *Context) { - if !ctx.IsSigned || (!ctx.Repo.IsAdmin() && !ctx.User.IsAdmin) { - ctx.NotFound(ctx.Req.RequestURI, nil) - return - } - } -} - -// RequireRepoWriter returns a macaron middleware for requiring repository write to the specify unitType -func RequireRepoWriter(unitType models.UnitType) macaron.Handler { - return func(ctx *Context) { - if !ctx.Repo.CanWrite(unitType) { - ctx.NotFound(ctx.Req.RequestURI, nil) - return - } - } -} - -// RequireRepoWriterOr returns a macaron middleware for requiring repository write to one of the unit permission -func RequireRepoWriterOr(unitTypes ...models.UnitType) macaron.Handler { - return func(ctx *Context) { - for _, unitType := range unitTypes { - if ctx.Repo.CanWrite(unitType) { - return - } - } - ctx.NotFound(ctx.Req.RequestURI, nil) - } -} - -// RequireRepoReader returns a macaron middleware for requiring repository read to the specify unitType -func RequireRepoReader(unitType models.UnitType) macaron.Handler { - return func(ctx *Context) { - if !ctx.Repo.CanAccess(unitType) { - ctx.NotFound(ctx.Req.RequestURI, nil) - return - } - } -} - -// RequireRepoReaderOr returns a macaron middleware for requiring repository write to one of the unit permission -func RequireRepoReaderOr(unitTypes ...models.UnitType) macaron.Handler { - return func(ctx *Context) { - for _, unitType := range unitTypes { - if ctx.Repo.CanAccess(unitType) { - return - } - } - ctx.NotFound(ctx.Req.RequestURI, nil) - } -} - // GitHookService checks if repository Git hooks service has been enabled. func GitHookService() macaron.Handler { return func(ctx *Context) { diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 72558c4c2e8e..73dee6ac29cf 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -77,9 +77,9 @@ func MustEnableIssues(ctx *context.Context) { } } -// MustAllowPulls check if repository enable pull requests +// MustAllowPulls check if repository enable pull requests and user have right to do that func MustAllowPulls(ctx *context.Context) { - if !ctx.Repo.Repository.AllowsPulls() { + if !ctx.Repo.Repository.CanEnablePulls() || !ctx.Repo.CanAccess(models.UnitTypePullRequests) { ctx.NotFound("MustAllowPulls", nil) return } diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 4ec1c27cea05..da94b952a3d5 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -57,7 +57,13 @@ func getForkRepository(ctx *context.Context) *models.Repository { return nil } - if !forkRepo.CanBeForked() || !forkRepo.HasAccess(ctx.User) { + perm, err := models.GetUserRepoPermission(forkRepo, ctx.User) + if err != nil { + ctx.ServerError("GetUserRepoPermission", err) + return nil + } + + if forkRepo.IsBare || !perm.CanAccess(models.UnitTypeCode) { ctx.NotFound("getForkRepository", nil) return nil } diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index 19866d53d77b..29cd9be97c53 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -23,10 +23,10 @@
- {{if (or (.Repository.UnitEnabled $.UnitTypeIssues) (.Repository.UnitEnabled $.UnitTypePullRequests))}} + {{if (or (.Permission.CanAccess $.UnitTypeIssues) (.Permission.CanAccess $.UnitTypePullRequests))}}

{{.i18n.Tr "repo.activity.overview"}}

- {{if .Repository.UnitEnabled $.UnitTypePullRequests}} + {{if .Permission.CanAccess $.UnitTypePullRequests}}
{{if gt .Activity.ActivePRCount 0}}
@@ -41,7 +41,7 @@ {{.i18n.Tr (TrN .i18n.Lang .Activity.ActivePRCount "repo.activity.active_prs_count_1" "repo.activity.active_prs_count_n") .Activity.ActivePRCount | Safe }}
{{end}} - {{if .Repository.UnitEnabled $.UnitTypeIssues}} + {{if .Permission.CanAccess $.UnitTypeIssues}}
{{if gt .Activity.ActiveIssueCount 0}}
@@ -58,7 +58,7 @@ {{end}}
- {{if .Repository.UnitEnabled $.UnitTypePullRequests}} + {{if .Permission.CanAccess $.UnitTypePullRequests}} {{.Activity.MergedPRCount}}
{{.i18n.Tr (TrN .i18n.Lang .Activity.MergedPRCount "repo.activity.merged_prs_count_1" "repo.activity.merged_prs_count_n") }} @@ -68,7 +68,7 @@ {{.i18n.Tr (TrN .i18n.Lang .Activity.OpenedPRCount "repo.activity.opened_prs_count_1" "repo.activity.opened_prs_count_n") }} {{end}} - {{if .Repository.UnitEnabled $.UnitTypeIssues}} + {{if .Permission.CanAccess $.UnitTypeIssues}} {{.Activity.ClosedIssueCount}}
{{.i18n.Tr (TrN .i18n.Lang .Activity.ClosedIssueCount "repo.activity.closed_issues_count_1" "repo.activity.closed_issues_count_n") }} diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index 18221e36ed37..7e8588e60c84 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -21,7 +21,7 @@ {{end}} {{end}} {{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.root.RepoLink .ID) }} - {{if or $.root.IsRepositoryAdmin (eq .Poster.ID $.root.SignedUserID)}} + {{if or $.root.Permission.IsAdmin (eq .Poster.ID $.root.SignedUserID)}}
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index bf052301555b..3d8abba1b8bd 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -30,7 +30,7 @@ {{.NumStars}}
- {{if .CanBeForked}} + {{if and (not .IsBare) ($.Permission.CanAccess $.UnitTypeCode)}}
{{$.i18n.Tr "repo.fork"}} @@ -47,43 +47,43 @@ {{if not .IsDiffCompare}}
- {{if .Repository.UnitEnabled $.UnitTypeCode}} + {{if .Permission.CanAccess $.UnitTypeCode}} {{.i18n.Tr "repo.code"}} {{end}} - {{if .Repository.UnitEnabled $.UnitTypeIssues}} + {{if .Permission.CanAccess $.UnitTypeIssues}} {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} {{end}} - {{if .Repository.UnitEnabled $.UnitTypeExternalTracker}} + {{if .Permission.CanAccess $.UnitTypeExternalTracker}} {{.i18n.Tr "repo.issues"}} {{end}} - {{if .Repository.AllowsPulls}} + {{if and .Repository.CanEnablePulls (.Permission.CanAccess $.UnitTypePullRequests)}} {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} {{end}} - {{if and (.Repository.UnitEnabled $.UnitTypeReleases) (not .IsBareRepo) }} + {{if and (.Permission.CanAccess $.UnitTypeReleases) (not .IsBareRepo) }} {{.i18n.Tr "repo.releases"}} {{.Repository.NumReleases}} {{end}} - {{if or (.Repository.UnitEnabled $.UnitTypeWiki) (.Repository.UnitEnabled $.UnitTypeExternalWiki)}} - + {{if or (.Permission.CanAccess $.UnitTypeWiki) (.Permission.CanAccess $.UnitTypeExternalWiki)}} + {{.i18n.Tr "repo.wiki"}} {{end}} - {{if and (.Repository.AnyUnitEnabled $.UnitTypePullRequests $.UnitTypeIssues $.UnitTypeReleases) (not .IsBareRepo)}} + {{if and (.Permission.CanAccessAny $.UnitTypePullRequests $.UnitTypeIssues $.UnitTypeReleases) (not .IsBareRepo)}} {{.i18n.Tr "repo.activity"}} @@ -91,7 +91,7 @@ {{template "custom/extra_tabs" .}} - {{if .IsRepositoryAdmin}} + {{if .Permission.IsAdmin}}
{{.i18n.Tr "repo.settings"}} diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 3e69506c0a05..0a5886381d42 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -25,9 +25,9 @@
{{range .Topics}}{{.Name}}{{end}} - {{if .IsRepositoryAdmin}}{{.i18n.Tr "repo.topic.manage_topics"}}{{end}} + {{if .Permission.IsAdmin}}{{.i18n.Tr "repo.topic.manage_topics"}}{{end}}
- {{if .IsRepositoryAdmin}} + {{if .Permission.IsAdmin}}