From 715aaed12cbc837c289674ed038b0d7e4e0c6555 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:31:02 +0200 Subject: [PATCH] [v10.2.x] Auth: Fix a panic during logout when OAuth provider is not set (#80221) Auth: check that oauthProvider is not nil in Logout() func (#79271) check that oauthProvider is not nil (cherry picked from commit bff2ac3627187ffd2e25a1661d89720cfbb6ba4e) Co-authored-by: Mihai Doarna --- pkg/api/login.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/api/login.go b/pkg/api/login.go index 688c8761dce..e9e88cf3841 100644 --- a/pkg/api/login.go +++ b/pkg/api/login.go @@ -260,7 +260,9 @@ func (hs *HTTPServer) Logout(c *contextmodel.ReqContext) { } } oauthProvider := hs.SocialService.GetOAuthInfoProvider(strings.TrimPrefix(authInfo.AuthModule, "oauth_")) - oauthProviderSignoutRedirectUrl = oauthProvider.SignoutRedirectUrl + if oauthProvider != nil { + oauthProviderSignoutRedirectUrl = oauthProvider.SignoutRedirectUrl + } } hs.log.Debug("Logout Redirect url", "auth.SignoutRedirectUrl:", hs.Cfg.SignoutRedirectUrl)