From 2443f30303718c00f1991edcc47c4f9adf409e9f Mon Sep 17 00:00:00 2001 From: Jo Date: Wed, 27 Mar 2024 17:51:41 +0100 Subject: [PATCH] [v10.3.x] AuthProxy: Fix missing session for ldap auth proxy users (#85250) AuthProxy: Fix missing session for ldap auth proxy users (#85090) fix missing session for ldap auth proxy users (cherry picked from commit 7649d93d17edcc0814686cc152aa4a4e52739c27) (cherry picked from commit b8dda250c593334c374117d19d513604161ecf00) --- 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 9f6376a5469..46b85ac325b 100644 --- a/pkg/api/login.go +++ b/pkg/api/login.go @@ -127,12 +127,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 }