Skip to content

Commit 7baea63

Browse files
committed
OCPBUGS-64943: Make GetUserFromRequestContext more nil safe
1 parent dca91cd commit 7baea63

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

pkg/auth/user.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,17 @@ const (
99
)
1010

1111
func GetUserFromRequestContext(r *http.Request) *User {
12-
user, ok := r.Context().Value(UserContextKey).(*User)
13-
if !ok {
12+
if r == nil {
1413
return nil
1514
}
16-
return user
15+
16+
userValue := r.Context().Value(UserContextKey)
17+
if userValue == nil {
18+
return nil
19+
}
20+
21+
if user, ok := userValue.(*User); ok {
22+
return user
23+
}
24+
return nil
1725
}

0 commit comments

Comments
 (0)