beenull/sftpgo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OIDC: add profile and email scope to OAuth2 config

Browse source 
Fixes #728

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino 2022-02-22 10:20:14 +01:00
parent 8bbf54d2b6
commit 670018f05e
No known key found for this signature in database
GPG key ID: 2F1FB59433D5A8CB
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
httpd/oidc.go
View file

@ -137,7 +137,7 @@ func (o *OIDC) initialize() error {
ClientSecret: o.ClientSecret,
Endpoint: o.provider.Endpoint(),
RedirectURL: o.getRedirectURL(),
Scopes: []string{oidc.ScopeOpenID},
Scopes: []string{oidc.ScopeOpenID, "profile", "email"},
}
return nil
@ -175,8 +175,17 @@ type oidcToken struct {
}
func (t *oidcToken) parseClaims(claims map[string]interface{}, usernameField, roleField string) error {
getClaimsFields := func() []string {
keys := make([]string, 0, len(claims))
for k := range claims {
keys = append(keys, k)
}
return keys
}
username, ok := claims[usernameField].(string)
if !ok || username == "" {
logger.Warn(logSender, "", "username field %#v not found, claims fields: %+v", usernameField, getClaimsFields())
return errors.New("no username field")
}
t.Username = username

2
httpd/oidc_test.go
View file

@ -261,7 +261,7 @@ func TestOIDCLoginLogout(t *testing.T) {
Nonce: authReq.Nonce,
Expiry: time.Now().Add(5 * time.Minute),
}
setIDTokenClaims(idToken, []byte(`{}`))
setIDTokenClaims(idToken, []byte(`{"aud": "my_client_id"}`))
server.binding.OIDC.verifier = &mockOIDCVerifier{
err: nil,
token: idToken,