mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
- adds the option to use ldap groups for authorization in combination with an auth proxy - adds an option to limit where auth proxy requests come from by configure a list of ip's - fixes a security issue, session could be reused
354 lines
9.5 KiB
Go
354 lines
9.5 KiB
Go
package login
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/go-ldap/ldap"
|
|
"github.com/grafana/grafana/pkg/bus"
|
|
m "github.com/grafana/grafana/pkg/models"
|
|
. "github.com/smartystreets/goconvey/convey"
|
|
)
|
|
|
|
func TestLdapAuther(t *testing.T) {
|
|
|
|
Convey("When translating ldap user to grafana user", t, func() {
|
|
|
|
Convey("Given no ldap group map match", func() {
|
|
ldapAuther := NewLdapAuthenticator(&LdapServerConf{
|
|
LdapGroups: []*LdapGroupToOrgRole{{}},
|
|
})
|
|
_, err := ldapAuther.GetGrafanaUserFor(&LdapUserInfo{})
|
|
|
|
So(err, ShouldEqual, ErrInvalidCredentials)
|
|
})
|
|
|
|
var user1 = &m.User{}
|
|
|
|
ldapAutherScenario("Given wildcard group match", func(sc *scenarioContext) {
|
|
ldapAuther := NewLdapAuthenticator(&LdapServerConf{
|
|
LdapGroups: []*LdapGroupToOrgRole{
|
|
{GroupDN: "*", OrgRole: "Admin"},
|
|
},
|
|
})
|
|
|
|
sc.userQueryReturns(user1)
|
|
|
|
result, err := ldapAuther.GetGrafanaUserFor(&LdapUserInfo{})
|
|
So(err, ShouldBeNil)
|
|
So(result, ShouldEqual, user1)
|
|
})
|
|
|
|
ldapAutherScenario("Given exact group match", func(sc *scenarioContext) {
|
|
ldapAuther := NewLdapAuthenticator(&LdapServerConf{
|
|
LdapGroups: []*LdapGroupToOrgRole{
|
|
{GroupDN: "cn=users", OrgRole: "Admin"},
|
|
},
|
|
})
|
|
|
|
sc.userQueryReturns(user1)
|
|
|
|
result, err := ldapAuther.GetGrafanaUserFor(&LdapUserInfo{MemberOf: []string{"cn=users"}})
|
|
So(err, ShouldBeNil)
|
|
So(result, ShouldEqual, user1)
|
|
})
|
|
|
|
ldapAutherScenario("Given no existing grafana user", func(sc *scenarioContext) {
|
|
ldapAuther := NewLdapAuthenticator(&LdapServerConf{
|
|
LdapGroups: []*LdapGroupToOrgRole{
|
|
{GroupDN: "cn=admin", OrgRole: "Admin"},
|
|
{GroupDN: "cn=editor", OrgRole: "Editor"},
|
|
{GroupDN: "*", OrgRole: "Viewer"},
|
|
},
|
|
})
|
|
|
|
sc.userQueryReturns(nil)
|
|
|
|
result, err := ldapAuther.GetGrafanaUserFor(&LdapUserInfo{
|
|
Username: "torkelo",
|
|
Email: "my@email.com",
|
|
MemberOf: []string{"cn=editor"},
|
|
})
|
|
|
|
So(err, ShouldBeNil)
|
|
|
|
Convey("Should create new user", func() {
|
|
So(sc.createUserCmd.Login, ShouldEqual, "torkelo")
|
|
So(sc.createUserCmd.Email, ShouldEqual, "my@email.com")
|
|
})
|
|
|
|
Convey("Should return new user", func() {
|
|
So(result.Login, ShouldEqual, "torkelo")
|
|
})
|
|
|
|
})
|
|
|
|
})
|
|
|
|
Convey("When syncing ldap groups to grafana org roles", t, func() {
|
|
|
|
ldapAutherScenario("given no current user orgs", func(sc *scenarioContext) {
|
|
ldapAuther := NewLdapAuthenticator(&LdapServerConf{
|
|
LdapGroups: []*LdapGroupToOrgRole{
|
|
{GroupDN: "cn=users", OrgRole: "Admin"},
|
|
},
|
|
})
|
|
|
|
sc.userOrgsQueryReturns([]*m.UserOrgDTO{})
|
|
err := ldapAuther.SyncOrgRoles(&m.User{}, &LdapUserInfo{
|
|
MemberOf: []string{"cn=users"},
|
|
})
|
|
|
|
Convey("Should create new org user", func() {
|
|
So(err, ShouldBeNil)
|
|
So(sc.addOrgUserCmd, ShouldNotBeNil)
|
|
So(sc.addOrgUserCmd.Role, ShouldEqual, m.ROLE_ADMIN)
|
|
})
|
|
})
|
|
|
|
ldapAutherScenario("given different current org role", func(sc *scenarioContext) {
|
|
ldapAuther := NewLdapAuthenticator(&LdapServerConf{
|
|
LdapGroups: []*LdapGroupToOrgRole{
|
|
{GroupDN: "cn=users", OrgId: 1, OrgRole: "Admin"},
|
|
},
|
|
})
|
|
|
|
sc.userOrgsQueryReturns([]*m.UserOrgDTO{{OrgId: 1, Role: m.ROLE_EDITOR}})
|
|
err := ldapAuther.SyncOrgRoles(&m.User{}, &LdapUserInfo{
|
|
MemberOf: []string{"cn=users"},
|
|
})
|
|
|
|
Convey("Should update org role", func() {
|
|
So(err, ShouldBeNil)
|
|
So(sc.updateOrgUserCmd, ShouldNotBeNil)
|
|
So(sc.updateOrgUserCmd.Role, ShouldEqual, m.ROLE_ADMIN)
|
|
})
|
|
})
|
|
|
|
ldapAutherScenario("given current org role is removed in ldap", func(sc *scenarioContext) {
|
|
ldapAuther := NewLdapAuthenticator(&LdapServerConf{
|
|
LdapGroups: []*LdapGroupToOrgRole{
|
|
{GroupDN: "cn=users", OrgId: 1, OrgRole: "Admin"},
|
|
},
|
|
})
|
|
|
|
sc.userOrgsQueryReturns([]*m.UserOrgDTO{{OrgId: 1, Role: m.ROLE_EDITOR}})
|
|
err := ldapAuther.SyncOrgRoles(&m.User{}, &LdapUserInfo{
|
|
MemberOf: []string{"cn=other"},
|
|
})
|
|
|
|
Convey("Should remove org role", func() {
|
|
So(err, ShouldBeNil)
|
|
So(sc.removeOrgUserCmd, ShouldNotBeNil)
|
|
})
|
|
})
|
|
|
|
ldapAutherScenario("given org role is updated in config", func(sc *scenarioContext) {
|
|
ldapAuther := NewLdapAuthenticator(&LdapServerConf{
|
|
LdapGroups: []*LdapGroupToOrgRole{
|
|
{GroupDN: "cn=admin", OrgId: 1, OrgRole: "Admin"},
|
|
{GroupDN: "cn=users", OrgId: 1, OrgRole: "Viewer"},
|
|
},
|
|
})
|
|
|
|
sc.userOrgsQueryReturns([]*m.UserOrgDTO{{OrgId: 1, Role: m.ROLE_EDITOR}})
|
|
err := ldapAuther.SyncOrgRoles(&m.User{}, &LdapUserInfo{
|
|
MemberOf: []string{"cn=users"},
|
|
})
|
|
|
|
Convey("Should update org role", func() {
|
|
So(err, ShouldBeNil)
|
|
So(sc.removeOrgUserCmd, ShouldBeNil)
|
|
So(sc.updateOrgUserCmd, ShouldNotBeNil)
|
|
})
|
|
})
|
|
|
|
ldapAutherScenario("given multiple matching ldap groups", func(sc *scenarioContext) {
|
|
ldapAuther := NewLdapAuthenticator(&LdapServerConf{
|
|
LdapGroups: []*LdapGroupToOrgRole{
|
|
{GroupDN: "cn=admins", OrgId: 1, OrgRole: "Admin"},
|
|
{GroupDN: "*", OrgId: 1, OrgRole: "Viewer"},
|
|
},
|
|
})
|
|
|
|
sc.userOrgsQueryReturns([]*m.UserOrgDTO{{OrgId: 1, Role: m.ROLE_ADMIN}})
|
|
err := ldapAuther.SyncOrgRoles(&m.User{}, &LdapUserInfo{
|
|
MemberOf: []string{"cn=admins"},
|
|
})
|
|
|
|
Convey("Should take first match, and ignore subsequent matches", func() {
|
|
So(err, ShouldBeNil)
|
|
So(sc.updateOrgUserCmd, ShouldBeNil)
|
|
})
|
|
})
|
|
|
|
ldapAutherScenario("given multiple matching ldap groups and no existing groups", func(sc *scenarioContext) {
|
|
ldapAuther := NewLdapAuthenticator(&LdapServerConf{
|
|
LdapGroups: []*LdapGroupToOrgRole{
|
|
{GroupDN: "cn=admins", OrgId: 1, OrgRole: "Admin"},
|
|
{GroupDN: "*", OrgId: 1, OrgRole: "Viewer"},
|
|
},
|
|
})
|
|
|
|
sc.userOrgsQueryReturns([]*m.UserOrgDTO{})
|
|
err := ldapAuther.SyncOrgRoles(&m.User{}, &LdapUserInfo{
|
|
MemberOf: []string{"cn=admins"},
|
|
})
|
|
|
|
Convey("Should take first match, and ignore subsequent matches", func() {
|
|
So(err, ShouldBeNil)
|
|
So(sc.addOrgUserCmd.Role, ShouldEqual, m.ROLE_ADMIN)
|
|
})
|
|
})
|
|
|
|
})
|
|
|
|
Convey("When calling SyncSignedInUser", t, func() {
|
|
|
|
mockLdapConnection := &mockLdapConn{}
|
|
ldapAuther := NewLdapAuthenticator(
|
|
&LdapServerConf{
|
|
Host: "",
|
|
RootCACert: "",
|
|
LdapGroups: []*LdapGroupToOrgRole{
|
|
{GroupDN: "*", OrgRole: "Admin"},
|
|
},
|
|
Attr: LdapAttributeMap{
|
|
Username: "username",
|
|
Surname: "surname",
|
|
Email: "email",
|
|
Name: "name",
|
|
MemberOf: "memberof",
|
|
},
|
|
SearchBaseDNs: []string{"BaseDNHere"},
|
|
},
|
|
)
|
|
|
|
dialCalled := false
|
|
ldapDial = func(network, addr string) (ILdapConn, error) {
|
|
dialCalled = true
|
|
return mockLdapConnection, nil
|
|
}
|
|
|
|
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"}},
|
|
}}
|
|
result := ldap.SearchResult{Entries: []*ldap.Entry{&entry}}
|
|
mockLdapConnection.setSearchResult(&result)
|
|
|
|
ldapAutherScenario("When ldapUser found call syncInfo and orgRoles", func(sc *scenarioContext) {
|
|
// arrange
|
|
signedInUser := &m.SignedInUser{
|
|
Email: "roel@test.net",
|
|
UserId: 1,
|
|
Name: "Roel Gerrits",
|
|
Login: "roelgerrits",
|
|
}
|
|
|
|
sc.userOrgsQueryReturns([]*m.UserOrgDTO{})
|
|
|
|
// act
|
|
syncErrResult := ldapAuther.SyncSignedInUser(signedInUser)
|
|
|
|
// assert
|
|
So(dialCalled, ShouldBeTrue)
|
|
So(syncErrResult, ShouldBeNil)
|
|
// User should be searched in ldap
|
|
So(mockLdapConnection.searchCalled, ShouldBeTrue)
|
|
// Info should be updated (email differs)
|
|
So(sc.updateUserCmd.Email, ShouldEqual, "roel@test.com")
|
|
// User should have admin privileges
|
|
So(sc.addOrgUserCmd.UserId, ShouldEqual, 1)
|
|
So(sc.addOrgUserCmd.Role, ShouldEqual, "Admin")
|
|
})
|
|
})
|
|
}
|
|
|
|
type mockLdapConn struct {
|
|
result *ldap.SearchResult
|
|
searchCalled bool
|
|
}
|
|
|
|
func (c *mockLdapConn) Bind(username, password string) error {
|
|
return nil
|
|
}
|
|
|
|
func (c *mockLdapConn) Close() {}
|
|
|
|
func (c *mockLdapConn) setSearchResult(result *ldap.SearchResult) {
|
|
c.result = result
|
|
}
|
|
|
|
func (c *mockLdapConn) Search(*ldap.SearchRequest) (*ldap.SearchResult, error) {
|
|
c.searchCalled = true
|
|
return c.result, nil
|
|
}
|
|
|
|
func ldapAutherScenario(desc string, fn scenarioFunc) {
|
|
Convey(desc, func() {
|
|
defer bus.ClearBusHandlers()
|
|
|
|
sc := &scenarioContext{}
|
|
|
|
bus.AddHandler("test", func(cmd *m.CreateUserCommand) error {
|
|
sc.createUserCmd = cmd
|
|
sc.createUserCmd.Result = m.User{Login: cmd.Login}
|
|
return nil
|
|
})
|
|
|
|
bus.AddHandler("test", func(cmd *m.AddOrgUserCommand) error {
|
|
sc.addOrgUserCmd = cmd
|
|
return nil
|
|
})
|
|
|
|
bus.AddHandler("test", func(cmd *m.UpdateOrgUserCommand) error {
|
|
sc.updateOrgUserCmd = cmd
|
|
return nil
|
|
})
|
|
|
|
bus.AddHandler("test", func(cmd *m.RemoveOrgUserCommand) error {
|
|
sc.removeOrgUserCmd = cmd
|
|
return nil
|
|
})
|
|
|
|
bus.AddHandler("test", func(cmd *m.UpdateUserCommand) error {
|
|
sc.updateUserCmd = cmd
|
|
return nil
|
|
})
|
|
|
|
fn(sc)
|
|
})
|
|
}
|
|
|
|
type scenarioContext struct {
|
|
createUserCmd *m.CreateUserCommand
|
|
addOrgUserCmd *m.AddOrgUserCommand
|
|
updateOrgUserCmd *m.UpdateOrgUserCommand
|
|
removeOrgUserCmd *m.RemoveOrgUserCommand
|
|
updateUserCmd *m.UpdateUserCommand
|
|
}
|
|
|
|
func (sc *scenarioContext) userQueryReturns(user *m.User) {
|
|
bus.AddHandler("test", func(query *m.GetUserByLoginQuery) error {
|
|
if user == nil {
|
|
return m.ErrUserNotFound
|
|
} else {
|
|
query.Result = user
|
|
return nil
|
|
}
|
|
})
|
|
}
|
|
|
|
func (sc *scenarioContext) userOrgsQueryReturns(orgs []*m.UserOrgDTO) {
|
|
bus.AddHandler("test", func(query *m.GetUserOrgListQuery) error {
|
|
query.Result = orgs
|
|
return nil
|
|
})
|
|
}
|
|
|
|
type scenarioFunc func(c *scenarioContext)
|