Skip to content

Commit 872de85

Browse files
committed
Migrate to AccessMode
1 parent 4808e6c commit 872de85

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

models/lfs_lock.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,14 @@ func (l *LFSLock) BeforeInsert() {
3434

3535
// AfterLoad is invoked from XORM after setting the values of all fields of this object.
3636
func (l *LFSLock) AfterLoad() {
37-
l.Owner, _ = GetUserByID(l.OwnerID)
37+
l.Owner, err = GetUserByID(l.OwnerID)
38+
if err != nil {
39+
log.Error(2, "LFS lock AfterLoad failed OwnerId[%d] not found: %v", l.OwnerID, err)
40+
}
3841
l.Repo, _ = GetRepositoryByID(l.RepoID)
42+
if err != nil {
43+
log.Error(2, "LFS lock AfterLoad failed RepoId[%d] not found: %v", l.RepoID, err)
44+
}
3945
}
4046

4147
func cleanPath(p string) string {
@@ -56,7 +62,7 @@ func (l *LFSLock) APIFormat() *api.LFSLock {
5662

5763
// CreateLFSLock creates a new lock.
5864
func CreateLFSLock(lock *LFSLock) (*LFSLock, error) {
59-
err := CheckLFSAccessForRepo(lock.Owner, lock.Repo, true)
65+
err := CheckLFSAccessForRepo(lock.Owner, lock.Repo, AccessModeWrite)
6066
if err != nil {
6167
return nil, err
6268
}
@@ -112,7 +118,7 @@ func DeleteLFSLockByID(id int64, u *User, force bool) (*LFSLock, error) {
112118
return nil, err
113119
}
114120

115-
err = CheckLFSAccessForRepo(u, lock.Repo, true)
121+
err = CheckLFSAccessForRepo(u, lock.Repo, AccessModeWrite)
116122
if err != nil {
117123
return nil, err
118124
}
@@ -126,15 +132,10 @@ func DeleteLFSLockByID(id int64, u *User, force bool) (*LFSLock, error) {
126132
}
127133

128134
//CheckLFSAccessForRepo check needed access mode base on action
129-
func CheckLFSAccessForRepo(u *User, repo *Repository, reqWrt bool) error {
135+
func CheckLFSAccessForRepo(u *User, repo *Repository, mode AccessMode) error {
130136
if u == nil {
131-
return ErrLFSUnauthorizedAction{repo.ID, "undefined", reqWrt}
132-
}
133-
mode := AccessModeRead
134-
if reqWrt {
135-
mode = AccessModeWrite
137+
return ErrLFSUnauthorizedAction{repo.ID, "undefined", mode}
136138
}
137-
138139
has, err := HasAccess(u.ID, repo, mode)
139140
if err != nil {
140141
return err

0 commit comments

Comments
 (0)