IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Auth: Extend auth token errors with user ID (#54633)

Browse Source 
* add user ID to user token errors

* remove colon

* move user ID to debug log, so it wouldn't accidentally be added in response
This commit is contained in:
Ieva 2022-09-02 14:38:25 +01:00 committed by GitHub
parent a230439679
commit de6584b976
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/auth/auth_token.go
View File

@ -139,6 +139,7 @@ func (s *UserAuthTokenService) LookupToken(ctx context.Context, unhashedToken st
} }
if model.RevokedAt > 0 { if model.RevokedAt > 0 {
s.log.Debug("user token has been revoked", "user ID", model.UserId, "token ID", model.Id)
return nil, &models.TokenRevokedError{ return nil, &models.TokenRevokedError{
UserID: model.UserId, UserID: model.UserId,
TokenID: model.Id, TokenID: model.Id,
@ -146,6 +147,7 @@ func (s *UserAuthTokenService) LookupToken(ctx context.Context, unhashedToken st
} }
if model.CreatedAt <= s.createdAfterParam() || model.RotatedAt <= s.rotatedAfterParam() { if model.CreatedAt <= s.createdAfterParam() || model.RotatedAt <= s.rotatedAfterParam() {
s.log.Debug("user token has expired", "user ID", model.UserId, "token ID", model.Id)
return nil, &models.TokenExpiredError{ return nil, &models.TokenExpiredError{
UserID: model.UserId, UserID: model.UserId,
TokenID: model.Id, TokenID: model.Id,