Skip to content

Commit c919c01

Browse files
authored
Fix nil user
1 parent 38ccc8e commit c919c01

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

services/lfs/server.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,14 @@ func authenticate(ctx *context.Context, repository *repo_model.Repository, autho
533533
return accessMode <= perm_model.AccessModeWrite
534534
}
535535

536+
user, err := parseToken(ctx, authorization, repository, accessMode)
537+
if err != nil {
538+
// Most of these are Warn level - the true internal server errors are logged in parseToken already
539+
log.Warn("Authentication failure for provided token with Error: %v", err)
540+
return false
541+
}
542+
ctx.Doer = user
543+
536544
// ctx.IsSigned is unnecessary here, this will be checked in perm.CanAccess
537545
perm, err := access_model.GetUserRepoPermission(ctx, repository, ctx.Doer)
538546
if err != nil {
@@ -545,13 +553,6 @@ func authenticate(ctx *context.Context, repository *repo_model.Repository, autho
545553
return true
546554
}
547555

548-
user, err := parseToken(ctx, authorization, repository, accessMode)
549-
if err != nil {
550-
// Most of these are Warn level - the true internal server errors are logged in parseToken already
551-
log.Warn("Authentication failure for provided token with Error: %v", err)
552-
return false
553-
}
554-
ctx.Doer = user
555556
return true
556557
}
557558

0 commit comments

Comments
 (0)