From fe626877c77ce394972a5595f0cac7f4d3517d03 Mon Sep 17 00:00:00 2001 From: Jo Date: Wed, 27 Mar 2024 17:51:27 +0100 Subject: [PATCH] [v10.4.x] AuthProxy: Fix missing session for ldap auth proxy users (#85237) AuthProxy: Fix missing session for ldap auth proxy users (#85090) fix missing session for ldap auth proxy users (cherry picked from commit 7649d93d17edcc0814686cc152aa4a4e52739c27) --- pkg/api/login.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/api/login.go b/pkg/api/login.go index 90b2d433a4a..8a4d1524d73 100644 --- a/pkg/api/login.go +++ b/pkg/api/login.go @@ -125,12 +125,11 @@ func (hs *HTTPServer) LoginView(c *contextmodel.ReqContext) { if c.IsSignedIn { // Assign login token to auth proxy users if enable_login_token = true - if hs.Cfg.AuthProxyEnabled && - hs.Cfg.AuthProxyEnableLoginToken && - c.SignedInUser.AuthenticatedBy == loginservice.AuthProxyAuthModule { + // LDAP users authenticated by auth proxy are also assigned login token but their auth module is LDAP + if hs.Cfg.AuthProxyEnabled && hs.Cfg.AuthProxyEnableLoginToken && + (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 { + if err := hs.loginUserWithUser(user, c); err != nil { c.Handle(hs.Cfg, http.StatusInternalServerError, "Failed to sign in user", err) return }