From cda94ce584d980ed97aa2635dee1bd3a4bc8cbe5 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 19 Mar 2025 12:46:28 +0100 Subject: [PATCH] Start auth-app service by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: André Duffeck --- opencloud/pkg/runtime/service/service.go | 24 +++++++++---------- services/proxy/pkg/command/server.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 3 +++ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/opencloud/pkg/runtime/service/service.go b/opencloud/pkg/runtime/service/service.go index 780b57a5cf..0220154e4d 100644 --- a/opencloud/pkg/runtime/service/service.go +++ b/opencloud/pkg/runtime/service/service.go @@ -11,17 +11,9 @@ import ( "strings" "time" - authapp "github.com/opencloud-eu/opencloud/services/auth-app/pkg/command" - "github.com/cenkalti/backoff" "github.com/mohae/deepcopy" "github.com/olekukonko/tablewriter" - notifications "github.com/opencloud-eu/opencloud/services/notifications/pkg/command" - "github.com/opencloud-eu/reva/v2/pkg/events/stream" - "github.com/opencloud-eu/reva/v2/pkg/logger" - "github.com/opencloud-eu/reva/v2/pkg/rgrpc/todo/pool" - "github.com/thejerf/suture/v4" - occfg "github.com/opencloud-eu/opencloud/pkg/config" "github.com/opencloud-eu/opencloud/pkg/log" ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc" @@ -31,6 +23,7 @@ import ( appProvider "github.com/opencloud-eu/opencloud/services/app-provider/pkg/command" appRegistry "github.com/opencloud-eu/opencloud/services/app-registry/pkg/command" audit "github.com/opencloud-eu/opencloud/services/audit/pkg/command" + authapp "github.com/opencloud-eu/opencloud/services/auth-app/pkg/command" authbasic "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/command" authmachine "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/command" authservice "github.com/opencloud-eu/opencloud/services/auth-service/pkg/command" @@ -44,6 +37,7 @@ import ( idp "github.com/opencloud-eu/opencloud/services/idp/pkg/command" invitations "github.com/opencloud-eu/opencloud/services/invitations/pkg/command" nats "github.com/opencloud-eu/opencloud/services/nats/pkg/command" + notifications "github.com/opencloud-eu/opencloud/services/notifications/pkg/command" ocdav "github.com/opencloud-eu/opencloud/services/ocdav/pkg/command" ocm "github.com/opencloud-eu/opencloud/services/ocm/pkg/command" ocs "github.com/opencloud-eu/opencloud/services/ocs/pkg/command" @@ -64,6 +58,10 @@ import ( web "github.com/opencloud-eu/opencloud/services/web/pkg/command" webdav "github.com/opencloud-eu/opencloud/services/webdav/pkg/command" webfinger "github.com/opencloud-eu/opencloud/services/webfinger/pkg/command" + "github.com/opencloud-eu/reva/v2/pkg/events/stream" + "github.com/opencloud-eu/reva/v2/pkg/logger" + "github.com/opencloud-eu/reva/v2/pkg/rgrpc/todo/pool" + "github.com/thejerf/suture/v4" ) var ( @@ -160,6 +158,11 @@ func NewService(ctx context.Context, options ...Option) (*Service, error) { cfg.AppRegistry.Commons = cfg.Commons return appRegistry.Execute(cfg.AppRegistry) }) + reg(3, opts.Config.AuthApp.Service.Name, func(ctx context.Context, cfg *occfg.Config) error { + cfg.AuthApp.Context = ctx + cfg.AuthApp.Commons = cfg.Commons + return authapp.Execute(cfg.AuthApp) + }) reg(3, opts.Config.AuthBasic.Service.Name, func(ctx context.Context, cfg *occfg.Config) error { cfg.AuthBasic.Context = ctx cfg.AuthBasic.Commons = cfg.Commons @@ -324,11 +327,6 @@ func NewService(ctx context.Context, options ...Option) (*Service, error) { cfg.Audit.Commons = cfg.Commons return audit.Execute(cfg.Audit) }) - areg(opts.Config.AuthApp.Service.Name, func(ctx context.Context, cfg *occfg.Config) error { - cfg.AuthApp.Context = ctx - cfg.AuthApp.Commons = cfg.Commons - return authapp.Execute(cfg.AuthApp) - }) areg(opts.Config.Policies.Service.Name, func(ctx context.Context, cfg *occfg.Config) error { cfg.Policies.Context = ctx cfg.Policies.Commons = cfg.Commons diff --git a/services/proxy/pkg/command/server.go b/services/proxy/pkg/command/server.go index 799bbd1b97..035af7f006 100644 --- a/services/proxy/pkg/command/server.go +++ b/services/proxy/pkg/command/server.go @@ -352,7 +352,7 @@ func loadMiddlewares(logger log.Logger, cfg *config.Config, middleware.CredentialsByUserAgent(cfg.AuthMiddleware.CredentialsByUserAgent), middleware.Logger(logger), middleware.OIDCIss(cfg.OIDC.Issuer), - middleware.EnableBasicAuth(cfg.EnableBasicAuth), + middleware.EnableBasicAuth(cfg.EnableBasicAuth || cfg.AuthMiddleware.AllowAppAuth), middleware.TraceProvider(traceProvider), ), middleware.AccountResolver( diff --git a/services/proxy/pkg/config/defaults/defaultconfig.go b/services/proxy/pkg/config/defaults/defaultconfig.go index 5a8fc9246a..f1d42a3f8f 100644 --- a/services/proxy/pkg/config/defaults/defaultconfig.go +++ b/services/proxy/pkg/config/defaults/defaultconfig.go @@ -100,6 +100,9 @@ func DefaultConfig() *config.Config { Cluster: "opencloud-cluster", EnableTLS: false, }, + AuthMiddleware: config.AuthMiddleware{ + AllowAppAuth: true, + }, } }