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

Author: leenooks

app/Http/Middleware/SwapinAuthUser.php

@@ -25,6 +25,9 @@ public function handle(Request $request,Closure $next): mixed
 	{
 		$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.
 		if (Session::has('username_encrypt') && Session::has('password_encrypt')) {

config/ldap.php

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