Page Attachments - Improved UI, Now initially complete

[bookstack] / app / Services / LdapService.php

diff --git a/app/Services/LdapService.php b/app/Services/LdapService.php
index cd80290e48b39a1c90b718c2b4e884b6a1f23686..b7f101ad2c3a9088357941df9c042eb973081dcb 100644 (file)
--- a/app/Services/LdapService.php
+++ b/app/Services/LdapService.php
@@ -4,10 +4,27 @@
 use BookStack\Exceptions\LdapException;
 use Illuminate\Contracts\Auth\Authenticatable;
 
 use BookStack\Exceptions\LdapException;
 use Illuminate\Contracts\Auth\Authenticatable;
 

+/**
+ * Class LdapService
+ * Handles any app-specific LDAP tasks.
+ * @package BookStack\Services
+ */

 class LdapService
 {
 
 class LdapService
 {
 

+    protected $ldap;

     protected $ldapConnection;
     protected $ldapConnection;

+    protected $config;
+
+    /**
+     * LdapService constructor.
+     * @param Ldap $ldap
+     */
+    public function __construct(Ldap $ldap)
+    {
+        $this->ldap = $ldap;
+        $this->config = config('services.ldap');
+    }

 
     /**
      * Get the details of a user from LDAP using the given username.
 
     /**
      * Get the details of a user from LDAP using the given username.


@@ -19,19 +36,19 @@ class LdapService
     public function getUserDetails($userName)
     {
         $ldapConnection = $this->getConnection();
     public function getUserDetails($userName)
     {
         $ldapConnection = $this->getConnection();

+        $this->bindSystemUser($ldapConnection);

 
         // Find user
 
         // Find user

-        $userFilter = $this->buildFilter(config('services.ldap.user_filter'), ['user' => $userName]);
-        $baseDn = config('services.ldap.base_dn');
-        $ldapSearch = ldap_search($ldapConnection, $baseDn, $userFilter, ['cn', 'uid', 'dn', 'mail']);
-        $users = ldap_get_entries($ldapConnection, $ldapSearch);
+        $userFilter = $this->buildFilter($this->config['user_filter'], ['user' => $userName]);
+        $baseDn = $this->config['base_dn'];
+        $users = $this->ldap->searchAndGetEntries($ldapConnection, $baseDn, $userFilter, ['cn', 'uid', 'dn', 'mail']);

         if ($users['count'] === 0) return null;
 
         $user = $users[0];
         return [
         if ($users['count'] === 0) return null;
 
         $user = $users[0];
         return [

-            'uid'  => $user['uid'][0],
-            'name' => $user['cn'][0],
-            'dn'   => $user['dn'],
+            'uid'   => (isset($user['uid'])) ? $user['uid'][0] : $user['dn'],
+            'name'  => $user['cn'][0],
+            'dn'    => $user['dn'],

             'email' => (isset($user['mail'])) ? $user['mail'][0] : null
         ];
     }
             'email' => (isset($user['mail'])) ? $user['mail'][0] : null
         ];
     }


@@ -50,7 +67,12 @@ class LdapService
         if ($ldapUser['uid'] !== $user->external_auth_id) return false;
 
         $ldapConnection = $this->getConnection();
         if ($ldapUser['uid'] !== $user->external_auth_id) return false;
 
         $ldapConnection = $this->getConnection();

-        $ldapBind = @ldap_bind($ldapConnection, $ldapUser['dn'], $password);
+        try {
+            $ldapBind = $this->ldap->bind($ldapConnection, $ldapUser['dn'], $password);
+        } catch (\ErrorException $e) {
+            $ldapBind = false;
+        }
+

         return $ldapBind;
     }
 
         return $ldapBind;
     }
 


@@ -62,17 +84,17 @@ class LdapService
      */
     protected function bindSystemUser($connection)
     {
      */
     protected function bindSystemUser($connection)
     {

-        $ldapDn = config('services.ldap.dn');
-        $ldapPass = config('services.ldap.pass');
+        $ldapDn = $this->config['dn'];
+        $ldapPass = $this->config['pass'];

 
         $isAnonymous = ($ldapDn === false || $ldapPass === false);
         if ($isAnonymous) {
 
         $isAnonymous = ($ldapDn === false || $ldapPass === false);
         if ($isAnonymous) {

-            $ldapBind = ldap_bind($connection);
+            $ldapBind = $this->ldap->bind($connection);

         } else {
         } else {

-            $ldapBind = ldap_bind($connection, $ldapDn, $ldapPass);
+            $ldapBind = $this->ldap->bind($connection, $ldapDn, $ldapPass);

         }
 
         }
 

-        if (!$ldapBind) throw new LdapException('LDAP access failed using ' . $isAnonymous ? ' anonymous bind.' : ' given dn & pass details');
+        if (!$ldapBind) throw new LdapException('LDAP access failed using ' . ($isAnonymous ? ' anonymous bind.' : ' given dn & pass details'));

     }
 
     /**
     }
 
     /**


@@ -86,20 +108,22 @@ class LdapService
         if ($this->ldapConnection !== null) return $this->ldapConnection;
 
         // Check LDAP extension in installed
         if ($this->ldapConnection !== null) return $this->ldapConnection;
 
         // Check LDAP extension in installed

-        if (!function_exists('ldap_connect')) {
+        if (!function_exists('ldap_connect') && config('app.env') !== 'testing') {

             throw new LdapException('LDAP PHP extension not installed');
         }
 
         // Get port from server string if specified.
             throw new LdapException('LDAP PHP extension not installed');
         }
 
         // Get port from server string if specified.

-        $ldapServer = explode(':', config('services.ldap.server'));
-        $ldapConnection = ldap_connect($ldapServer[0], count($ldapServer) > 1 ? $ldapServer[1] : 389);
+        $ldapServer = explode(':', $this->config['server']);
+        $ldapConnection = $this->ldap->connect($ldapServer[0], count($ldapServer) > 1 ? $ldapServer[1] : 389);

 
         if ($ldapConnection === false) {
             throw new LdapException('Cannot connect to ldap server, Initial connection failed');
         }
 
         // Set any required options
 
         if ($ldapConnection === false) {
             throw new LdapException('Cannot connect to ldap server, Initial connection failed');
         }
 
         // Set any required options

-        ldap_set_option($ldapConnection, LDAP_OPT_PROTOCOL_VERSION, 3); // TODO - make configurable
+        if ($this->config['version']) {
+            $this->ldap->setVersion($ldapConnection, $this->config['version']);
+        }

 
         $this->ldapConnection = $ldapConnection;
         return $this->ldapConnection;
 
         $this->ldapConnection = $ldapConnection;
         return $this->ldapConnection;


@@ -107,7 +131,7 @@ class LdapService
 
     /**
      * Build a filter string by injecting common variables.
 
     /**
      * Build a filter string by injecting common variables.

-     * @param       $filterString
+     * @param string $filterString

      * @param array $attrs
      * @return string
      */
      * @param array $attrs
      * @return string
      */