Skip to content

fix incorrectly extracting domain from empty email in oidc #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix incorrectly extracting domain from empty email in oidc #83

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions internal/auth/oidc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ package auth

import (
"context"
"errors"
"fmt"
"github.com/jsiebens/ionscale/internal/config"
"strings"

"github.com/jsiebens/ionscale/internal/config"

"github.com/coreos/go-oidc/v3/oidc"
"golang.org/x/oauth2"
)
Expand Down Expand Up @@ -75,7 +77,7 @@ func (p *OIDCProvider) Exchange(redirectURI, code string) (*User, error) {
return nil, err
}

sub, email, tokenClaims, err := p.getTokenClaims(idToken)
sub, tokenClaims, err := p.getTokenClaims(idToken)
if err != nil {
return nil, err
}
Expand All @@ -85,6 +87,18 @@ func (p *OIDCProvider) Exchange(redirectURI, code string) (*User, error) {
return nil, err
}

var email string
if v, ok := userInfoClaims["email"]; ok {
email, ok = v.(string)
if !ok {
return nil, fmt.Errorf("failed to convert email into string: %v", email)
}
}

if email == "" {
return nil, errors.New("userinfo does not contain email, please check scopes")
}

domain := strings.Split(email, "@")[1]

return &User{
Expand All @@ -99,24 +113,23 @@ func (p *OIDCProvider) Exchange(redirectURI, code string) (*User, error) {
}, nil
}

func (p *OIDCProvider) getTokenClaims(idToken *oidc.IDToken) (string, string, map[string]interface{}, error) {
func (p *OIDCProvider) getTokenClaims(idToken *oidc.IDToken) (string, map[string]interface{}, error) {
var raw = make(map[string]interface{})
var claims struct {
Sub string `json:"sub"`
Email string `json:"email"`
Sub string `json:"sub"`
}

// Extract default claims.
if err := idToken.Claims(&claims); err != nil {
return "", "", nil, fmt.Errorf("failed to parse id_token claims: %v", err)
return "", nil, fmt.Errorf("failed to parse id_token claims: %v", err)
}

// Extract raw claims.
if err := idToken.Claims(&raw); err != nil {
return "", "", nil, fmt.Errorf("failed to parse id_token claims: %v", err)
return "", nil, fmt.Errorf("failed to parse id_token claims: %v", err)
}

return claims.Sub, claims.Email, raw, nil
return claims.Sub, raw, nil
}

func (p *OIDCProvider) getUserInfoClaims(config oauth2.Config, token *oauth2.Token) (map[string]interface{}, error) {
Expand Down