BUG: Added bind and backup property to the ldap module

Author: Charles Marion

modules/ldap/Notification.php

@@ -39,16 +39,28 @@ private function ldapLogin($params)
     $useActiveDirectory = $config['ldap']->ldap->useActiveDirectory;
     $proxybasedn = $config['ldap']->ldap->proxyBasedn;
     $proxyPassword = $config['ldap']->ldap->proxyPassword;
+    $backup = $config['ldap']->ldap->backup;
+    $bindn = $config['ldap']->ldap->bindn;
+    $bindpw = $config['ldap']->ldap->bindpw;
+    $proxyPassword = $config['ldap']->ldap->proxyPassword;
     $passwordPrefix=Zend_Registry::get('configGlobal')->password->prefix;
 
-    $ldapsearch = $searchTerm.'='.$email;
-
+    if($searchTerm == 'uid')
+      {
+      $ldapsearch = 'uid='.substr($email,0,strpos($email,'@'));
+      }
+    else
+      {
+      $ldapsearch = $searchTerm.'='.$email;
+      }
+      
     $ldap = ldap_connect($hostname);
     ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, $protocolVersion);
     if($useActiveDirectory)
       {
       ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
       }
+      
 
     if(isset($ldap) && $ldap != '')
       {
@@ -60,13 +72,21 @@ private function ldapLogin($params)
           throw new Zend_Exception('Cannot bind proxy');
           }
         }
+        
+      $ldapbind = ldap_bind($ldap, $bindn, $bindpw);
+      if(!$ldapbind)
+        {
+        $ldap = ldap_connect($backup);
+        $ldapbind = ldap_bind($ldap, $bindn, $bindpw);
+        }
 
       /* search for pid dn */
-      $result = ldap_search($ldap, $baseDn, $ldapsearch, array('dn','cn'));
+      $result = ldap_search($ldap, $baseDn, $ldapsearch, array("uid",'cn'));
       $someone = false;
       if($result != 0)
         {
         $entries = ldap_get_entries($ldap, $result);
+        
         if($entries['count']!=0)
           {
           $principal = $entries[0]['dn'];
@@ -75,7 +95,7 @@ private function ldapLogin($params)
           {
           /* bind as this user */
           if(@ldap_bind($ldap, $principal, $credential))
-            {
+            {            
             // Try to find the user in the MIDAS database
             $someone = $this->User->getByEmail($email);
             // If the user doesn't exist we add it, but without email
@@ -89,6 +109,7 @@ private function ldapLogin($params)
                 }
 
               $names = explode(" ", $givenname);
+              $firstname = ' ';
               if(count($names)>1)
                 {
                 $firstname = $names[0];

modules/ldap/configs/module.ini

@@ -10,7 +10,10 @@ system = true
 
 
 ldap.hostname = localhost 
+ldap.backup =  
 ldap.basedn = "ou=people,dc=myorganization,dc=com"
+ldap.bindn = "cn=user,ou=people,dc=myorganization,dc=com"
+ldap.bindpw = "set_your_password"
 ldap.protocolVersion = 3
 ldap.autoAddUnknownUser = true
 ldap.search = uid

modules/ldap/controllers/ConfigController.php

@@ -30,7 +30,9 @@ function indexAction()
     $formArray['proxyBasedn']->setValue($applicationConfig['global']['ldap.proxyBasedn']);
     $formArray['proxyPassword']->setValue($applicationConfig['global']['ldap.proxyPassword']);
     $formArray['autoAddUnknownUser']->setValue($applicationConfig['global']['ldap.autoAddUnknownUser']);
-    $formArray['useActiveDirectory']->setValue($applicationConfig['global']['ldap.useActiveDirectory']);
+    $formArray['bindn']->setValue($applicationConfig['global']['ldap.bindn']);
+    $formArray['bindpw']->setValue($applicationConfig['global']['ldap.bindpw']);
+    $formArray['backup']->setValue($applicationConfig['global']['ldap.backup']);
     $this->view->configForm = $formArray;
 
     if($this->_request->isPost())
@@ -55,6 +57,9 @@ function indexAction()
         $applicationConfig['global']['ldap.proxyBasedn'] = $this->_getParam('proxyBasedn');
         $applicationConfig['global']['ldap.autoAddUnknownUser'] = $this->_getParam('autoAddUnknownUser');
         $applicationConfig['global']['ldap.useActiveDirectory'] = $this->_getParam('useActiveDirectory');
+        $applicationConfig['global']['ldap.bindn'] = '"'.$this->_getParam('bindn').'"';
+        $applicationConfig['global']['ldap.bindpw'] = $this->_getParam('bindpw');
+        $applicationConfig['global']['ldap.backup'] = $this->_getParam('backup');
         $this->Component->Utility->createInitFile(BASE_PATH."/core/configs/ldap.local.ini", $applicationConfig);
         echo JsonComponent::encode(array(true, 'Changed saved'));
         }

modules/ldap/controllers/forms/ConfigForm.php

@@ -23,6 +23,9 @@ public function createConfigForm()
     $search ->setRequired(true)
           ->addValidator('NotEmpty', true);
     $proxyBasedn = new Zend_Form_Element_Text('proxyBasedn');
+    $backup = new Zend_Form_Element_Text('backup');
+    $bindn = new Zend_Form_Element_Text('bindn');
+    $bindpw = new Zend_Form_Element_Password('bindpw');
     $proxyPassword = new Zend_Form_Element_Password('proxyPassword');
 
     $autoAddUnknownUser = new Zend_Form_Element_Select('autoAddUnknownUser');
@@ -36,12 +39,10 @@ public function createConfigForm()
                     'false' => 'false' 
                         ));   
 
-    
-    
     $submit = new  Zend_Form_Element_Submit('submitConfig');
     $submit ->setLabel('Save configuration');
 
-    $form->addElements(array($proxyPassword,$hostname,$basedn,$protocolVersion,$search,$proxyBasedn,$autoAddUnknownUser,$useActiveDirectory,$submit));
+    $form->addElements(array($backup,$bindpw,$bindn,$proxyPassword,$hostname,$basedn,$protocolVersion,$search,$proxyBasedn,$autoAddUnknownUser,$useActiveDirectory,$submit));
     return $form;
     }
 } // end class

modules/ldap/views/config/index.phtml

@@ -16,6 +16,18 @@ $this->headScript()->appendFile($this->moduleWebroot . '/public/js/config/config
               <label for='hostname'>Ldap Hostname</label>
               {$this->configForm['hostname']}
             </div>
+            <div >
+              <label for='hostname'>Backup Server</label>
+              {$this->configForm['backup']}
+            </div>
+            <div >
+              <label for='hostname'>Bind Dn</label>
+              {$this->configForm['bindn']}
+            </div>
+            <div >
+              <label for='hostname'>Bind Password</label>
+              {$this->configForm['bindpw']}
+            </div>
             <div >
               <label for='basedn'>Base Dn</label>
               {$this->configForm['basedn']}