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

Requester/authn: check the interface for nil value to avoid false positives (#90210)

Browse Source
This commit is contained in:
Charandas 2024-07-08 16:30:03 -07:00 committed by GitHub
parent 5ae5fa3a7a
commit 3eef9b3397
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/apimachinery/identity/context.go
View File

@ -3,6 +3,7 @@ package identity
import ( import (
"context" "context"
"fmt" "fmt"
"reflect"
) )
type ctxUserKey struct{} type ctxUserKey struct{}
@ -16,8 +17,12 @@ func WithRequester(ctx context.Context, usr Requester) context.Context {
func GetRequester(ctx context.Context) (Requester, error) { func GetRequester(ctx context.Context) (Requester, error) {
// Set by appcontext.WithUser // Set by appcontext.WithUser
u, ok := ctx.Value(ctxUserKey{}).(Requester) u, ok := ctx.Value(ctxUserKey{}).(Requester)
if ok && u != nil { if ok && !checkNilRequester(u) {
return u, nil return u, nil
} }
return nil, fmt.Errorf("a Requester was not found in the context") return nil, fmt.Errorf("a Requester was not found in the context")
} }
func checkNilRequester(r Requester) bool {
return r == nil || (reflect.ValueOf(r).Kind() == reflect.Ptr && reflect.ValueOf(r).IsNil())
}