mirror of
https://github.com/grafana/grafana.git
synced 2025-07-31 12:42:35 +08:00

This commit fixes the following golint warnings: pkg/bus/bus.go:64:9: if block ends with a return statement, so drop this else and outdent its block pkg/bus/bus.go:84:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:137:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:177:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:183:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:199:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:208:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/components/dynmap/dynmap.go:236:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:242:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:257:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:263:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:278:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:284:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:299:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:331:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:350:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:356:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:366:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:390:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:396:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:405:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:427:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:433:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:442:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:459:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:465:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:474:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:491:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:497:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:506:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:523:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:529:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:538:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:555:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:561:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:570:12: if block ends with a return statement, so drop this else and outdent its block pkg/login/ldap.go:55:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/login/ldap_test.go:372:10: if block ends with a return statement, so drop this else and outdent its block pkg/middleware/middleware_test.go:213:12: if block ends with a return statement, so drop this else and outdent its block pkg/plugins/dashboard_importer.go:153:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/plugins/dashboards_updater.go:39:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/plugins/dashboards_updater.go:121:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/plugins/plugins.go:210:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/plugins/plugins.go:235:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/eval_context.go:111:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/notifier.go:92:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/notifier.go:98:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/notifier.go:122:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/rule.go:108:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/rule.go:118:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/rule.go:121:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/notifiers/telegram.go:94:10: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/annotation.go:34:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/sqlstore/annotation.go:99:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/sqlstore/dashboard_test.go:107:13: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/plugin_setting.go:78:10: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/preferences.go:91:10: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/user.go:50:10: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/migrator/migrator.go:106:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/sqlstore/migrator/postgres_dialect.go:48:10: if block ends with a return statement, so drop this else and outdent its block pkg/tsdb/time_range.go:59:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/tsdb/time_range.go:67:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/tsdb/cloudwatch/metric_find_query.go:225:9: if block ends with a return statement, so drop this else and outdent its block pkg/util/filepath.go:68:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
389 lines
10 KiB
Go
389 lines
10 KiB
Go
package login
|
|
|
|
import (
|
|
"crypto/tls"
|
|
"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(nil, &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(nil, &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(nil, &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(nil, &LdapUserInfo{
|
|
DN: "torkelo",
|
|
Username: "torkelo",
|
|
Email: "my@email.com",
|
|
MemberOf: []string{"cn=editor"},
|
|
})
|
|
|
|
So(err, ShouldBeNil)
|
|
|
|
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.GetGrafanaUserFor(nil, &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.GetGrafanaUserFor(nil, &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)
|
|
So(sc.setUsingOrgCmd.OrgId, ShouldEqual, 1)
|
|
})
|
|
})
|
|
|
|
ldapAutherScenario("given current org role is removed in ldap", func(sc *scenarioContext) {
|
|
ldapAuther := NewLdapAuthenticator(&LdapServerConf{
|
|
LdapGroups: []*LdapGroupToOrgRole{
|
|
{GroupDN: "cn=users", OrgId: 2, OrgRole: "Admin"},
|
|
},
|
|
})
|
|
|
|
sc.userOrgsQueryReturns([]*m.UserOrgDTO{
|
|
{OrgId: 1, Role: m.ROLE_EDITOR},
|
|
{OrgId: 2, Role: m.ROLE_EDITOR},
|
|
})
|
|
_, err := ldapAuther.GetGrafanaUserFor(nil, &LdapUserInfo{
|
|
MemberOf: []string{"cn=users"},
|
|
})
|
|
|
|
Convey("Should remove org role", func() {
|
|
So(err, ShouldBeNil)
|
|
So(sc.removeOrgUserCmd, ShouldNotBeNil)
|
|
So(sc.setUsingOrgCmd.OrgId, ShouldEqual, 2)
|
|
})
|
|
})
|
|
|
|
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.GetGrafanaUserFor(nil, &LdapUserInfo{
|
|
MemberOf: []string{"cn=users"},
|
|
})
|
|
|
|
Convey("Should update org role", func() {
|
|
So(err, ShouldBeNil)
|
|
So(sc.removeOrgUserCmd, ShouldBeNil)
|
|
So(sc.updateOrgUserCmd, ShouldNotBeNil)
|
|
So(sc.setUsingOrgCmd.OrgId, ShouldEqual, 1)
|
|
})
|
|
})
|
|
|
|
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.GetGrafanaUserFor(nil, &LdapUserInfo{
|
|
MemberOf: []string{"cn=admins"},
|
|
})
|
|
|
|
Convey("Should take first match, and ignore subsequent matches", func() {
|
|
So(err, ShouldBeNil)
|
|
So(sc.updateOrgUserCmd, ShouldBeNil)
|
|
So(sc.setUsingOrgCmd.OrgId, ShouldEqual, 1)
|
|
})
|
|
})
|
|
|
|
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.GetGrafanaUserFor(nil, &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)
|
|
So(sc.setUsingOrgCmd.OrgId, ShouldEqual, 1)
|
|
})
|
|
})
|
|
|
|
})
|
|
|
|
Convey("When calling SyncUser", 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
|
|
query := &m.LoginUserQuery{
|
|
Username: "roelgerrits",
|
|
}
|
|
|
|
sc.userQueryReturns(&m.User{
|
|
Id: 1,
|
|
Email: "roel@test.net",
|
|
Name: "Roel Gerrits",
|
|
Login: "roelgerrits",
|
|
})
|
|
sc.userOrgsQueryReturns([]*m.UserOrgDTO{})
|
|
|
|
// act
|
|
syncErrResult := ldapAuther.SyncUser(query)
|
|
|
|
// 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 (c *mockLdapConn) StartTLS(*tls.Config) error {
|
|
return nil
|
|
}
|
|
|
|
func ldapAutherScenario(desc string, fn scenarioFunc) {
|
|
Convey(desc, func() {
|
|
defer bus.ClearBusHandlers()
|
|
|
|
sc := &scenarioContext{}
|
|
|
|
bus.AddHandler("test", UpsertUser)
|
|
|
|
bus.AddHandler("test", func(cmd *m.GetUserByAuthInfoQuery) error {
|
|
sc.getUserByAuthInfoQuery = cmd
|
|
sc.getUserByAuthInfoQuery.Result = &m.User{Login: cmd.Login}
|
|
return nil
|
|
})
|
|
|
|
bus.AddHandler("test", func(cmd *m.GetUserOrgListQuery) error {
|
|
sc.getUserOrgListQuery = cmd
|
|
return nil
|
|
})
|
|
|
|
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
|
|
})
|
|
|
|
bus.AddHandler("test", func(cmd *m.SetUsingOrgCommand) error {
|
|
sc.setUsingOrgCmd = cmd
|
|
return nil
|
|
})
|
|
|
|
fn(sc)
|
|
})
|
|
}
|
|
|
|
type scenarioContext struct {
|
|
getUserByAuthInfoQuery *m.GetUserByAuthInfoQuery
|
|
getUserOrgListQuery *m.GetUserOrgListQuery
|
|
createUserCmd *m.CreateUserCommand
|
|
addOrgUserCmd *m.AddOrgUserCommand
|
|
updateOrgUserCmd *m.UpdateOrgUserCommand
|
|
removeOrgUserCmd *m.RemoveOrgUserCommand
|
|
updateUserCmd *m.UpdateUserCommand
|
|
setUsingOrgCmd *m.SetUsingOrgCommand
|
|
}
|
|
|
|
func (sc *scenarioContext) userQueryReturns(user *m.User) {
|
|
bus.AddHandler("test", func(query *m.GetUserByAuthInfoQuery) error {
|
|
if user == nil {
|
|
return m.ErrUserNotFound
|
|
}
|
|
query.Result = user
|
|
return nil
|
|
})
|
|
bus.AddHandler("test", func(query *m.SetAuthInfoCommand) error {
|
|
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)
|