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

More work on ldap, gotten ldap search (read attributes) to work

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-07-10 15:29:34 +02:00
parent 0ef7271326
commit db1847bc1d
3 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/defaults.ini
View File

@ -184,8 +184,7 @@ auto_sign_up = true
enabled = true enabled = true
hosts = ldap://127.0.0.1:389 hosts = ldap://127.0.0.1:389
use_ssl = false use_ssl = false
base_dn = dc=grafana,dc=org bind_path = cn=%s,dc=grafana,dc=org
bind_path = cn=%username%,dc=grafana,dc=org
attr_username = cn attr_username = cn
attr_name = cn attr_name = cn
attr_surname = sn attr_surname = sn

35
pkg/auth/ldap.go
View File

@ -17,7 +17,6 @@ func loginUsingLdap(query *AuthenticateUserQuery) error {
return err return err
} }
log.Info("Host: %v", url.Host)
conn, err := ldap.Dial("tcp", url.Host) conn, err := ldap.Dial("tcp", url.Host)
if err != nil { if err != nil {
return err return err
@ -25,10 +24,8 @@ func loginUsingLdap(query *AuthenticateUserQuery) error {
defer conn.Close() defer conn.Close()
bindFormat := "cn=%s,dc=grafana,dc=org" bindPath := fmt.Sprintf(setting.LdapBindPath, query.Username)
err = conn.Bind(bindPath, query.Password)
nx := fmt.Sprintf(bindFormat, query.Username)
err = conn.Bind(nx, query.Password)
if err != nil { if err != nil {
if ldapErr, ok := err.(*ldap.Error); ok { if ldapErr, ok := err.(*ldap.Error); ok {
@ -39,12 +36,31 @@ func loginUsingLdap(query *AuthenticateUserQuery) error {
return err return err
} }
userQuery := m.GetUserByLoginQuery{LoginOrEmail: "admin"} searchReq := ldap.SearchRequest{
BaseDN: "dc=grafana,dc=org",
Scope: ldap.ScopeWholeSubtree,
DerefAliases: ldap.NeverDerefAliases,
Attributes: []string{"cn", "sn", "email"},
Filter: fmt.Sprintf("(cn=%s)", query.Username),
}
result, err := conn.Search(&searchReq)
if err != nil {
return err
}
log.Info("Search result: %v, error: %v", result, err)
for _, entry := range result.Entries {
log.Info("cn: %s", entry.Attributes[0].Values[0])
log.Info("email: %s", entry.Attributes[2].Values[0])
}
userQuery := m.GetUserByLoginQuery{LoginOrEmail: query.Username}
err = bus.Dispatch(&userQuery) err = bus.Dispatch(&userQuery)
if err != nil { if err != nil {
if err == m.ErrUserNotFound { if err == m.ErrUserNotFound {
return ErrInvalidCredentials
} }
return err return err
} }
@ -53,3 +69,8 @@ func loginUsingLdap(query *AuthenticateUserQuery) error {
return nil return nil
} }
func createUserFromLdapInfo() error {
return nil
}

2
pkg/setting/setting.go
View File

@ -120,6 +120,7 @@ var (
// LDAP // LDAP
LdapEnabled bool LdapEnabled bool
LdapHosts []string LdapHosts []string
LdapBindPath string
// SMTP email settings // SMTP email settings
Smtp SmtpSettings Smtp SmtpSettings
@ -419,6 +420,7 @@ func NewConfigContext(args *CommandLineArgs) {
ldapSec := Cfg.Section("auth.ldap") ldapSec := Cfg.Section("auth.ldap")
LdapEnabled = ldapSec.Key("enabled").MustBool(false) LdapEnabled = ldapSec.Key("enabled").MustBool(false)
LdapHosts = ldapSec.Key("hosts").Strings(" ") LdapHosts = ldapSec.Key("hosts").Strings(" ")
LdapBindPath = ldapSec.Key("bind_path").String()
readSessionConfig() readSessionConfig()
readSmtpSettings() readSmtpSettings()