Skip to content

Commit e9e62fb

Browse files
committed
Updated sample LDAP config to include LDAP version number
1 parent e49cfb4 commit e9e62fb

File tree

5 files changed

+74
-20
lines changed

5 files changed

+74
-20
lines changed

app/config/local/ldap.example.php

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,17 @@
9191
| The LDAP query that we want to execute when authenticating a user
9292
|
9393
*/
94-
'authentication.filter.query' => "uid="
94+
'authentication.filter.query' => "uid=",
95+
96+
/*
97+
|--------------------------------------------------------------------------
98+
| LDAP Version
99+
|--------------------------------------------------------------------------
100+
|
101+
| The LDAP query that we want to execute when authenticating a user
102+
|
103+
*/
104+
'version' => 3,
105+
106+
95107
);

app/config/production/ldap.example.php

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
|
2323
*/
2424
'username' => "",
25-
25+
2626
/*
2727
|--------------------------------------------------------------------------
2828
| Password
@@ -32,7 +32,7 @@
3232
|
3333
*/
3434
'password' => "",
35-
35+
3636
/*
3737
|--------------------------------------------------------------------------
3838
| Basedn
@@ -42,7 +42,7 @@
4242
|
4343
*/
4444
'basedn' => "",
45-
45+
4646

4747
/*
4848
|--------------------------------------------------------------------------
@@ -54,11 +54,11 @@
5454
*/
5555
'filter' => "",
5656

57-
57+
5858
/*
5959
|--------------------------------------------------------------------------
6060
| LDAP field names that will be retrieved to create a user.
61-
|
61+
|
6262
| Using the username as an example:
6363
| If I set 'result.username' => 'my-org-username', the code will connect to
6464
| LDAP as follows (where $results[$i] represents a row in the LDAP query:
@@ -69,20 +69,20 @@
6969
|
7070
| The search filter for the LDAP query.
7171
|
72-
*/
72+
*/
7373
'result.username' => "",
7474
'result.emp.num' => "",
7575
'result.last.name' => "",
7676
'result.first.name' => "",
7777
'result.email' => "",
78-
78+
7979
/*
8080
| This field is optional as not all LDAP directories will have it. If yours
8181
| does not have it, just leave this field blank and the extra check will
8282
| be omitted.
8383
*/
8484
'result.active.flag' => "",
85-
85+
8686
/*
8787
|--------------------------------------------------------------------------
8888
| LDAP filter query for authentication
@@ -91,5 +91,17 @@
9191
| The LDAP query that we want to execute when authenticating a user
9292
|
9393
*/
94-
'authentication.filter.query' => "uid="
94+
'authentication.filter.query' => "uid=",
95+
96+
/*
97+
|--------------------------------------------------------------------------
98+
| LDAP Version
99+
|--------------------------------------------------------------------------
100+
|
101+
| The LDAP query that we want to execute when authenticating a user
102+
|
103+
*/
104+
'version' => 3,
105+
106+
95107
);

app/config/staging/ldap.example.php

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,17 @@
9191
| The LDAP query that we want to execute when authenticating a user
9292
|
9393
*/
94-
'authentication.filter.query' => "uid="
94+
'authentication.filter.query' => "uid=",
95+
96+
/*
97+
|--------------------------------------------------------------------------
98+
| LDAP Version
99+
|--------------------------------------------------------------------------
100+
|
101+
| The LDAP query that we want to execute when authenticating a user
102+
|
103+
*/
104+
'version' => 3,
105+
106+
95107
);

app/config/testing/ldap.example.php

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
|
2323
*/
2424
'username' => "",
25-
25+
2626
/*
2727
|--------------------------------------------------------------------------
2828
| Password
@@ -32,7 +32,7 @@
3232
|
3333
*/
3434
'password' => "",
35-
35+
3636
/*
3737
|--------------------------------------------------------------------------
3838
| Basedn
@@ -42,7 +42,7 @@
4242
|
4343
*/
4444
'basedn' => "",
45-
45+
4646

4747
/*
4848
|--------------------------------------------------------------------------
@@ -54,11 +54,11 @@
5454
*/
5555
'filter' => "",
5656

57-
57+
5858
/*
5959
|--------------------------------------------------------------------------
6060
| LDAP field names that will be retrieved to create a user.
61-
|
61+
|
6262
| Using the username as an example:
6363
| If I set 'result.username' => 'my-org-username', the code will connect to
6464
| LDAP as follows (where $results[$i] represents a row in the LDAP query:
@@ -69,14 +69,20 @@
6969
|
7070
| The search filter for the LDAP query.
7171
|
72-
*/
72+
*/
7373
'result.username' => "",
7474
'result.emp.num' => "",
7575
'result.last.name' => "",
7676
'result.first.name' => "",
7777
'result.email' => "",
78+
79+
/*
80+
| This field is optional as not all LDAP directories will have it. If yours
81+
| does not have it, just leave this field blank and the extra check will
82+
| be omitted.
83+
*/
7884
'result.active.flag' => "",
79-
85+
8086
/*
8187
|--------------------------------------------------------------------------
8288
| LDAP filter query for authentication
@@ -85,5 +91,17 @@
8591
| The LDAP query that we want to execute when authenticating a user
8692
|
8793
*/
88-
'authentication.filter.query' => "uid="
94+
'authentication.filter.query' => "uid=",
95+
96+
/*
97+
|--------------------------------------------------------------------------
98+
| LDAP Version
99+
|--------------------------------------------------------------------------
100+
|
101+
| The LDAP query that we want to execute when authenticating a user
102+
|
103+
*/
104+
'ldap_version' => 3,
105+
106+
89107
);

app/config/version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
22
return array (
33
'app_version' => 'v2.0-pre',
4-
'hash_version' => 'v2.0-pre-beta-384-ge7d7cc6',
4+
'hash_version' => 'v2.0-pre-beta-390-gdb8ea88',
55
);

0 commit comments

Comments
 (0)