Nemcio/Gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2025-12-20 15:20:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

models/access: hasAccess only need userID not user object

Browse Source
This commit is contained in:
Unknwon
2017-02-23 16:15:25 -05:00
parent 3c0d162961
commit b78e03934d
14 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/serv.go
View File

@@ -199,7 +199,7 @@ func runServ(c *cli.Context) error {
fail("Internal error", "Fail to get user by key ID '%d': %v", key.ID, err) fail("Internal error", "Fail to get user by key ID '%d': %v", key.ID, err)
} }
mode, err := models.AccessLevel(user, repo) mode, err := models.AccessLevel(user.ID, repo)
if err != nil { if err != nil {
fail("Internal error", "Fail to check access: %v", err) fail("Internal error", "Fail to check access: %v", err)
} }

2
gogs.go
View File

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

30
models/access.go
View File

@@ -57,41 +57,45 @@ type Access struct {
Mode AccessMode Mode AccessMode
} }
func accessLevel(e Engine, u *User, repo *Repository) (AccessMode, error) { func accessLevel(e Engine, userID int64, repo *Repository) (AccessMode, error) {
mode := ACCESS_MODE_NONE mode := ACCESS_MODE_NONE
// Everyone has read access to public repository
if !repo.IsPrivate { if !repo.IsPrivate {
mode = ACCESS_MODE_READ mode = ACCESS_MODE_READ
} }
if u == nil { if userID <= 0 {
return mode, nil return mode, nil
} }
if u.ID == repo.OwnerID { if userID == repo.OwnerID {
return ACCESS_MODE_OWNER, nil return ACCESS_MODE_OWNER, nil
} }
a := &Access{UserID: u.ID, RepoID: repo.ID} access := &Access{
if has, err := e.Get(a); !has || err != nil { UserID: userID,
RepoID: repo.ID,
}
if has, err := e.Get(access); !has || err != nil {
return mode, err return mode, err
} }
return a.Mode, nil return access.Mode, nil
} }
// AccessLevel returns the Access a user has to a repository. Will return NoneAccess if the // AccessLevel returns the Access a user has to a repository. Will return NoneAccess if the
// user does not have access. User can be nil! // user does not have access.
func AccessLevel(u *User, repo *Repository) (AccessMode, error) { func AccessLevel(userID int64, repo *Repository) (AccessMode, error) {
return accessLevel(x, u, repo) return accessLevel(x, userID, repo)
} }
func hasAccess(e Engine, u *User, repo *Repository, testMode AccessMode) (bool, error) { func hasAccess(e Engine, userID int64, repo *Repository, testMode AccessMode) (bool, error) {
mode, err := accessLevel(e, u, repo) mode, err := accessLevel(e, userID, repo)
return mode >= testMode, err return mode >= testMode, err
} }
// HasAccess returns true if someone has the request access level. User can be nil! // HasAccess returns true if someone has the request access level. User can be nil!
func HasAccess(u *User, repo *Repository, testMode AccessMode) (bool, error) { func HasAccess(userID int64, repo *Repository, testMode AccessMode) (bool, error) {
return hasAccess(x, u, repo, testMode) return hasAccess(x, userID, repo, testMode)
} }
// GetRepositoryAccesses finds all repositories with their access mode where a user has access but does not own. // GetRepositoryAccesses finds all repositories with their access mode where a user has access but does not own.

2
models/issue.go
View File

@@ -618,7 +618,7 @@ func newIssue(e *xorm.Session, opts NewIssueOptions) (err error) {
// Assume assignee is invalid and drop silently. // Assume assignee is invalid and drop silently.
opts.Issue.AssigneeID = 0 opts.Issue.AssigneeID = 0
if assignee != nil { if assignee != nil {
valid, err := hasAccess(e, assignee, opts.Repo, ACCESS_MODE_READ) valid, err := hasAccess(e, assignee.ID, opts.Repo, ACCESS_MODE_READ)
if err != nil { if err != nil {
return fmt.Errorf("hasAccess [user_id: %d, repo_id: %d]: %v", assignee.ID, opts.Repo.ID, err) return fmt.Errorf("hasAccess [user_id: %d, repo_id: %d]: %v", assignee.ID, opts.Repo.ID, err)
} }

6
models/org_team.go
View File

@@ -166,15 +166,15 @@ func (t *Team) removeRepository(e Engine, repo *Repository, recalculate bool) (e
if err = t.getMembers(e); err != nil { if err = t.getMembers(e); err != nil {
return fmt.Errorf("get team members: %v", err) return fmt.Errorf("get team members: %v", err)
} }
for _, u := range t.Members { for _, member := range t.Members {
has, err := hasAccess(e, u, repo, ACCESS_MODE_READ) has, err := hasAccess(e, member.ID, repo, ACCESS_MODE_READ)
if err != nil { if err != nil {
return err return err
} else if has { } else if has {
continue continue
} }
if err = watchRepo(e, u.ID, repo.ID, false); err != nil { if err = watchRepo(e, member.ID, repo.ID, false); err != nil {
return err return err
} }
} }

4
models/repo.go
View File

@@ -419,8 +419,8 @@ func (repo *Repository) ComposeCompareURL(oldCommitID, newCommitID string) strin
return fmt.Sprintf("%s/%s/compare/%s...%s", repo.MustOwner().Name, repo.Name, oldCommitID, newCommitID) return fmt.Sprintf("%s/%s/compare/%s...%s", repo.MustOwner().Name, repo.Name, oldCommitID, newCommitID)
} }
func (repo *Repository) HasAccess(u *User) bool { func (repo *Repository) HasAccess(userID int64) bool {
has, _ := HasAccess(u, repo, ACCESS_MODE_READ) has, _ := HasAccess(userID, repo, ACCESS_MODE_READ)
return has return has
} }

2
models/ssh_key.go
View File

@@ -736,7 +736,7 @@ func DeleteDeployKey(doer *User, id int64) error {
if err != nil { if err != nil {
return fmt.Errorf("GetRepositoryByID: %v", err) return fmt.Errorf("GetRepositoryByID: %v", err)
} }
yes, err := HasAccess(doer, repo, ACCESS_MODE_ADMIN) yes, err := HasAccess(doer.ID, repo, ACCESS_MODE_ADMIN)
if err != nil { if err != nil {
return fmt.Errorf("HasAccess: %v", err) return fmt.Errorf("HasAccess: %v", err)
} else if !yes { } else if !yes {

10
models/user.go
View File

@@ -385,18 +385,18 @@ func (u *User) DeleteAvatar() error {
// IsAdminOfRepo returns true if user has admin or higher access of repository. // IsAdminOfRepo returns true if user has admin or higher access of repository.
func (u *User) IsAdminOfRepo(repo *Repository) bool { func (u *User) IsAdminOfRepo(repo *Repository) bool {
has, err := HasAccess(u, repo, ACCESS_MODE_ADMIN) has, err := HasAccess(u.ID, repo, ACCESS_MODE_ADMIN)
if err != nil { if err != nil {
log.Error(3, "HasAccess: %v", err) log.Error(2, "HasAccess: %v", err)
} }
return has return has
} }
// IsWriterOfRepo returns true if user has write access to given repository. // IsWriterOfRepo returns true if user has write access to given repository.
func (u *User) IsWriterOfRepo(repo *Repository) bool { func (u *User) IsWriterOfRepo(repo *Repository) bool {
has, err := HasAccess(u, repo, ACCESS_MODE_WRITE) has, err := HasAccess(u.ID, repo, ACCESS_MODE_WRITE)
if err != nil { if err != nil {
log.Error(3, "HasAccess: %v", err) log.Error(2, "HasAccess: %v", err)
} }
return has return has
} }
@@ -911,7 +911,7 @@ func GetUserByID(id int64) (*User, error) {
// GetAssigneeByID returns the user with write access of repository by given ID. // GetAssigneeByID returns the user with write access of repository by given ID.
func GetAssigneeByID(repo *Repository, userID int64) (*User, error) { func GetAssigneeByID(repo *Repository, userID int64) (*User, error) {
has, err := HasAccess(&User{ID: userID}, repo, ACCESS_MODE_READ) has, err := HasAccess(userID, repo, ACCESS_MODE_READ)
if err != nil { if err != nil {
return nil, err return nil, err
} else if !has { } else if !has {

6
modules/context/repo.go
View File

@@ -206,7 +206,11 @@ func RepoAssignment(args ...bool) macaron.Handler {
if ctx.IsSigned && ctx.User.IsAdmin { if ctx.IsSigned && ctx.User.IsAdmin {
ctx.Repo.AccessMode = models.ACCESS_MODE_OWNER ctx.Repo.AccessMode = models.ACCESS_MODE_OWNER
} else { } else {
mode, err := models.AccessLevel(ctx.User, repo) var userID int64
if ctx.IsSigned {
userID = ctx.User.ID
}
mode, err := models.AccessLevel(userID, repo)
if err != nil { if err != nil {
ctx.Handle(500, "AccessLevel", err) ctx.Handle(500, "AccessLevel", err)
return return

2
routers/api/v1/api.go
View File

@@ -65,7 +65,7 @@ func repoAssignment() macaron.Handler {
if ctx.IsSigned && ctx.User.IsAdmin { if ctx.IsSigned && ctx.User.IsAdmin {
ctx.Repo.AccessMode = models.ACCESS_MODE_OWNER ctx.Repo.AccessMode = models.ACCESS_MODE_OWNER
} else { } else {
mode, err := models.AccessLevel(ctx.User, repo) mode, err := models.AccessLevel(ctx.User.ID, repo)
if err != nil { if err != nil {
ctx.Error(500, "AccessLevel", err) ctx.Error(500, "AccessLevel", err)
return return

2
routers/repo/http.go
View File

@@ -127,7 +127,7 @@ func HTTPContexter() macaron.Handler {
if isPull { if isPull {
mode = models.ACCESS_MODE_READ mode = models.ACCESS_MODE_READ
} }
has, err := models.HasAccess(authUser, repo, mode) has, err := models.HasAccess(authUser.ID, repo, mode)
if err != nil { if err != nil {
ctx.Handle(http.StatusInternalServerError, "HasAccess", err) ctx.Handle(http.StatusInternalServerError, "HasAccess", err)
return return

2
routers/repo/pull.go
View File

@@ -49,7 +49,7 @@ func getForkRepository(ctx *context.Context) *models.Repository {
return nil return nil
} }
if !forkRepo.CanBeForked() || !forkRepo.HasAccess(ctx.User) { if !forkRepo.CanBeForked() || !forkRepo.HasAccess(ctx.User.ID) {
ctx.Handle(404, "getForkRepository", nil) ctx.Handle(404, "getForkRepository", nil)
return nil return nil
} }

2
routers/user/home.go
View File

@@ -293,7 +293,7 @@ func Issues(ctx *context.Context) {
} }
// Check if user has access to given repository. // Check if user has access to given repository.
if !repo.IsOwnedBy(ctxUser.ID) && !repo.HasAccess(ctxUser) { if !repo.IsOwnedBy(ctxUser.ID) && !repo.HasAccess(ctxUser.ID) {
ctx.Handle(404, "Issues", fmt.Errorf("#%d", repoID)) ctx.Handle(404, "Issues", fmt.Errorf("#%d", repoID))
return return
} }

2
templates/.VERSION
View File

@@ -1 +1 @@
0.9.166.0223 / 0.10 RC 0.9.167.0223 / 0.10 RC