deon/phpldapadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename our configuration keys to ldap/ldaps/startls, they are not openldap specific

Browse Source
This commit is contained in:
Deon George 2025-03-07 08:20:20 +11:00
parent c588e13bd8
commit 732f777c75
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Middleware/SwapinAuthUser.php
View File

@ -25,6 +25,9 @@ class SwapinAuthUser
{ {
$key = config('ldap.default'); $key = config('ldap.default');
if (! array_key_exists($key,config('ldap.connections')))
abort(599,sprintf('LDAP default server [%s] configuration doesnt exist?',$key));
/* /*
// Rebuild our connection with the authenticated user. // Rebuild our connection with the authenticated user.
if (Session::has('username_encrypt') && Session::has('password_encrypt')) { if (Session::has('username_encrypt') && Session::has('password_encrypt')) {

10
config/ldap.php
View File

@ -15,7 +15,7 @@ return [
| |
*/ */
'default' => env('LDAP_CONNECTION', 'openldap'), 'default' => env('LDAP_CONNECTION', 'ldap'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -30,7 +30,7 @@ return [
'connections' => [ 'connections' => [
'openldap' => [ 'ldap' => [
'hosts' => [env('LDAP_HOST', '127.0.0.1')], 'hosts' => [env('LDAP_HOST', '127.0.0.1')],
'username' => env('LDAP_USERNAME', 'cn=user,dc=local,dc=com'), 'username' => env('LDAP_USERNAME', 'cn=user,dc=local,dc=com'),
'password' => env('LDAP_PASSWORD', 'secret'), 'password' => env('LDAP_PASSWORD', 'secret'),
@ -42,7 +42,7 @@ return [
'name' => env('LDAP_NAME','LDAP Server'), 'name' => env('LDAP_NAME','LDAP Server'),
], ],
'openldaps' => [ 'ldaps' => [
'hosts' => [env('LDAP_HOST', '127.0.0.1')], 'hosts' => [env('LDAP_HOST', '127.0.0.1')],
'username' => env('LDAP_USERNAME', 'cn=user,dc=local,dc=com'), 'username' => env('LDAP_USERNAME', 'cn=user,dc=local,dc=com'),
'password' => env('LDAP_PASSWORD', 'secret'), 'password' => env('LDAP_PASSWORD', 'secret'),
@ -54,7 +54,7 @@ return [
'name' => env('LDAP_NAME','LDAPS Server'), 'name' => env('LDAP_NAME','LDAPS Server'),
], ],
'openldaptls' => [ 'starttls' => [
'hosts' => [env('LDAP_HOST', '127.0.0.1')], 'hosts' => [env('LDAP_HOST', '127.0.0.1')],
'username' => env('LDAP_USERNAME', 'cn=user,dc=local,dc=com'), 'username' => env('LDAP_USERNAME', 'cn=user,dc=local,dc=com'),
'password' => env('LDAP_PASSWORD', 'secret'), 'password' => env('LDAP_PASSWORD', 'secret'),
@ -66,6 +66,7 @@ return [
'name' => env('LDAP_NAME','LDAP-TLS Server'), 'name' => env('LDAP_NAME','LDAP-TLS Server'),
], ],
/*
'opendj' => [ 'opendj' => [
'hosts' => ['opendj'], 'hosts' => ['opendj'],
'username' => 'cn=Directory Manager', 'username' => 'cn=Directory Manager',
@ -77,6 +78,7 @@ return [
'use_tls' => env('LDAP_TLS', false), 'use_tls' => env('LDAP_TLS', false),
'name' => 'OpenDJ Server', 'name' => 'OpenDJ Server',
], ],
*/
], ],