mirror of
https://github.com/grafana/grafana.git
synced 2024-11-27 19:30:36 -06:00
e2cf7c9698
* LDAP:Docs: `active_sync_enabled` setting Mention `active_sync_enabled` setting and enable it by default * LDAP: move "disableExternalUser" method Idea behind new design of the LDAP module is to minimise conflation between other parts of the system, so it would decoupled as much as possible from stuff like database, HTTP transport and etc. Following "Do One Thing and Do It Well" Unix philosophy principal, other things could be better fitted on the consumer side of things. Which what this commit trying to archive * LDAP: correct user/admin binding The second binding was not happening, so if the admin login/password in LDAP configuration was correct, anyone could had login as anyone using incorrect password
172 lines
3.7 KiB
Go
172 lines
3.7 KiB
Go
package ldap
|
|
|
|
import (
|
|
"testing"
|
|
|
|
. "github.com/smartystreets/goconvey/convey"
|
|
"gopkg.in/ldap.v3"
|
|
|
|
"github.com/grafana/grafana/pkg/infra/log"
|
|
"github.com/grafana/grafana/pkg/models"
|
|
)
|
|
|
|
func TestLDAPPrivateMethods(t *testing.T) {
|
|
Convey("serializeUsers()", t, func() {
|
|
Convey("simple case", func() {
|
|
server := &Server{
|
|
Config: &ServerConfig{
|
|
Attr: AttributeMap{
|
|
Username: "username",
|
|
Name: "name",
|
|
MemberOf: "memberof",
|
|
Email: "email",
|
|
},
|
|
SearchBaseDNs: []string{"BaseDNHere"},
|
|
},
|
|
Connection: &MockConnection{},
|
|
log: log.New("test-logger"),
|
|
}
|
|
|
|
entry := ldap.Entry{
|
|
DN: "dn",
|
|
Attributes: []*ldap.EntryAttribute{
|
|
{Name: "username", Values: []string{"roelgerrits"}},
|
|
{Name: "surname", Values: []string{"Gerrits"}},
|
|
{Name: "email", Values: []string{"roel@test.com"}},
|
|
{Name: "name", Values: []string{"Roel"}},
|
|
{Name: "memberof", Values: []string{"admins"}},
|
|
},
|
|
}
|
|
users := []*ldap.Entry{&entry}
|
|
|
|
result, err := server.serializeUsers(users)
|
|
|
|
So(err, ShouldBeNil)
|
|
So(result[0].Login, ShouldEqual, "roelgerrits")
|
|
So(result[0].Email, ShouldEqual, "roel@test.com")
|
|
So(result[0].Groups, ShouldContain, "admins")
|
|
})
|
|
|
|
Convey("without lastname", func() {
|
|
server := &Server{
|
|
Config: &ServerConfig{
|
|
Attr: AttributeMap{
|
|
Username: "username",
|
|
Name: "name",
|
|
MemberOf: "memberof",
|
|
Email: "email",
|
|
},
|
|
SearchBaseDNs: []string{"BaseDNHere"},
|
|
},
|
|
Connection: &MockConnection{},
|
|
log: log.New("test-logger"),
|
|
}
|
|
|
|
entry := ldap.Entry{
|
|
DN: "dn",
|
|
Attributes: []*ldap.EntryAttribute{
|
|
{Name: "username", Values: []string{"roelgerrits"}},
|
|
{Name: "email", Values: []string{"roel@test.com"}},
|
|
{Name: "name", Values: []string{"Roel"}},
|
|
{Name: "memberof", Values: []string{"admins"}},
|
|
},
|
|
}
|
|
users := []*ldap.Entry{&entry}
|
|
|
|
result, err := server.serializeUsers(users)
|
|
|
|
So(err, ShouldBeNil)
|
|
So(result[0].Name, ShouldEqual, "Roel")
|
|
})
|
|
})
|
|
|
|
Convey("validateGrafanaUser()", t, func() {
|
|
Convey("Returns error when user does not belong in any of the specified LDAP groups", func() {
|
|
server := &Server{
|
|
Config: &ServerConfig{
|
|
Groups: []*GroupToOrgRole{
|
|
{
|
|
OrgID: 1,
|
|
},
|
|
},
|
|
},
|
|
log: logger.New("test"),
|
|
}
|
|
|
|
user := &models.ExternalUserInfo{
|
|
Login: "markelog",
|
|
}
|
|
|
|
result := server.validateGrafanaUser(user)
|
|
|
|
So(result, ShouldEqual, ErrInvalidCredentials)
|
|
})
|
|
|
|
Convey("Does not return error when group config is empty", func() {
|
|
server := &Server{
|
|
Config: &ServerConfig{
|
|
Groups: []*GroupToOrgRole{},
|
|
},
|
|
log: logger.New("test"),
|
|
}
|
|
|
|
user := &models.ExternalUserInfo{
|
|
Login: "markelog",
|
|
}
|
|
|
|
result := server.validateGrafanaUser(user)
|
|
|
|
So(result, ShouldBeNil)
|
|
})
|
|
|
|
Convey("Does not return error when groups are there", func() {
|
|
server := &Server{
|
|
Config: &ServerConfig{
|
|
Groups: []*GroupToOrgRole{
|
|
{
|
|
OrgID: 1,
|
|
},
|
|
},
|
|
},
|
|
log: logger.New("test"),
|
|
}
|
|
|
|
user := &models.ExternalUserInfo{
|
|
Login: "markelog",
|
|
OrgRoles: map[int64]models.RoleType{
|
|
1: "test",
|
|
},
|
|
}
|
|
|
|
result := server.validateGrafanaUser(user)
|
|
|
|
So(result, ShouldBeNil)
|
|
})
|
|
})
|
|
|
|
Convey("shouldAuthAdmin()", t, func() {
|
|
Convey("it should require admin auth", func() {
|
|
server := &Server{
|
|
Config: &ServerConfig{
|
|
BindPassword: "test",
|
|
},
|
|
}
|
|
|
|
result := server.shouldAuthAdmin()
|
|
So(result, ShouldBeTrue)
|
|
})
|
|
|
|
Convey("it should not require admin auth", func() {
|
|
server := &Server{
|
|
Config: &ServerConfig{
|
|
BindPassword: "",
|
|
},
|
|
}
|
|
|
|
result := server.shouldAuthAdmin()
|
|
So(result, ShouldBeFalse)
|
|
})
|
|
})
|
|
|
|
}
|