Skip to content

Fix user retrieved from token late #33786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix user retrieved from token late #33786

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c919c01
Fix nil user
thoscut Feb 25, 2025
fe1be72
Merge branch 'go-gitea:main' into patch-1
thoscut Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions services/lfs/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,14 @@ func authenticate(ctx *context.Context, repository *repo_model.Repository, autho
return accessMode <= perm_model.AccessModeWrite
}

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

// ctx.IsSigned is unnecessary here, this will be checked in perm.CanAccess
perm, err := access_model.GetUserRepoPermission(ctx, repository, ctx.Doer)
if err != nil {
Expand All @@ -545,13 +553,6 @@ func authenticate(ctx *context.Context, repository *repo_model.Repository, autho
return true
}

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

Expand Down
Loading