From 3d8bdca07aad2248a836d629e0b534b7f5ceedd9 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Mon, 13 Jul 2020 14:59:35 +0200 Subject: [PATCH 1/4] provide token configuration from config --- pkg/command/server.go | 1 + pkg/middleware/create_home.go | 1 + 2 files changed, 2 insertions(+) diff --git a/pkg/command/server.go b/pkg/command/server.go index e54590449..e9b30b9dd 100644 --- a/pkg/command/server.go +++ b/pkg/command/server.go @@ -296,6 +296,7 @@ func loadMiddlewares(ctx context.Context, l log.Logger, cfg *config.Config) alic middleware.Logger(l), middleware.RevaGatewayClient(sc), middleware.AccountsClient(accounts), + middleware.TokenManagerConfig(cfg.TokenManager), ) return alice.New(middleware.RedirectToHTTPS, oidcMW, uuidMW, chMW) diff --git a/pkg/middleware/create_home.go b/pkg/middleware/create_home.go index 480d62616..e2825439f 100644 --- a/pkg/middleware/create_home.go +++ b/pkg/middleware/create_home.go @@ -25,6 +25,7 @@ func CreateHome(opts ...Option) func(next http.Handler) http.Handler { "secret": opt.TokenManagerConfig.JWTSecret, }) if err != nil { + opt.Logger.Error().Err(err).Msg("error creating a token manager") w.WriteHeader(http.StatusInternalServerError) return } From 36bbe85d9c9bdc563bba5929ce33d7e5aaca03bf Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Mon, 13 Jul 2020 15:22:07 +0200 Subject: [PATCH 2/4] add changelog --- changelog/unreleased/fix-createhome-middleware.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/unreleased/fix-createhome-middleware.md diff --git a/changelog/unreleased/fix-createhome-middleware.md b/changelog/unreleased/fix-createhome-middleware.md new file mode 100644 index 000000000..dbf8569d3 --- /dev/null +++ b/changelog/unreleased/fix-createhome-middleware.md @@ -0,0 +1,5 @@ +Bugfix: Provide token configuration from config + +Fixed a bug that causes the createHome middleware to crash if no configuration for the OIDC provider is propagated. + +https://github.com/owncloud/ocis-proxy/pull/69 From 5662b8e50648eedd6cc05a8cd9f6b8f1a70992fd Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Mon, 13 Jul 2020 15:39:17 +0200 Subject: [PATCH 3/4] Update changelog/unreleased/fix-createhome-middleware.md --- changelog/unreleased/fix-createhome-middleware.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/unreleased/fix-createhome-middleware.md b/changelog/unreleased/fix-createhome-middleware.md index dbf8569d3..5fd39993e 100644 --- a/changelog/unreleased/fix-createhome-middleware.md +++ b/changelog/unreleased/fix-createhome-middleware.md @@ -1,5 +1,5 @@ Bugfix: Provide token configuration from config -Fixed a bug that causes the createHome middleware to crash if no configuration for the OIDC provider is propagated. +Fixed a bug that causes the createHome middleware to crash if no configuration for the TokenManager is propagated. https://github.com/owncloud/ocis-proxy/pull/69 From 193aab018706d3f41e2b5a6e9ad668fac0c8efaf Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Mon, 13 Jul 2020 16:02:05 +0200 Subject: [PATCH 4/4] update proxy-examples --- config/proxy-example-migration.json | 4 +--- config/proxy-example.json | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/config/proxy-example-migration.json b/config/proxy-example-migration.json index 408178697..04760b75a 100644 --- a/config/proxy-example-migration.json +++ b/config/proxy-example-migration.json @@ -3,9 +3,7 @@ "Namespace": "com.owncloud" }, "oidc": { - "endpoint": "https://localhost:9200", - "realm": "", - "signing_algs": ["RS256", "PS256"], + "issuer": "https://localhost:9200", "insecure": true }, "policy_selector": { diff --git a/config/proxy-example.json b/config/proxy-example.json index bac66bace..b8e5063cb 100644 --- a/config/proxy-example.json +++ b/config/proxy-example.json @@ -3,9 +3,7 @@ "Namespace": "com.owncloud" }, "oidc": { - "endpoint": "https://localhost:9200", - "realm": "", - "signing_algs": ["RS256", "PS256"], + "issuer": "https://localhost:9200", "insecure": true }, "policy_selector": {