IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Auth: Resolve isGrafanaAdmin for debug logging (#71145)

Browse Source 
resolve isGrafanaAdmin for debug logging
This commit is contained in:
Jo 2023-07-10 11:14:51 +02:00 committed by GitHub
parent 49e42d1a8d
commit 932c24986d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/ldap/api/service.go
View File

@ -277,8 +277,6 @@ func (s *Service) GetUserFromLDAP(c *contextmodel.ReqContext) response.Response
return response.Error(http.StatusNotFound, "No user was found in the LDAP server(s) with that username", err) return response.Error(http.StatusNotFound, "No user was found in the LDAP server(s) with that username", err)
} }
s.log.Debug("user found", "user", user)
name, surname := splitName(user.Name) name, surname := splitName(user.Name)
u := &LDAPUserDTO{ u := &LDAPUserDTO{

2
pkg/services/ldap/ldap.go
View File

@ -306,7 +306,7 @@ func (server *Server) Users(logins []string) (
} }
server.log.Debug( server.log.Debug(
"LDAP users found", "users", fmt.Sprintf("%v", serializedUsers), "LDAP users found", "users", fmt.Sprintf("%+v", serializedUsers),
) )
return serializedUsers, nil return serializedUsers, nil

7
pkg/services/login/model.go
View File

@ -67,7 +67,12 @@ type ExternalUserInfo struct {
} }
func (e *ExternalUserInfo) String() string { func (e *ExternalUserInfo) String() string {
return fmt.Sprintf("%+v", *e) isGrafanaAdmin := "nil"
if e.IsGrafanaAdmin != nil {
isGrafanaAdmin = fmt.Sprintf("%v", *e.IsGrafanaAdmin)
}
return fmt.Sprintf("OAuthToken: %+v, AuthModule: %v, AuthId: %v, UserId: %v, Email: %v, Login: %v, Name: %v, Groups: %v, OrgRoles: %v, IsGrafanaAdmin: %v, IsDisabled: %v, SkipTeamSync: %v",
e.OAuthToken, e.AuthModule, e.AuthId, e.UserId, e.Email, e.Login, e.Name, e.Groups, e.OrgRoles, isGrafanaAdmin, e.IsDisabled, e.SkipTeamSync)
} }
type LoginInfo struct { type LoginInfo struct {