Skip to content

Commit c18e689

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

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

pkg/auth/user.go

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

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

0 commit comments

Comments
 (0)