LDAP: Fix debug view to display the actual computed mapping in ldap.go (#48103)

* LDAP debug fix with Org role inheritance

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

* ldap debug coherent with ldap.go

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

Co-authored-by: Jguer <joao.guerreiro@grafana.com>
This commit is contained in:
Gabriel MABILLE
2022-04-22 15:45:54 +02:00
committed by GitHub
co-authored by Jguer
parent 1566fa2ede
commit 94fd03f44f
4 changed files with 23 additions and 37 deletions
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"gopkg.in/ldap.v3"
)
func isMemberOf(memberOf []string, group string) bool {
func IsMemberOf(memberOf []string, group string) bool {
if group == "*" {
return true
}
+1 -1
View File
@@ -422,7 +422,7 @@ func (server *Server) buildGrafanaUser(user *ldap.Entry) (*models.ExternalUserIn
continue
}
if isMemberOf(memberOf, group.GroupDN) {
if IsMemberOf(memberOf, group.GroupDN) {
extUser.OrgRoles[group.OrgId] = group.OrgRole
if extUser.IsGrafanaAdmin == nil || !*extUser.IsGrafanaAdmin {
extUser.IsGrafanaAdmin = group.IsGrafanaAdmin
+1 -1
View File
@@ -21,7 +21,7 @@ func TestIsMemberOf(t *testing.T) {
for _, tc := range tests {
t.Run(fmt.Sprintf("isMemberOf(%v, \"%s\") = %v", tc.memberOf, tc.group, tc.expected), func(t *testing.T) {
assert.Equal(t, tc.expected, isMemberOf(tc.memberOf, tc.group))
assert.Equal(t, tc.expected, IsMemberOf(tc.memberOf, tc.group))
})
}
}