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

LDAP: add tests for initialBind (#17132)

Browse Source 
* LDAP: add tests for initialBind

* LDAP: clarify comment for Login()
This commit is contained in:
Oleg Gaidarenko 2019-05-20 15:57:52 +03:00 committed by GitHub
parent db48ec1f08
commit a0f5923b95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 70 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/services/ldap/ldap.go
View File

@ -122,13 +122,13 @@ func (server *Server) Close() {
server.connection.Close()
}
// Login intialBinds the user, search it and then serialize it
// Log in user by searching and serializing it
func (server *Server) Login(query *models.LoginUserQuery) (
*models.ExternalUserInfo, error,
) {
// Perform initial authentication
err := server.intialBind(query.Username, query.Password)
err := server.initialBind(query.Username, query.Password)
if err != nil {
return nil, err
}
@ -159,7 +159,7 @@ func (server *Server) Login(query *models.LoginUserQuery) (
// Add adds stuff to LDAP
func (server *Server) Add(dn string, values map[string][]string) error {
err := server.intialBind(
err := server.initialBind(
server.config.BindDN,
server.config.BindPassword,
)
@ -190,7 +190,7 @@ func (server *Server) Add(dn string, values map[string][]string) error {
// Remove removes stuff from LDAP
func (server *Server) Remove(dn string) error {
err := server.intialBind(
err := server.initialBind(
server.config.BindDN,
server.config.BindPassword,
)
@ -381,7 +381,7 @@ func (server *Server) secondBind(
return nil
}
func (server *Server) intialBind(username, userPassword string) error {
func (server *Server) initialBind(username, userPassword string) error {
if server.config.BindPassword != "" || server.config.BindDN == "" {
userPassword = server.config.BindPassword
server.requireSecondBind = true

65
pkg/services/ldap/ldap_helpers_test.go
View File

@ -75,6 +75,71 @@ func TestLDAPHelpers(t *testing.T) {
})
})
Convey("initialBind", t, func() {
Convey("Given bind dn and password configured", func() {
connection := &mockConnection{}
var actualUsername, actualPassword string
connection.bindProvider = func(username, password string) error {
actualUsername = username
actualPassword = password
return nil
}
server := &Server{
connection: connection,
config: &ServerConfig{
BindDN: "cn=%s,o=users,dc=grafana,dc=org",
BindPassword: "bindpwd",
},
}
err := server.initialBind("user", "pwd")
So(err, ShouldBeNil)
So(server.requireSecondBind, ShouldBeTrue)
So(actualUsername, ShouldEqual, "cn=user,o=users,dc=grafana,dc=org")
So(actualPassword, ShouldEqual, "bindpwd")
})
Convey("Given bind dn configured", func() {
connection := &mockConnection{}
var actualUsername, actualPassword string
connection.bindProvider = func(username, password string) error {
actualUsername = username
actualPassword = password
return nil
}
server := &Server{
connection: connection,
config: &ServerConfig{
BindDN: "cn=%s,o=users,dc=grafana,dc=org",
},
}
err := server.initialBind("user", "pwd")
So(err, ShouldBeNil)
So(server.requireSecondBind, ShouldBeFalse)
So(actualUsername, ShouldEqual, "cn=user,o=users,dc=grafana,dc=org")
So(actualPassword, ShouldEqual, "pwd")
})
Convey("Given empty bind dn and password", func() {
connection := &mockConnection{}
unauthenticatedBindWasCalled := false
var actualUsername string
connection.unauthenticatedBindProvider = func(username string) error {
unauthenticatedBindWasCalled = true
actualUsername = username
return nil
}
server := &Server{
connection: connection,
config: &ServerConfig{},
}
err := server.initialBind("user", "pwd")
So(err, ShouldBeNil)
So(server.requireSecondBind, ShouldBeTrue)
So(unauthenticatedBindWasCalled, ShouldBeTrue)
So(actualUsername, ShouldBeEmpty)
})
})
Convey("serverBind()", t, func() {
Convey("Given bind dn and password configured", func() {
connection := &mockConnection{}