k-space/dex
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Activity

Merge pull request #1000 from rithujohn191/fix-hosted-domain

Browse Source 
connector/oidc: fix hosted domain support.
This commit is contained in:
rithu leena john 2017-07-31 13:29:26 -07:00 committed by GitHub
commit 05e8d50eca
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
connector/oidc/oidc.go
View File

@ -35,7 +35,7 @@ type Config struct {
// Optional list of whitelisted domains when using Google // Optional list of whitelisted domains when using Google
// If this field is nonempty, only users from a listed domain will be allowed to log in // If this field is nonempty, only users from a listed domain will be allowed to log in
HostedDomains []string `json:"hostedDomain"` HostedDomains []string `json:"hostedDomains"`
} }
// Domains that don't support basic auth. golang.org/x/oauth2 has an internal // Domains that don't support basic auth. golang.org/x/oauth2 has an internal
@ -198,7 +198,7 @@ func (c *oidcConnector) HandleCallback(s connector.Scopes, r *http.Request) (ide
if len(c.hostedDomains) > 0 { if len(c.hostedDomains) > 0 {
found := false found := false
for _, domain := range c.hostedDomains { for _, domain := range c.hostedDomains {
if claims.HostedDomain != domain { if claims.HostedDomain == domain {
found = true found = true
break break
} }

3
examples/config-dev.yaml
View File

@ -67,7 +67,8 @@ connectors:
# clientID: $GOOGLE_CLIENT_ID # clientID: $GOOGLE_CLIENT_ID
# clientSecret: $GOOGLE_CLIENT_SECRET # clientSecret: $GOOGLE_CLIENT_SECRET
# redirectURI: http://127.0.0.1:5556/dex/callback # redirectURI: http://127.0.0.1:5556/dex/callback
# hostedDomain: $GOOGLE_HOSTED_DOMAIN # hostedDomains:
# - $GOOGLE_HOSTED_DOMAIN
# Let dex keep a list of passwords which can be used to login to dex. # Let dex keep a list of passwords which can be used to login to dex.
enablePasswordDB: true enablePasswordDB: true