mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-19 12:13:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

further oidc

Browse source
This commit is contained in:
tsmethurst 2021-07-22 11:52:17 +02:00
commit 81206d93f3
14 changed files with 227 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/oidc/claims.go
View file

@ -20,6 +20,8 @@ package oidc
// Claims represents claims as found in an id_token returned from an OIDC flow.
type Claims struct {
Email string `json:"email"`
Groups []string `json:"groups"`
Email string `json:"email"`
EmailVerified bool `json:"email_verified"`
Groups []string `json:"groups"`
Name string `json:"name"`
}

13
internal/oidc/handlecallback.go
View file

@ -24,13 +24,8 @@ import (
"fmt"
)
func (i *idp) HandleCallback(ctx context.Context, state string, code string) (*Claims, error) {
func (i *idp) HandleCallback(ctx context.Context, code string) (*Claims, error) {
l := i.log.WithField("func", "HandleCallback")
if state == "" {
return nil, errors.New("state was empty string")
}
if code == "" {
return nil, errors.New("code was empty string")
}
@ -48,7 +43,7 @@ func (i *idp) HandleCallback(ctx context.Context, state string, code string) (*C
if !ok {
return nil, errors.New("no id_token in oauth2token")
}
l.Debug("raw id token: %s", rawIDToken)
l.Debugf("raw id token: %s", rawIDToken)
// Parse and verify ID Token payload.
l.Debug("verifying id_token")
@ -66,3 +61,7 @@ func (i *idp) HandleCallback(ctx context.Context, state string, code string) (*C
return claims, nil
}
func (i *idp) AuthCodeURL(state string) string {
return i.oauth2Config.AuthCodeURL(state)
}

9
internal/oidc/idp.go
View file

@ -31,13 +31,11 @@ import (
const (
// CallbackPath is the API path for receiving callback tokens from external OIDC providers
CallbackPath = "/auth/callback"
profileScope = "profile"
emailScope = "email"
groupsScope = "groups"
)
type IDP interface {
HandleCallback(ctx context.Context, state string, code string) (*Claims, error)
HandleCallback(ctx context.Context, code string) (*Claims, error)
AuthCodeURL(state string) string
}
type idp struct {
@ -55,9 +53,6 @@ func NewIDP(config *config.Config, log *logrus.Logger) (IDP, error) {
}
// validate config fields
if config.OIDCConfig.IDPID == "" {
return nil, fmt.Errorf("not set: IDPID")
}
if config.OIDCConfig.IDPName == "" {
return nil, fmt.Errorf("not set: IDPName")
}