From 43ac0cdb9c4eea9d3c5eceb2c11b9e5b98b87b00 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Mon, 30 May 2022 13:41:24 +0100 Subject: [chore] Global server configuration overhaul (#575) * move config flag names and usage to config package, rewrite config package to use global Configuration{} struct Signed-off-by: kim * improved code comment Signed-off-by: kim * linter Signed-off-by: kim * fix unmarshaling Signed-off-by: kim * remove kim's custom go compiler changes Signed-off-by: kim * generate setter and flag-name functions, implement these in codebase Signed-off-by: kim * update deps Signed-off-by: kim * small change Signed-off-by: kim * appease the linter... Signed-off-by: kim * move configuration into ConfigState structure, ensure reloading to/from viper settings to keep in sync Signed-off-by: kim * lint Signed-off-by: kim * update code comments Signed-off-by: kim * fix merge issue Signed-off-by: kim * fix merge issue Signed-off-by: kim * improved version string (removes time + go version) Signed-off-by: kim * fix version string build to pass test script + consolidate logic in func Signed-off-by: kim * add license text, update config.Defaults comment Signed-off-by: kim * add license text to generated config helpers file Signed-off-by: kim * defer unlock on config.Set___(), to ensure unlocked on panic Signed-off-by: kim * make it more obvious which cmd flags are being attached Signed-off-by: kim --- internal/oidc/idp.go | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'internal/oidc') diff --git a/internal/oidc/idp.go b/internal/oidc/idp.go index b3b204c86..7ce535644 100644 --- a/internal/oidc/idp.go +++ b/internal/oidc/idp.go @@ -23,7 +23,6 @@ import ( "fmt" "github.com/coreos/go-oidc/v3/oidc" - "github.com/spf13/viper" "github.com/superseriousbusiness/gotosocial/internal/config" "golang.org/x/oauth2" ) @@ -56,36 +55,33 @@ type idp struct { // is set to false, then nil, nil will be returned. If OIDCConfig.Enabled is true, // then the other OIDC config fields must also be set. func NewIDP(ctx context.Context) (IDP, error) { - keys := config.Keys - - oidcEnabled := viper.GetBool(keys.OIDCEnabled) - if !oidcEnabled { + if !config.GetOIDCEnabled() { // oidc isn't enabled so we don't need to do anything return nil, nil } // validate config fields - idpName := viper.GetString(keys.OIDCIdpName) + idpName := config.GetOIDCIdpName() if idpName == "" { return nil, fmt.Errorf("not set: IDPName") } - issuer := viper.GetString(keys.OIDCIssuer) + issuer := config.GetOIDCIssuer() if issuer == "" { return nil, fmt.Errorf("not set: Issuer") } - clientID := viper.GetString(keys.OIDCClientID) + clientID := config.GetOIDCClientID() if clientID == "" { return nil, fmt.Errorf("not set: ClientID") } - clientSecret := viper.GetString(keys.OIDCClientSecret) + clientSecret := config.GetOIDCClientSecret() if clientSecret == "" { return nil, fmt.Errorf("not set: ClientSecret") } - scopes := viper.GetStringSlice(keys.OIDCScopes) + scopes := config.GetOIDCScopes() if len(scopes) == 0 { return nil, fmt.Errorf("not set: Scopes") } @@ -95,8 +91,8 @@ func NewIDP(ctx context.Context) (IDP, error) { return nil, err } - protocol := viper.GetString(keys.Protocol) - host := viper.GetString(keys.Host) + protocol := config.GetProtocol() + host := config.GetHost() oauth2Config := oauth2.Config{ // client_id and client_secret of the client. @@ -120,8 +116,7 @@ func NewIDP(ctx context.Context) (IDP, error) { ClientID: clientID, } - skipVerification := viper.GetBool(keys.OIDCSkipVerification) - if skipVerification { + if config.GetOIDCSkipVerification() { oidcConf.SkipClientIDCheck = true oidcConf.SkipExpiryCheck = true oidcConf.SkipIssuerCheck = true -- cgit v1.2.3