Skip to content

Commit 2aa6268

Browse files
committed
Various corrections
1 parent d8e8b8e commit 2aa6268

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

models/lfs_lock.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"time"
1313

1414
api "code.gitea.io/sdk/gitea"
15+
"github.com/ngaut/log"
1516
)
1617

1718
// LFSLock represents a git lfs lock of repository.
@@ -34,11 +35,12 @@ func (l *LFSLock) BeforeInsert() {
3435

3536
// AfterLoad is invoked from XORM after setting the values of all fields of this object.
3637
func (l *LFSLock) AfterLoad() {
38+
var err error
3739
l.Owner, err = GetUserByID(l.OwnerID)
3840
if err != nil {
3941
log.Error(2, "LFS lock AfterLoad failed OwnerId[%d] not found: %v", l.OwnerID, err)
4042
}
41-
l.Repo, _ = GetRepositoryByID(l.RepoID)
43+
l.Repo, err = GetRepositoryByID(l.RepoID)
4244
if err != nil {
4345
log.Error(2, "LFS lock AfterLoad failed RepoId[%d] not found: %v", l.RepoID, err)
4446
}
@@ -140,7 +142,7 @@ func CheckLFSAccessForRepo(u *User, repo *Repository, mode AccessMode) error {
140142
if err != nil {
141143
return err
142144
} else if !has {
143-
return ErrLFSUnauthorizedAction{repo.ID, u.DisplayName(), reqWrt}
145+
return ErrLFSUnauthorizedAction{repo.ID, u.DisplayName(), mode}
144146
}
145147
return nil
146148
}

modules/lfs/locks.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func GetListLockHandler(ctx *context.Context) {
7272
}
7373
ctx.Resp.Header().Set("Content-Type", metaMediaType)
7474

75-
err := models.CheckLFSAccessForRepo(ctx.User, ctx.Repo.Repository, true)
75+
err := models.CheckLFSAccessForRepo(ctx.User, ctx.Repo.Repository, models.AccessModeRead)
7676
if err != nil {
7777
if models.IsErrLFSUnauthorizedAction(err) {
7878
ctx.Resp.Header().Set("WWW-Authenticate", "Basic realm=gitea-lfs")
@@ -180,7 +180,7 @@ func VerifyLockHandler(ctx *context.Context) {
180180

181181
ctx.Resp.Header().Set("Content-Type", metaMediaType)
182182

183-
err := models.CheckLFSAccessForRepo(ctx.User, ctx.Repo.Repository, true)
183+
err := models.CheckLFSAccessForRepo(ctx.User, ctx.Repo.Repository, models.AccessModeWrite)
184184
if err != nil {
185185
if models.IsErrLFSUnauthorizedAction(err) {
186186
ctx.Resp.Header().Set("WWW-Authenticate", "Basic realm=gitea-lfs")

0 commit comments

Comments
 (0)