inching forward with oidc idp

internal/api/client/auth/auth.go

@@ -26,6 +26,7 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/oauth"
+	"github.com/superseriousbusiness/gotosocial/internal/oidc"
 	"github.com/superseriousbusiness/gotosocial/internal/router"
 )
 
@@ -36,6 +37,8 @@ const (
 	OauthTokenPath = "/oauth/token"
 	// OauthAuthorizePath is the API path for authorization requests (eg., authorize this app to act on my behalf as a user)
 	OauthAuthorizePath = "/oauth/authorize"
+	// CallbackPath is the API path for receiving callback tokens from external OIDC providers
+	CallbackPath = "/auth/callback"
 
 	sessionUserID       = "userid"
 	sessionClientID     = "client_id"
@@ -61,15 +64,17 @@ type Module struct {
 	config *config.Config
 	db     db.DB
 	server oauth.Server
+	idp    oidc.IDP
 	log    *logrus.Logger
 }
 
 // New returns a new auth module
-func New(config *config.Config, db db.DB, server oauth.Server, log *logrus.Logger) api.ClientModule {
+func New(config *config.Config, db db.DB, server oauth.Server, idp oidc.IDP, log *logrus.Logger) api.ClientModule {
 	return &Module{
 		config: config,
 		db:     db,
 		server: server,
+		idp:    idp,
 		log:    log,
 	}
 }

internal/api/client/auth/callback.go

@@ -0,0 +1,21 @@
+/*
+   GoToSocial
+   Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Affero General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package auth
+
+

internal/cliactions/server/server.go

@@ -42,6 +42,7 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/media"
 	"github.com/superseriousbusiness/gotosocial/internal/oauth"
+	"github.com/superseriousbusiness/gotosocial/internal/oidc"
 	"github.com/superseriousbusiness/gotosocial/internal/processing"
 	"github.com/superseriousbusiness/gotosocial/internal/router"
 	timelineprocessing "github.com/superseriousbusiness/gotosocial/internal/timeline"
@@ -121,8 +122,13 @@ var Start cliactions.GTSAction = func(ctx context.Context, c *config.Config, log
 		return fmt.Errorf("error starting processor: %s", err)
 	}
 
+	idp, err := oidc.NewIDP(c)
+	if err != nil {
+		return fmt.Errorf("error creating oidc idp: %s", err)
+	}
+
 	// build client api modules
-	authModule := auth.New(c, dbService, oauthServer, log)
+	authModule := auth.New(c, dbService, oauthServer, idp, log)
 	accountModule := account.New(c, processor, log)
 	instanceModule := instance.New(c, processor, log)
 	appsModule := app.New(c, processor, log)

internal/cliactions/testrig/testrig.go

@@ -37,6 +37,7 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/cliactions"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/gotosocial"
+	"github.com/superseriousbusiness/gotosocial/internal/oidc"
 	"github.com/superseriousbusiness/gotosocial/internal/web"
 	"github.com/superseriousbusiness/gotosocial/testrig"
 )
@@ -66,8 +67,13 @@ var Start cliactions.GTSAction = func(ctx context.Context, _ *config.Config, log
 		return fmt.Errorf("error starting processor: %s", err)
 	}
 
+	idp, err := oidc.NewIDP(c)
+	if err != nil {
+		return fmt.Errorf("error creating oidc idp: %s", err)
+	}
+
 	// build client api modules
-	authModule := auth.New(c, dbService, oauthServer, log)
+	authModule := auth.New(c, dbService, oauthServer, idp, log)
 	accountModule := account.New(c, processor, log)
 	instanceModule := instance.New(c, processor, log)
 	appsModule := app.New(c, processor, log)

internal/config/default.go

@@ -1,5 +1,7 @@
 package config
 
+import "github.com/coreos/go-oidc/v3/oidc"
+
 // TestDefault returns a default config for testing
 func TestDefault() *Config {
 	defaults := GetTestDefaults()
@@ -52,6 +54,16 @@ func TestDefault() *Config {
 			CertDir:      defaults.LetsEncryptCertDir,
 			EmailAddress: defaults.LetsEncryptEmailAddress,
 		},
+		OIDCConfig: &OIDCConfig{
+			Enabled:          defaults.OIDCEnabled,
+			IDPID:            defaults.OIDCIdpID,
+			IDPName:          defaults.OIDCIdpName,
+			SkipVerification: defaults.OIDCSkipVerification,
+			Issuer:           defaults.OIDCIssuer,
+			ClientID:         defaults.OIDCClientID,
+			ClientSecret:     defaults.OIDCClientSecret,
+			Scopes:           defaults.OIDCScopes,
+		},
 	}
 }
 
@@ -107,6 +119,16 @@ func Default() *Config {
 			CertDir:      defaults.LetsEncryptCertDir,
 			EmailAddress: defaults.LetsEncryptEmailAddress,
 		},
+		OIDCConfig: &OIDCConfig{
+			Enabled:          defaults.OIDCEnabled,
+			IDPID:            defaults.OIDCIdpID,
+			IDPName:          defaults.OIDCIdpName,
+			SkipVerification: defaults.OIDCSkipVerification,
+			Issuer:           defaults.OIDCIssuer,
+			ClientID:         defaults.OIDCClientID,
+			ClientSecret:     defaults.OIDCClientSecret,
+			Scopes:           defaults.OIDCScopes,
+		},
 	}
 }
 
@@ -157,6 +179,15 @@ func GetDefaults() Defaults {
 		LetsEncryptEnabled:      true,
 		LetsEncryptCertDir:      "/gotosocial/storage/certs",
 		LetsEncryptEmailAddress: "",
+
+		OIDCEnabled:          false,
+		OIDCIdpID:            "",
+		OIDCIdpName:          "",
+		OIDCSkipVerification: false,
+		OIDCIssuer:           "",
+		OIDCClientID:         "",
+		OIDCClientSecret:     "",
+		OIDCScopes:           []string{oidc.ScopeOpenID, "profile", "email", "groups"},
 	}
 }
 

internal/oidc/oidc.go

@@ -0,0 +1,76 @@
+package oidc
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/coreos/go-oidc/v3/oidc"
+	"github.com/superseriousbusiness/gotosocial/internal/config"
+	"golang.org/x/oauth2"
+)
+
+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 {
+}
+
+type idp struct {
+	oauth2Config    oauth2.Config
+	provider        *oidc.Provider
+	idTokenVerifier *oidc.IDTokenVerifier
+}
+
+func NewIDP(config *config.Config) (IDP, error) {
+
+	// oidc isn't enabled so we don't need to do anything
+	if !config.OIDCConfig.Enabled {
+		return nil, nil
+	}
+
+	// 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")
+	}
+
+	aaaaaaaaaaaaaaaaaaaaaaaaaaaa
+
+
+	provider, err := oidc.NewProvider(context.Background(), config.OIDCConfig.Issuer)
+	if err != nil {
+		return nil, err
+	}
+
+	oauth2Config := oauth2.Config{
+		// client_id and client_secret of the client.
+		ClientID:     config.OIDCConfig.ClientID,
+		ClientSecret: config.OIDCConfig.ClientSecret,
+
+		// The redirectURL.
+		RedirectURL: fmt.Sprintf("%s://%s%s", config.Protocol, config.Host, CallbackPath),
+
+		// Discovery returns the OAuth2 endpoints.
+		Endpoint: provider.Endpoint(),
+
+		// "openid" is a required scope for OpenID Connect flows.
+		//
+		// Other scopes, such as "groups" can be requested.
+		Scopes: config.OIDCConfig.Scopes,
+	}
+
+	idTokenVerifier := provider.Verifier(&oidc.Config{ClientID: config.OIDCConfig.ClientID})
+
+	return &idp{
+		oauth2Config:    oauth2Config,
+		idTokenVerifier: idTokenVerifier,
+	}, nil
+}