Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Зуев Егор
/
wiki.dev
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Authored by
Dan Brown
2016-05-02 11:38:07 +0100
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Commit
3a1cda580250ff120f29a051b4a3c61178c6f267
3a1cda58
1 parent
5c1015d6
Updated ldap so extension not required in testing
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
4 deletions
app/Services/Ldap.php
app/Services/LdapService.php
tests/Auth/LdapTest.php
app/Services/Ldap.php
View file @
3a1cda5
...
...
@@ -34,6 +34,17 @@ class Ldap
}
/**
* Set the version number for the given ldap connection.
* @param $ldapConnection
* @param $version
* @return bool
*/
public
function
setVersion
(
$ldapConnection
,
$version
)
{
return
$this
->
setOption
(
$ldapConnection
,
LDAP_OPT_PROTOCOL_VERSION
,
$version
);
}
/**
* Search LDAP tree using the provided filter.
* @param resource $ldapConnection
* @param string $baseDn
...
...
app/Services/LdapService.php
View file @
3a1cda5
...
...
@@ -122,7 +122,7 @@ class LdapService
// Set any required options
if
(
$this
->
config
[
'version'
])
{
$this
->
ldap
->
set
Option
(
$ldapConnection
,
LDAP_OPT_PROTOCOL_VERSION
,
$this
->
config
[
'version'
]);
$this
->
ldap
->
set
Version
(
$ldapConnection
,
$this
->
config
[
'version'
]);
}
$this
->
ldapConnection
=
$ldapConnection
;
...
...
tests/Auth/LdapTest.php
View file @
3a1cda5
...
...
@@ -22,7 +22,7 @@ class LdapTest extends \TestCase
public
function
test_login
()
{
$this
->
mockLdap
->
shouldReceive
(
'connect'
)
->
once
()
->
andReturn
(
$this
->
resourceId
);
$this
->
mockLdap
->
shouldReceive
(
'set
Opt
ion'
)
->
once
();
$this
->
mockLdap
->
shouldReceive
(
'set
Vers
ion'
)
->
once
();
$this
->
mockLdap
->
shouldReceive
(
'searchAndGetEntries'
)
->
times
(
4
)
->
with
(
$this
->
resourceId
,
config
(
'services.ldap.base_dn'
),
Mockery
::
type
(
'string'
),
Mockery
::
type
(
'array'
))
->
andReturn
([
'count'
=>
1
,
0
=>
[
...
...
@@ -49,7 +49,7 @@ class LdapTest extends \TestCase
public
function
test_login_works_when_no_uid_provided_by_ldap_server
()
{
$this
->
mockLdap
->
shouldReceive
(
'connect'
)
->
once
()
->
andReturn
(
$this
->
resourceId
);
$this
->
mockLdap
->
shouldReceive
(
'set
Opt
ion'
)
->
once
();
$this
->
mockLdap
->
shouldReceive
(
'set
Vers
ion'
)
->
once
();
$ldapDn
=
'cn=test-user,dc=test'
.
config
(
'services.ldap.base_dn'
);
$this
->
mockLdap
->
shouldReceive
(
'searchAndGetEntries'
)
->
times
(
2
)
->
with
(
$this
->
resourceId
,
config
(
'services.ldap.base_dn'
),
Mockery
::
type
(
'string'
),
Mockery
::
type
(
'array'
))
...
...
@@ -73,7 +73,7 @@ class LdapTest extends \TestCase
public
function
test_initial_incorrect_details
()
{
$this
->
mockLdap
->
shouldReceive
(
'connect'
)
->
once
()
->
andReturn
(
$this
->
resourceId
);
$this
->
mockLdap
->
shouldReceive
(
'set
Opt
ion'
)
->
once
();
$this
->
mockLdap
->
shouldReceive
(
'set
Vers
ion'
)
->
once
();
$this
->
mockLdap
->
shouldReceive
(
'searchAndGetEntries'
)
->
times
(
2
)
->
with
(
$this
->
resourceId
,
config
(
'services.ldap.base_dn'
),
Mockery
::
type
(
'string'
),
Mockery
::
type
(
'array'
))
->
andReturn
([
'count'
=>
1
,
0
=>
[
...
...
Please
register
or
sign in
to post a comment