Skip to content
Snippets Groups Projects
Unverified Commit bc8c2276 authored by Maksim Nabokikh's avatar Maksim Nabokikh Committed by GitHub
Browse files

Fail if OIDC config contains hosted domains (#2937)

parent 34a8aa23
No related branches found
No related tags found
No related merge requests found
...@@ -35,6 +35,14 @@ type Config struct { ...@@ -35,6 +35,14 @@ type Config struct {
Scopes []string `json:"scopes"` // defaults to "profile" and "email" Scopes []string `json:"scopes"` // defaults to "profile" and "email"
// HostedDomains was an optional list of whitelisted domains when using the OIDC connector with Google.
// Only users from a whitelisted domain were allowed to log in.
// Support for this option was removed from the OIDC connector.
// Consider switching to the Google connector which supports this option.
//
// Deprecated: will be removed in future releases.
HostedDomains []string `json:"hostedDomains"`
// Certificates for SSL validation // Certificates for SSL validation
RootCAs []string `json:"rootCAs"` RootCAs []string `json:"rootCAs"`
...@@ -112,6 +120,10 @@ func knownBrokenAuthHeaderProvider(issuerURL string) bool { ...@@ -112,6 +120,10 @@ func knownBrokenAuthHeaderProvider(issuerURL string) bool {
// Open returns a connector which can be used to login users through an upstream // Open returns a connector which can be used to login users through an upstream
// OpenID Connect provider. // OpenID Connect provider.
func (c *Config) Open(id string, logger log.Logger) (conn connector.Connector, err error) { func (c *Config) Open(id string, logger log.Logger) (conn connector.Connector, err error) {
if len(c.HostedDomains) > 0 {
return nil, fmt.Errorf("support for the Hosted domains option had been deprecated and removed, consider switching to the Google connector")
}
httpClient, err := httpclient.NewHTTPClient(c.RootCAs, c.InsecureSkipVerify) httpClient, err := httpclient.NewHTTPClient(c.RootCAs, c.InsecureSkipVerify)
if err != nil { if err != nil {
return nil, err return nil, err
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment