|
@@ -43,10 +43,12 @@ var (
|
43
|
43
|
)
|
44
|
44
|
|
45
|
45
|
// equivalent of Grafana's `Server`, but unexported
|
|
46
|
+// also, `log` was renamed to `logger`, since the APIs are slightly different
|
|
47
|
+// and this way the compiler will catch any unchanged references to Grafana's `Server.log`
|
46
|
48
|
type serverConn struct {
|
47
|
49
|
Config *ServerConfig
|
48
|
50
|
Connection *ldap.Conn
|
49
|
|
- log *logger.Manager
|
|
51
|
+ logger *logger.Manager
|
50
|
52
|
}
|
51
|
53
|
|
52
|
54
|
func CheckLDAPPassphrase(config ServerConfig, accountName, passphrase string, log *logger.Manager) (err error) {
|
|
@@ -58,7 +60,7 @@ func CheckLDAPPassphrase(config ServerConfig, accountName, passphrase string, lo
|
58
|
60
|
|
59
|
61
|
server := serverConn{
|
60
|
62
|
Config: &config,
|
61
|
|
- log: log,
|
|
63
|
+ logger: log,
|
62
|
64
|
}
|
63
|
65
|
|
64
|
66
|
err = server.Dial()
|
|
@@ -126,10 +128,10 @@ func (server *serverConn) validateGroupMembership(user *ldap.Entry) (err error)
|
126
|
128
|
var memberOf []string
|
127
|
129
|
memberOf, err = server.getMemberOf(user)
|
128
|
130
|
if err != nil {
|
129
|
|
- server.log.Debug("ldap", "could not retrieve group memberships", err.Error())
|
|
131
|
+ server.logger.Debug("ldap", "could not retrieve group memberships", err.Error())
|
130
|
132
|
return
|
131
|
133
|
}
|
132
|
|
- server.log.Debug("ldap", fmt.Sprintf("found group memberships: %v", memberOf))
|
|
134
|
+ server.logger.Debug("ldap", fmt.Sprintf("found group memberships: %v", memberOf))
|
133
|
135
|
foundGroup := false
|
134
|
136
|
for _, inGroup := range memberOf {
|
135
|
137
|
for _, acceptableGroup := range server.Config.RequireGroups {
|