From 04ae9058ed5b135c27a3662b1153e129e5cf1483 Mon Sep 17 00:00:00 2001 From: Javier Adriel Date: Tue, 6 Dec 2022 18:56:37 -0600 Subject: [PATCH] Populate end_session_endpoint (#16183) --- cmd/common-main.go | 1 + go.mod | 2 +- go.sum | 4 ++-- internal/config/identity/openid/jwt.go | 1 + internal/config/identity/openid/provider/provider.go | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmd/common-main.go b/cmd/common-main.go index ed84253fd..39ed7e7cc 100644 --- a/cmd/common-main.go +++ b/cmd/common-main.go @@ -231,6 +231,7 @@ func buildOpenIDConsoleConfig() consoleoauth2.OpenIDPCfg { Userinfo: cfg.ClaimUserinfo, RedirectCallbackDynamic: cfg.RedirectURIDynamic, RedirectCallback: callback, + EndSessionEndpoint: cfg.DiscoveryDoc.EndSessionEndpoint, RoleArn: cfg.GetRoleArn(), } } diff --git a/go.mod b/go.mod index eebee3224..49c4c23dc 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/lithammer/shortuuid/v4 v4.0.0 github.com/miekg/dns v1.1.50 github.com/minio/cli v1.24.0 - github.com/minio/console v0.22.0 + github.com/minio/console v0.22.1 github.com/minio/csvparser v1.0.0 github.com/minio/dperf v0.4.2 github.com/minio/highwayhash v1.0.2 diff --git a/go.sum b/go.sum index 18372244a..660161971 100644 --- a/go.sum +++ b/go.sum @@ -748,8 +748,8 @@ github.com/minio/cli v1.24.0 h1:QrSIs7iISwaFmTlGFAR9cSpkZn7/tTaFsj5oAUCC47I= github.com/minio/cli v1.24.0/go.mod h1:bYxnK0uS629N3Bq+AOZZ+6lwF77Sodk4+UL9vNuXhOY= github.com/minio/colorjson v1.0.4 h1:sNJYTb2uNswdqmGARg9wrogCX8+GRZzEacYbJT86e00= github.com/minio/colorjson v1.0.4/go.mod h1:ZgE8vYon4xC4yfBPclP/2gqMRYw+p+xRsBbLMDKdb9M= -github.com/minio/console v0.22.0 h1:D6P7KxX+z0FrvTBnobNOQsX88shP0MELOB7i5fbvG04= -github.com/minio/console v0.22.0/go.mod h1:DoMe9LaqOyfwDCNOmXvoDfV7aM/tV8cB986z8McriB4= +github.com/minio/console v0.22.1 h1:1SOci3UNn+vBcCEDzV2TP+9NkXu0Q3V20x7SMd2Kifc= +github.com/minio/console v0.22.1/go.mod h1:DoMe9LaqOyfwDCNOmXvoDfV7aM/tV8cB986z8McriB4= github.com/minio/csvparser v1.0.0 h1:xJEHcYK8ZAjeW4hNV9Zu30u+/2o4UyPnYgyjWp8b7ZU= github.com/minio/csvparser v1.0.0/go.mod h1:lKXskSLzPgC5WQyzP7maKH7Sl1cqvANXo9YCto8zbtM= github.com/minio/dperf v0.4.2 h1:u2fcdXViX3+alZcEYSOh1crNbGtVU5drQ24lP3Xx6j8= diff --git a/internal/config/identity/openid/jwt.go b/internal/config/identity/openid/jwt.go index fc5c3f898..0bebed12a 100644 --- a/internal/config/identity/openid/jwt.go +++ b/internal/config/identity/openid/jwt.go @@ -250,6 +250,7 @@ type DiscoveryDoc struct { Issuer string `json:"issuer,omitempty"` AuthEndpoint string `json:"authorization_endpoint,omitempty"` TokenEndpoint string `json:"token_endpoint,omitempty"` + EndSessionEndpoint string `json:"end_session_endpoint,omitempty"` UserInfoEndpoint string `json:"userinfo_endpoint,omitempty"` RevocationEndpoint string `json:"revocation_endpoint,omitempty"` JwksURI string `json:"jwks_uri,omitempty"` diff --git a/internal/config/identity/openid/provider/provider.go b/internal/config/identity/openid/provider/provider.go index 040c65dbe..43a141e5d 100644 --- a/internal/config/identity/openid/provider/provider.go +++ b/internal/config/identity/openid/provider/provider.go @@ -25,6 +25,7 @@ type DiscoveryDoc struct { Issuer string `json:"issuer,omitempty"` AuthEndpoint string `json:"authorization_endpoint,omitempty"` TokenEndpoint string `json:"token_endpoint,omitempty"` + EndSessionEndpoint string `json:"end_session_endpoint,omitempty"` UserInfoEndpoint string `json:"userinfo_endpoint,omitempty"` RevocationEndpoint string `json:"revocation_endpoint,omitempty"` JwksURI string `json:"jwks_uri,omitempty"`