From 778197a3ebd51a7c5ffe1896dedba007b5aa414c Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 8 Oct 2021 13:12:18 +0200 Subject: [PATCH] add gatewaysvc to all REVA services --- changelog/unreleased/fix-gatewaysvc-everywhere.md | 6 ++++++ storage/pkg/command/appprovider.go | 1 + storage/pkg/command/authbasic.go | 1 + storage/pkg/command/authbearer.go | 1 + storage/pkg/command/users.go | 1 + 5 files changed, 10 insertions(+) create mode 100644 changelog/unreleased/fix-gatewaysvc-everywhere.md diff --git a/changelog/unreleased/fix-gatewaysvc-everywhere.md b/changelog/unreleased/fix-gatewaysvc-everywhere.md new file mode 100644 index 0000000000..e162c4745f --- /dev/null +++ b/changelog/unreleased/fix-gatewaysvc-everywhere.md @@ -0,0 +1,6 @@ +Bugfix: Add the gatewaysvc to all shared configuration in REVA services + +We've fixed the configuration for REVA services which didn't have a gatewaysvc in their +shared configuration. This could lead to default gatewaysvc addresses in the auth middleware. Now it is set everywhere. + +https://github.com/owncloud/ocis/pull/2597 diff --git a/storage/pkg/command/appprovider.go b/storage/pkg/command/appprovider.go index 5696d63155..2989f7c39a 100644 --- a/storage/pkg/command/appprovider.go +++ b/storage/pkg/command/appprovider.go @@ -92,6 +92,7 @@ func appProviderConfigFromStruct(c *cli.Context, cfg *config.Config) map[string] }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret, + "gatewaysvc": cfg.Reva.Gateway.Endpoint, }, "grpc": map[string]interface{}{ "network": cfg.Reva.AppProvider.GRPCNetwork, diff --git a/storage/pkg/command/authbasic.go b/storage/pkg/command/authbasic.go index 044b6b8405..3a3d227db0 100644 --- a/storage/pkg/command/authbasic.go +++ b/storage/pkg/command/authbasic.go @@ -103,6 +103,7 @@ func authBasicConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]in }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret, + "gatewaysvc": cfg.Reva.Gateway.Endpoint, }, "grpc": map[string]interface{}{ "network": cfg.Reva.AuthBasic.GRPCNetwork, diff --git a/storage/pkg/command/authbearer.go b/storage/pkg/command/authbearer.go index 6372cda3bf..b3937ed11f 100644 --- a/storage/pkg/command/authbearer.go +++ b/storage/pkg/command/authbearer.go @@ -94,6 +94,7 @@ func authBearerConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]i }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret, + "gatewaysvc": cfg.Reva.Gateway.Endpoint, }, "grpc": map[string]interface{}{ "network": cfg.Reva.AuthBearer.GRPCNetwork, diff --git a/storage/pkg/command/users.go b/storage/pkg/command/users.go index 306b7caad4..1acb353b86 100644 --- a/storage/pkg/command/users.go +++ b/storage/pkg/command/users.go @@ -110,6 +110,7 @@ func usersConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]interf }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret, + "gatewaysvc": cfg.Reva.Gateway.Endpoint, }, "grpc": map[string]interface{}{ "network": cfg.Reva.Users.GRPCNetwork,