Merge pull request #1096 from christophert/add-ldaptlsinsecure

ssddanbrown · web-flow · commit 7c8edf56736b · 2018-12-22T16:38:50.000Z
Add option to disable LDAPS Certificate Validation
diff --git a/.env.example b/.env.example
@@ -77,6 +77,8 @@ LDAP_GROUP_ATTRIBUTE="memberOf"
 # Would you like to remove users from roles on BookStack if they do not match on LDAP
 # If false, the ldap groups-roles sync will only add users to roles
 LDAP_REMOVE_FROM_GROUPS=false
+# Set this option to disable LDAPS Certificate Verification
+LDAP_TLS_INSECURE=false
 
 # Mail settings
 MAIL_DRIVER=smtp
diff --git a/app/Auth/Access/LdapService.php b/app/Auth/Access/LdapService.php
@@ -170,6 +170,16 @@ protected function getConnection()
         }
         $hostName = $ldapServer[0] . ($hasProtocol?':':'') . $ldapServer[1];
         $defaultPort = $ldapServer[0] === 'ldaps' ? 636 : 389;
+
+        /*
+         * Check if TLS_INSECURE is set. The handle is set to NULL due to the nature of
+         * the LDAP_OPT_X_TLS_REQUIRE_CERT option. It can only be set globally and not
+         * per handle.
+         */
+        if($this->config['tls_insecure']) {
+            $this->ldap->setOption(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_NEVER);
+        }
+
         $ldapConnection = $this->ldap->connect($hostName, count($ldapServer) > 2 ? intval($ldapServer[2]) : $defaultPort);
 
         if ($ldapConnection === false) {
diff --git a/config/services.php b/config/services.php
@@ -149,6 +149,7 @@
 		'user_to_groups' => env('LDAP_USER_TO_GROUPS',false),
 		'group_attribute' => env('LDAP_GROUP_ATTRIBUTE', 'memberOf'),
 		'remove_from_groups' => env('LDAP_REMOVE_FROM_GROUPS',false),
+		'tls_insecure' => env('LDAP_TLS_INSECURE', false),
 	]
 
 ];

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@`
`149`	`149`	`'user_to_groups' => env('LDAP_USER_TO_GROUPS',false),`
`150`	`150`	`'group_attribute' => env('LDAP_GROUP_ATTRIBUTE', 'memberOf'),`
`151`	`151`	`'remove_from_groups' => env('LDAP_REMOVE_FROM_GROUPS',false),`
	`152`	`+ 'tls_insecure' => env('LDAP_TLS_INSECURE', false),`
`152`	`153`	`]`
`153`	`154`
`154`	`155`	`];`