Skip to content

Commit 0a3378e

Browse files
committed
fix(middleware): reject empty OIDC providers safely
1 parent 7ddd856 commit 0a3378e

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

‎pkg/middleware/oidc.go‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package middleware
22

33
import (
44
"context"
5+
"errors"
56
"net/http"
67
"strings"
78
"sync"
@@ -61,7 +62,10 @@ func OidcAuth(opts ...Option) func(http.Handler) http.Handler {
6162
provider, err = providerFunc()
6263
}
6364
initializeProviderLock.Unlock()
64-
if err != nil {
65+
if err != nil || provider == nil {
66+
if err == nil {
67+
err = errors.New("OIDC provider initialization returned nil")
68+
}
6569
opt.Logger.Error().Err(err).Msg("could not initialize OIDC provider")
6670
w.WriteHeader(http.StatusInternalServerError)
6771
return
@@ -82,6 +86,12 @@ func OidcAuth(opts ...Option) func(http.Handler) http.Handler {
8286
w.WriteHeader(http.StatusUnauthorized)
8387
return
8488
}
89+
if userInfo == nil {
90+
opt.Logger.Error().Msg("OIDC provider returned empty user info")
91+
w.Header().Add("WWW-Authenticate", `Bearer`)
92+
w.WriteHeader(http.StatusUnauthorized)
93+
return
94+
}
8595
claims := map[string]any{}
8696
err = userInfo.Claims(&claims)
8797
if err != nil {

0 commit comments

Comments
 (0)