From 33c8f8c72dbf0412b7df528f9ba02c0973791c0d Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 10:57:44 +0100 Subject: [PATCH] [v11.0.x] AuthProxy: Fix missing session for ldap auth proxy users (#85136) AuthProxy: Fix missing session for ldap auth proxy users (#85090) fix missing session for ldap auth proxy users (cherry picked from commit 7649d93d17edcc0814686cc152aa4a4e52739c27) Co-authored-by: Jo --- pkg/api/login.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/api/login.go b/pkg/api/login.go index 15b84597aa3..4f9eede9e88 100644 --- a/pkg/api/login.go +++ b/pkg/api/login.go @@ -125,9 +125,10 @@ func (hs *HTTPServer) LoginView(c *contextmodel.ReqContext) { if c.IsSignedIn { // Assign login token to auth proxy users if enable_login_token = true + // LDAP users authenticated by auth proxy are also assigned login token but their auth module is LDAP if hs.Cfg.AuthProxy.Enabled && hs.Cfg.AuthProxy.EnableLoginToken && - c.SignedInUser.AuthenticatedBy == loginservice.AuthProxyAuthModule { + (c.SignedInUser.AuthenticatedBy == loginservice.AuthProxyAuthModule || c.SignedInUser.AuthenticatedBy == loginservice.LDAPAuthModule) { user := &user.User{ID: c.SignedInUser.UserID, Email: c.SignedInUser.Email, Login: c.SignedInUser.Login} err := hs.loginUserWithUser(user, c) if err != nil {