Skip to content

Commit 38fd35c

Browse files
committed
apply feedback lfs auth
* todo tests
1 parent 6a70c6f commit 38fd35c

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

services/lfs/server.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -546,22 +546,21 @@ func authenticate(ctx *context.Context, repository *repo_model.Repository, autho
546546
accessMode = perm_model.AccessModeWrite
547547
}
548548

549-
var perm access_model.Permission
550-
var err error
551549
if ctx.Data["IsActionsToken"] == true {
552550
taskID := ctx.Data["ActionsTaskID"].(int64)
553-
perm, err = access_model.GetActionsUserRepoPermission(ctx, repository, ctx.Doer, taskID)
551+
perm, err := access_model.GetActionsUserRepoPermission(ctx, repository, ctx.Doer, taskID)
554552
if err != nil {
555553
log.Error("Unable to GetActionsUserRepoPermission for task[%d] Error: %v", taskID, err)
556554
return false
557555
}
558-
} else {
559-
// ctx.IsSigned is unnecessary here, this will be checked in perm.CanAccess
560-
perm, err = access_model.GetUserRepoPermission(ctx, repository, ctx.Doer)
561-
if err != nil {
562-
log.Error("Unable to GetUserRepoPermission for user %-v in repo %-v Error: %v", ctx.Doer, repository, err)
563-
return false
564-
}
556+
return perm.CanAccess(accessMode, unit.TypeCode)
557+
}
558+
559+
// ctx.IsSigned is unnecessary here, this will be checked in perm.CanAccess
560+
perm, err := access_model.GetUserRepoPermission(ctx, repository, ctx.Doer)
561+
if err != nil {
562+
log.Error("Unable to GetUserRepoPermission for user %-v in repo %-v Error: %v", ctx.Doer, repository, err)
563+
return false
565564
}
566565

567566
canRead := perm.CanAccess(accessMode, unit.TypeCode)

0 commit comments

Comments
 (0)