OCPBUGS-64943: Make GetUserFromRequestContext more nil safe

TheRealJon · TheRealJon · commit afff9b4d655c · 2025-11-11T09:39:54.000-05:00
diff --git a/pkg/auth/user.go b/pkg/auth/user.go
@@ -9,9 +9,8 @@ const (
 )
 
 func GetUserFromRequestContext(r *http.Request) *User {
-	user, ok := r.Context().Value(UserContextKey).(*User)
-	if !ok {
-		return nil
+	if user, ok := r.Context().Value(UserContextKey); ok {
+		return user.(*User)
 	}
-	return user
+	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,8 @@ const (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func GetUserFromRequestContext(r http.Request) User {`
`12`		`- user, ok := r.Context().Value(UserContextKey).(*User)`
`13`		`- if !ok {`
`14`		`- return nil`
	`12`	`+ if user, ok := r.Context().Value(UserContextKey); ok {`
	`13`	`+ return user.(*User)`
`15`	`14`	`}`
`16`		`- return user`
	`15`	`+ return nil`
`17`	`16`	`}`