diff --git a/extensions/storage/pkg/command/authbearer.go b/extensions/auth-bearer/pkg/command/command.go similarity index 67% rename from extensions/storage/pkg/command/authbearer.go rename to extensions/auth-bearer/pkg/command/command.go index be81f0a22..6fc42b616 100644 --- a/extensions/storage/pkg/command/authbearer.go +++ b/extensions/auth-bearer/pkg/command/command.go @@ -9,11 +9,12 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/storage/pkg/config" + "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config" "github.com/owncloud/ocis/extensions/storage/pkg/server/debug" - "github.com/owncloud/ocis/extensions/storage/pkg/tracing" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocis-pkg/sync" + "github.com/owncloud/ocis/ocis-pkg/tracing" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) @@ -23,12 +24,18 @@ func AuthBearer(cfg *config.Config) *cli.Command { return &cli.Command{ Name: "auth-bearer", Usage: "start authprovider for bearer auth", - Before: func(c *cli.Context) error { - return ParseConfig(c, cfg, "storage-auth-bearer") - }, + // Before: func(c *cli.Context) error { + // return ParseConfig(c, cfg, "storage-auth-bearer") + // }, Action: func(c *cli.Context) error { - logger := NewLogger(cfg) - tracing.Configure(cfg, logger) + logCfg := cfg.Logging + logger := log.NewLogger( + log.Level(logCfg.Level), + log.File(logCfg.File), + log.Pretty(logCfg.Pretty), + log.Color(logCfg.Color), + ) + tracing.Configure(cfg.Tracing.Enabled, cfg.Tracing.Type, logger) gr := run.Group{} ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -54,10 +61,12 @@ func AuthBearer(cfg *config.Config) *cli.Command { debugServer, err := debug.Server( debug.Name(c.Command.Name+"-debug"), - debug.Addr(cfg.Reva.AuthBearer.DebugAddr), + debug.Addr(cfg.Debug.Addr), debug.Logger(logger), debug.Context(ctx), - debug.Config(cfg), + debug.Pprof(cfg.Debug.Pprof), + debug.Zpages(cfg.Debug.Zpages), + debug.Token(cfg.Debug.Token), ) if err != nil { @@ -69,7 +78,7 @@ func AuthBearer(cfg *config.Config) *cli.Command { cancel() }) - if !cfg.Reva.AuthBearer.Supervised { + if !cfg.Supervised { sync.Trap(&gr, cancel) } @@ -82,32 +91,30 @@ func AuthBearer(cfg *config.Config) *cli.Command { func authBearerConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]interface{} { return map[string]interface{}{ "core": map[string]interface{}{ - "max_cpus": cfg.Reva.AuthBearer.MaxCPUs, "tracing_enabled": cfg.Tracing.Enabled, "tracing_endpoint": cfg.Tracing.Endpoint, "tracing_collector": cfg.Tracing.Collector, "tracing_service_name": c.Command.Name, }, "shared": map[string]interface{}{ - "jwt_secret": cfg.Reva.JWTSecret, - "gatewaysvc": cfg.Reva.Gateway.Endpoint, - "skip_user_groups_in_token": cfg.Reva.SkipUserGroupsInToken, + "jwt_secret": cfg.JWTSecret, + "gatewaysvc": cfg.GatewayEndpoint, + "skip_user_groups_in_token": cfg.SkipUserGroupsInToken, }, "grpc": map[string]interface{}{ - "network": cfg.Reva.AuthBearer.GRPCNetwork, - "address": cfg.Reva.AuthBearer.GRPCAddr, + "network": cfg.GRPC.Protocol, + "address": cfg.GRPC.Addr, // TODO build services dynamically "services": map[string]interface{}{ "authprovider": map[string]interface{}{ - "auth_manager": "oidc", + "auth_manager": cfg.AuthProvider, "auth_managers": map[string]interface{}{ "oidc": map[string]interface{}{ - "issuer": cfg.Reva.OIDC.Issuer, - "insecure": cfg.Reva.OIDC.Insecure, - "id_claim": cfg.Reva.OIDC.IDClaim, - "uid_claim": cfg.Reva.OIDC.UIDClaim, - "gid_claim": cfg.Reva.OIDC.GIDClaim, - "gatewaysvc": cfg.Reva.Gateway.Endpoint, + "issuer": cfg.AuthProviders.OIDC.Issuer, + "insecure": cfg.AuthProviders.OIDC.Insecure, + "id_claim": cfg.AuthProviders.OIDC.IDClaim, + "uid_claim": cfg.AuthProviders.OIDC.UIDClaim, + "gid_claim": cfg.AuthProviders.OIDC.GIDClaim, }, }, }, @@ -123,28 +130,29 @@ type AuthBearerSutureService struct { // NewAuthBearerSutureService creates a new gateway.AuthBearerSutureService func NewAuthBearer(cfg *ociscfg.Config) suture.Service { - cfg.Storage.Commons = cfg.Commons + cfg.AuthBearer.Commons = cfg.Commons return AuthBearerSutureService{ - cfg: cfg.Storage, + cfg: cfg.AuthBearer, } } func (s AuthBearerSutureService) Serve(ctx context.Context) error { - s.cfg.Reva.AuthBearer.Context = ctx + // s.cfg.Reva.AuthBearer.Context = ctx + cmd := AuthBearer(s.cfg) f := &flag.FlagSet{} - cmdFlags := AuthBearer(s.cfg).Flags + cmdFlags := cmd.Flags for k := range cmdFlags { if err := cmdFlags[k].Apply(f); err != nil { return err } } cliCtx := cli.NewContext(nil, f, nil) - if AuthBearer(s.cfg).Before != nil { - if err := AuthBearer(s.cfg).Before(cliCtx); err != nil { + if cmd.Before != nil { + if err := cmd.Before(cliCtx); err != nil { return err } } - if err := AuthBearer(s.cfg).Action(cliCtx); err != nil { + if err := cmd.Action(cliCtx); err != nil { return err } diff --git a/extensions/auth-bearer/pkg/config/config.go b/extensions/auth-bearer/pkg/config/config.go new file mode 100644 index 000000000..5c0c95d58 --- /dev/null +++ b/extensions/auth-bearer/pkg/config/config.go @@ -0,0 +1,61 @@ +package config + +import "github.com/owncloud/ocis/ocis-pkg/shared" + +type Config struct { + *shared.Commons `yaml:"-"` + Service Service `yaml:"-"` + Tracing *Tracing `yaml:"tracing"` + Logging *Logging `yaml:"log"` + Debug Debug `yaml:"debug"` + Supervised bool + + GRPC GRPCConfig `yaml:"grpc"` + + JWTSecret string + GatewayEndpoint string + SkipUserGroupsInToken bool + AuthProvider string `yaml:"auth_provider" env:"AUTH_BEARER_AUTH_PROVIDER" desc:"The auth provider which should be used by the service"` + AuthProviders AuthProviders `yaml:"auth_providers"` +} +type Tracing struct { + Enabled bool `yaml:"enabled" env:"OCIS_TRACING_ENABLED;AUTH_BEARER_TRACING_ENABLED" desc:"Activates tracing."` + Type string `yaml:"type" env:"OCIS_TRACING_TYPE;AUTH_BEARER_TRACING_TYPE"` + Endpoint string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;AUTH_BEARER_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."` + Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;AUTH_BEARER_TRACING_COLLECTOR"` +} + +type Logging struct { + Level string `yaml:"level" env:"OCIS_LOG_LEVEL;AUTH_BEARER_LOG_LEVEL" desc:"The log level."` + Pretty bool `yaml:"pretty" env:"OCIS_LOG_PRETTY;AUTH_BEARER_LOG_PRETTY" desc:"Activates pretty log output."` + Color bool `yaml:"color" env:"OCIS_LOG_COLOR;AUTH_BEARER_LOG_COLOR" desc:"Activates colorized log output."` + File string `yaml:"file" env:"OCIS_LOG_FILE;AUTH_BEARER_LOG_FILE" desc:"The target log file."` +} + +type Service struct { + Name string `yaml:"-"` +} + +type Debug struct { + Addr string `yaml:"addr" env:"AUTH_BEARER_DEBUG_ADDR"` + Token string `yaml:"token" env:"AUTH_BEARER_DEBUG_TOKEN"` + Pprof bool `yaml:"pprof" env:"AUTH_BEARER_DEBUG_PPROF"` + Zpages bool `yaml:"zpages" env:"AUTH_BEARER_DEBUG_ZPAGES"` +} + +type GRPCConfig struct { + Addr string `yaml:"addr" env:"AUTH_BEARER_GRPC_ADDR" desc:"The address of the grpc service."` + Protocol string `yaml:"protocol" env:"AUTH_BEARER_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."` +} + +type AuthProviders struct { + OIDC OIDCProvider `yaml:"oidc"` +} + +type OIDCProvider struct { + Issuer string `yaml:"issuer"` + Insecure bool `yaml:"insecure"` + IDClaim string `yaml:"id_claim"` + UIDClaim string `yaml:"uid_claim"` + GIDClaim string `yaml:"gid_claim"` +} diff --git a/extensions/auth-bearer/pkg/config/defaults/defaultconfig.go b/extensions/auth-bearer/pkg/config/defaults/defaultconfig.go new file mode 100644 index 000000000..4aabbee8f --- /dev/null +++ b/extensions/auth-bearer/pkg/config/defaults/defaultconfig.go @@ -0,0 +1,66 @@ +package defaults + +import ( + "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config" +) + +func FullDefaultConfig() *config.Config { + cfg := DefaultConfig() + + EnsureDefaults(cfg) + + return cfg +} + +func DefaultConfig() *config.Config { + return &config.Config{ + Debug: config.Debug{ + Addr: "127.0.0.1:9149", + Token: "", + Pprof: false, + Zpages: false, + }, + GRPC: config.GRPCConfig{ + Addr: "127.0.0.1:9148", + Protocol: "tcp", + }, + Service: config.Service{ + Name: "auth-bearer", + }, + GatewayEndpoint: "127.0.0.1:9142", + JWTSecret: "Pive-Fumkiu4", + AuthProvider: "ldap", + AuthProviders: config.AuthProviders{ + OIDC: config.OIDCProvider{ + Issuer: "https://localhost:9200", + Insecure: false, + IDClaim: "preferred_username", + }, + }, + } +} + +func EnsureDefaults(cfg *config.Config) { + // provide with defaults for shared logging, since we need a valid destination address for BindEnv. + if cfg.Logging == nil && cfg.Commons != nil && cfg.Commons.Log != nil { + cfg.Logging = &config.Logging{ + Level: cfg.Commons.Log.Level, + Pretty: cfg.Commons.Log.Pretty, + Color: cfg.Commons.Log.Color, + File: cfg.Commons.Log.File, + } + } else if cfg.Logging == nil { + cfg.Logging = &config.Logging{} + } + // provide with defaults for shared tracing, since we need a valid destination address for BindEnv. + if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil { + cfg.Tracing = &config.Tracing{ + Enabled: cfg.Commons.Tracing.Enabled, + Type: cfg.Commons.Tracing.Type, + Endpoint: cfg.Commons.Tracing.Endpoint, + Collector: cfg.Commons.Tracing.Collector, + } + } else if cfg.Tracing == nil { + cfg.Tracing = &config.Tracing{} + } +} diff --git a/extensions/storage/pkg/command/root.go b/extensions/storage/pkg/command/root.go index 9fd46b414..5cc4afb3e 100644 --- a/extensions/storage/pkg/command/root.go +++ b/extensions/storage/pkg/command/root.go @@ -18,7 +18,7 @@ func GetCommands(cfg *config.Config) cli.Commands { // Groups(cfg), // AppProvider(cfg), // AuthBasic(cfg), - AuthBearer(cfg), + // AuthBearer(cfg), AuthMachine(cfg), Sharing(cfg), StoragePublicLink(cfg), diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go index 7e1e0f68d..75b342a11 100644 --- a/ocis-pkg/config/config.go +++ b/ocis-pkg/config/config.go @@ -7,6 +7,7 @@ import ( appprovider "github.com/owncloud/ocis/extensions/appprovider/pkg/config" audit "github.com/owncloud/ocis/extensions/audit/pkg/config" authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/config" + authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config" glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config" graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config" graph "github.com/owncloud/ocis/extensions/graph/pkg/config" @@ -78,6 +79,7 @@ type Config struct { Settings *settings.Config `yaml:"settings"` Storage *storage.Config `yaml:"storage"` AuthBasic *authbasic.Config `yaml:"auth_basic"` + AuthBearer *authbearer.Config `yaml:"auth_bearer"` User *user.Config `yaml:"user"` Group *group.Config `yaml:"group"` AppProvider *appprovider.Config `yaml:"app_provider"` diff --git a/ocis-pkg/config/defaultconfig.go b/ocis-pkg/config/defaultconfig.go index 8e4f1fd55..dbf684f6d 100644 --- a/ocis-pkg/config/defaultconfig.go +++ b/ocis-pkg/config/defaultconfig.go @@ -5,6 +5,7 @@ import ( appprovider "github.com/owncloud/ocis/extensions/appprovider/pkg/config/defaults" audit "github.com/owncloud/ocis/extensions/audit/pkg/config/defaults" authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/config/defaults" + authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config/defaults" glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config/defaults" graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config/defaults" graph "github.com/owncloud/ocis/extensions/graph/pkg/config/defaults" @@ -51,6 +52,7 @@ func DefaultConfig() *Config { WebDAV: webdav.DefaultConfig(), Storage: storage.DefaultConfig(), AuthBasic: authbasic.FullDefaultConfig(), + AuthBearer: authbearer.FullDefaultConfig(), User: user.FullDefaultConfig(), Group: group.FullDefaultConfig(), AppProvider: appprovider.FullDefaultConfig(), diff --git a/ocis/pkg/command/storageauthbearer.go b/ocis/pkg/command/storageauthbearer.go index f9b1912f5..4c0ca6ccc 100644 --- a/ocis/pkg/command/storageauthbearer.go +++ b/ocis/pkg/command/storageauthbearer.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/extensions/storage/pkg/command" + "github.com/owncloud/ocis/extensions/auth-bearer/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" "github.com/urfave/cli/v2" @@ -14,11 +14,11 @@ func StorageAuthBearerCommand(cfg *config.Config) *cli.Command { Usage: "Start storage auth-bearer service", Category: "extensions", //Flags: flagset.AuthBearerWithConfig(cfg.Storage), - Before: func(ctx *cli.Context) error { - return ParseStorageCommon(ctx, cfg) - }, + // Before: func(ctx *cli.Context) error { + // return ParseStorageCommon(ctx, cfg) + // }, Action: func(c *cli.Context) error { - origCmd := command.AuthBearer(cfg.Storage) + origCmd := command.AuthBearer(cfg.AuthBearer) return handleOriginalAction(c, origCmd) }, } diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go index 75c4fd99f..689882c7c 100644 --- a/ocis/pkg/runtime/service/service.go +++ b/ocis/pkg/runtime/service/service.go @@ -22,6 +22,7 @@ import ( accounts "github.com/owncloud/ocis/extensions/accounts/pkg/command" appprovider "github.com/owncloud/ocis/extensions/appprovider/pkg/command" authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/command" + authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/command" glauth "github.com/owncloud/ocis/extensions/glauth/pkg/command" graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/command" graph "github.com/owncloud/ocis/extensions/graph/pkg/command" @@ -116,7 +117,7 @@ func NewService(options ...Option) (*Service, error) { s.ServicesRegistry["storage-userprovider"] = user.NewUserProvider s.ServicesRegistry["storage-groupprovider"] = group.NewGroupProvider s.ServicesRegistry["storage-authbasic"] = authbasic.NewAuthBasic - s.ServicesRegistry["storage-authbearer"] = storage.NewAuthBearer + s.ServicesRegistry["storage-authbearer"] = authbearer.NewAuthBearer s.ServicesRegistry["storage-authmachine"] = storage.NewAuthMachine s.ServicesRegistry["storage-users"] = storage.NewStorageUsers s.ServicesRegistry["storage-shares"] = storage.NewStorageShares