From f5d9aa7a973d2ded74386c718fddb6d9406c032b Mon Sep 17 00:00:00 2001
From: nuxsmin <nuxsmin@cygnux-pc>
Date: Mon, 3 Feb 2014 02:53:09 +0100
Subject: [PATCH] * LDAP parameters checking

---
 ajax/ajax_checkLdap.php                   |  53 +++++++
 imgs/refresh.png                          | Bin 0 -> 5027 bytes
 inc/auth.class.php                        |   6 +-
 inc/ldap.class.php                        | 177 +++++++++++++++++-----
 inc/locales/en_US/LC_MESSAGES/messages.mo | Bin 41740 -> 42273 bytes
 inc/tpl/config.php                        |   8 +
 js/functions.js                           |  46 ++++++
 7 files changed, 248 insertions(+), 42 deletions(-)
 create mode 100644 ajax/ajax_checkLdap.php
 create mode 100644 imgs/refresh.png

diff --git a/ajax/ajax_checkLdap.php b/ajax/ajax_checkLdap.php
new file mode 100644
index 00000000..59066ff4
--- /dev/null
+++ b/ajax/ajax_checkLdap.php
@@ -0,0 +1,53 @@
+<?php
+/** 
+* sysPass
+* 
+* @author nuxsmin
+* @link http://syspass.org
+* @copyright 2012 Rubén Domínguez nuxsmin@syspass.org
+*  
+* This file is part of sysPass.
+*
+* sysPass is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* sysPass is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+define('APP_ROOT', '..');
+include_once (APP_ROOT."/inc/init.php");
+
+SP_Util::checkReferer('POST');
+
+if ( ! SP_Init::isLoggedIn() ) {
+    SP_Common::printJSON(_('La sesión no se ha iniciado o ha caducado'), 10);
+}
+
+$sk = SP_Common::parseParams('p', 'sk', FALSE);
+
+if (!$sk || !SP_Common::checkSessionKey($sk)) {
+    SP_Common::printJSON(_('CONSULTA INVÁLIDA'));
+}
+
+$frmLdapServer = SP_Common::parseParams('p', 'ldapserver');
+$frmLdapBase = SP_Common::parseParams('p', 'ldapbase');
+$frmLdapGroup = SP_Common::parseParams('p', 'ldapgroup');
+$frmLdapBindUser = SP_Common::parseParams('p', 'ldapbinduser');
+$frmLdapBindPass = SP_Common::parseParams('p', 'ldapbindpass');
+
+$resCheckLdap = SP_LDAP::checkLDAPConn($frmLdapServer,$frmLdapBindUser,$frmLdapBindPass,$frmLdapBase,$frmLdapGroup);
+
+if ( $resCheckLdap === FALSE ){
+    SP_Common::printJSON(_('Error de conexión a LDAP').';;'._('Revise el registro de eventos para más detalles'));
+} else{
+    SP_Common::printJSON(_('Conexión a LDAP correcta').';;'._('Objetos encontrados').': '.$resCheckLdap,0);
+}
\ No newline at end of file
diff --git a/imgs/refresh.png b/imgs/refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cac11a682b59d8a6e918cbe4ea94d5505e3c6b9
GIT binary patch
literal 5027
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

literal 0
HcmV?d00001

diff --git a/inc/auth.class.php b/inc/auth.class.php
index e7c08d39..7e071a52 100644
--- a/inc/auth.class.php
+++ b/inc/auth.class.php
@@ -51,8 +51,8 @@ class SP_Auth {
 
         // Conectamos al servidor realizamos la conexión con el usuario proxy
         try {
-            SP_LDAP::connect();
-            SP_LDAP::bind();
+            SP_LDAP::ldapConnect();
+            SP_LDAP::ldapBind();
             SP_LDAP::getUserDN($userLogin);
         } catch (Exception $e) {
             return FALSE;
@@ -70,7 +70,7 @@ class SP_Auth {
         
         // Realizamos la conexión con el usuario real y obtenemos los atributos
         try{
-            SP_LDAP::bind($userDN, $userPass);
+            SP_LDAP::ldapBind($userDN, $userPass);
             SP_LDAP::unbind();
             $attribs = SP_LDAP::getLDAPAttr($attribsMap);
         } catch (Exception $e) {
diff --git a/inc/ldap.class.php b/inc/ldap.class.php
index 52a5f609..d7413316 100644
--- a/inc/ldap.class.php
+++ b/inc/ldap.class.php
@@ -29,38 +29,57 @@ defined('APP_ROOT') || die(_('No es posible acceder directamente a este archivo'
  * Esta clase es la encargada de realizar la autentificación de usuarios de sysPass.
  */
 class SP_LDAP {
+
     private static $ldapConn;
     private static $ldapServer;
     private static $searchBase;
     private static $bindDN;
     private static $bindPass;
     private static $ldapGroup;
-    
     public static $ldapSearchData;
 
     /**
      * @brief Obtener el recurso de conexión a LDAP
      * @return resource
      */
-    public static function getConn(){
-        if (is_resource(self::$ldapConn)){
+    public static function getConn() {
+        if (is_resource(self::$ldapConn)) {
             return self::$ldapConn;
         }
     }
-    
+
     /**
      * @brief Comprobar la conexión al servidor de LDAP
+     * @param string $ldapServer con la dirección del servidor
+     * @param string $bindDN con el usuario de conexión
+     * @param string $bindPass con la clave del usuario de conexión
+     * @param string $searchBase con la base para las búsquedas
+     * @param string $ldapGroup con el grupo con los usuarios de acceso
      * @return bool
      */
-    public static function checkLDAPConn(){
+    public static function checkLDAPConn($ldapServer, $bindDN, $bindPass, $searchBase, $ldapGroup) {
+        self::$ldapServer = $ldapServer;
+        self::$bindDN = $bindDN;
+        self::$bindPass = $bindPass;
+        self::$searchBase = $searchBase;
+        self::$ldapGroup = $ldapGroup;
 
+        try {
+            self::ldapConnect();
+            self::ldapBind();
+            $numObjects = self::searchBase();
+        } catch (Exception $e) {
+            return FALSE;
+        }
+
+        return $numObjects;
     }
-    
+
     /**
      * @brief Comprobar si los parámetros necesario de LDAP están establecidos
      * @return bool
      */
-    public static function checkLDAPParams(){
+    public static function checkLDAPParams() {
         self::$searchBase = SP_Config::getValue('ldapbase');
         self::$ldapServer = SP_Config::getValue('ldapserver');
         self::$bindDN = SP_Config::getValue('ldapbinduser');
@@ -70,12 +89,12 @@ class SP_LDAP {
         if (!self::$searchBase || !self::$ldapServer || !self::$ldapGroup || !self::$bindDN || !self::$bindPass) {
             $message['action'] = __FUNCTION__;
             $message['text'][] = _('Los parámetros de LDAP no están configurados');
-            
+
             SP_Common::wrLogInfo($message);
-            
+
             return FALSE;
         }
-        
+
         return TRUE;
     }
 
@@ -84,22 +103,22 @@ class SP_LDAP {
      * @param string $server con la dirección del servidor
      * @return bool
      */
-    public static function connect(){
+    public static function ldapConnect() {
         $message['action'] = __FUNCTION__;
-        
+
         // Conexión al servidor LDAP
         if (!self::$ldapConn = @ldap_connect(self::$ldapServer)) {
             $message['text'][] = _('No es posible conectar con el servidor de LDAP') . " '" . self::$ldapServer . "'";
             $message['text'][] = 'LDAP ERROR: ' . ldap_error(self::$ldapConn) . '(' . ldap_errno(self::$ldapConn) . ')';
-            
+
             SP_Common::wrLogInfo($message);
-            
+
             throw new Exception(_('No es posible conectar con el servidor de LDAP'));
         }
-        
+
         @ldap_set_option(self::$ldapConn, LDAP_OPT_NETWORK_TIMEOUT, 10); // Set timeout
         @ldap_set_option(self::$ldapConn, LDAP_OPT_PROTOCOL_VERSION, 3); // Set LDAP version
-        
+
         return TRUE;
     }
 
@@ -109,33 +128,33 @@ class SP_LDAP {
      * @param string $pass con la clave del usuario
      * @return bool
      */
-    public static function bind($userDN = '', $userPass = ''){
+    public static function ldapBind($userDN = '', $userPass = '') {
         $message['action'] = __FUNCTION__;
-        
+
         $dn = ( $userDN ) ? $userDN : self::$bindDN;
         $pass = ( $userPass ) ? $userPass : self::$bindPass;
-        
+
         if (!@ldap_bind(self::$ldapConn, $dn, $pass)) {
             $message['text'][] = _('Error al conectar (BIND)');
             $message['text'][] = 'LDAP ERROR: ' . ldap_error(self::$ldapConn) . '(' . ldap_errno(self::$ldapConn) . ')';
             $message['text'][] = 'LDAP DN: ' . $dn;
 
             SP_Common::wrLogInfo($message);
-            
+
             throw new Exception(_('Error al conectar (BIND)'));
         }
-        
+
         return TRUE;
     }
-    
+
     /**
      * @brief Obtener el RDN del usuario que realiza el login
      * @param string $userLogin con el login del usuario
      * @return none
      */
-    public static function getUserDN($userLogin){
+    public static function getUserDN($userLogin) {
         $message['action'] = __FUNCTION__;
-        
+
         $filter = '(&(|(samaccountname=' . $userLogin . ')(cn=' . $userLogin . ')(uid=' . $userLogin . '))(|(objectClass=inetOrgPerson)(objectClass=person)(objectClass=simpleSecurityObject)))';
         $filterAttr = array("dn", "displayname", "samaccountname", "mail", "memberof", "lockouttime", "fullname", "groupmembership", "mail");
 
@@ -147,7 +166,7 @@ class SP_LDAP {
             $message['text'][] = 'LDAP FILTER: ' . $filter;
 
             SP_Common::wrLogInfo($message);
-            
+
             throw new Exception(_('Error al buscar el DN del usuario'));
         }
 
@@ -159,40 +178,43 @@ class SP_LDAP {
                 $message['text'][] = 'LDAP ERROR: ' . ldap_error(self::$ldapConn) . '(' . ldap_errno(self::$ldapConn) . ')';
 
                 SP_Common::wrLogInfo($message);
-                
+
                 throw new Exception(_('Error al localizar el usuario en LDAP'));
             }
-
-           //return $searchUser[0]["dn"];
         } else {
             $message['text'][] = _('Error al buscar el DN del usuario');
             $message['text'][] = 'LDAP FILTER: ' . $filter;
 
             SP_Common::wrLogInfo($message);
-            
+
             throw new Exception(_('Error al buscar el DN del usuario'));
         }
     }
-    
+
     /**
      * @brief Realizar la desconexión del servidor de LDAP
      * @return none
      */
-    public static function unbind(){
+    public static function unbind() {
         @ldap_unbind(self::$ldapConn);
     }
-    
-    public static function getLDAPAttr($attribs){
+
+    /**
+     * @brief Obtener los atributos del usuario
+     * @param array $attribs con los atributos a obtener
+     * @return array con los atributos disponibles y sus valores
+     */
+    public static function getLDAPAttr($attribs) {
         $res = array();
-       
+
         foreach (self::$ldapSearchData as $entryValue) {
             if (is_array($entryValue)) {
                 foreach ($entryValue as $entryAttr => $attrValue) {
                     if (is_array($attrValue)) {
-                        if (array_key_exists($entryAttr, $attribs)){
-                            if ( $attrValue['count'] > 1 ){
+                        if (array_key_exists($entryAttr, $attribs)) {
+                            if ($attrValue['count'] > 1) {
                                 $res[$attribs[$entryAttr]] = $attrValue;
-                            } else{
+                            } else {
                                 $res[$attribs[$entryAttr]] = $attrValue[0];
                             }
                         }
@@ -200,7 +222,84 @@ class SP_LDAP {
                 }
             }
         }
-        
+
         return $res;
     }
-}
\ No newline at end of file
+
+    /**
+     * @brief Realizar una búsqueda de objetos en la ruta indicada
+     * @return int con el número de resultados
+     */
+    private static function searchBase() {
+        $message['action'] = __FUNCTION__;
+
+        $groupDN = self::searchGroupDN();
+        $filter = '(&(memberOf=' . $groupDN . ')(|(objectClass=inetOrgPerson)(objectClass=person)(objectClass=simpleSecurityObject)))';
+        $filterAttr = array("dn");
+
+        $searchRes = @ldap_search(self::$ldapConn, self::$searchBase, $filter, $filterAttr);
+
+        if (!$searchRes) {
+            $message['text'][] = _('Error al buscar objetos en DN base');
+            $message['text'][] = 'LDAP ERROR: ' . ldap_error(self::$ldapConn) . '(' . ldap_errno(self::$ldapConn) . ')';
+            $message['text'][] = 'LDAP FILTER: ' . $filter;
+
+            SP_Common::wrLogInfo($message);
+
+            throw new Exception(_('Error al buscar objetos en DN base'));
+        }
+
+        return @ldap_count_entries(self::$ldapConn, $searchRes);
+    }
+
+    /**
+     * @brief Obtener el RDN del grupo
+     * @return string con el RDN del grupo
+     */
+    private static function searchGroupDN() {
+        $message['action'] = __FUNCTION__;
+
+        $filter = '(cn=' . self::$ldapGroup . ')';
+        $filterAttr = array("dn");
+
+        $searchRes = @ldap_search(self::$ldapConn, self::$searchBase, $filter, $filterAttr);
+
+        if (!$searchRes) {
+            $message['text'][] = _('Error al buscar RDN de grupo');
+            $message['text'][] = 'LDAP ERROR: ' . ldap_error(self::$ldapConn) . '(' . ldap_errno(self::$ldapConn) . ')';
+            $message['text'][] = 'LDAP FILTER: ' . $filter;
+
+            SP_Common::wrLogInfo($message);
+
+            throw new Exception(_('Error al buscar RDN de grupo'));
+        }
+
+        if (@ldap_count_entries(self::$ldapConn, $searchRes) === 1) {
+            $ldapSearchData = @ldap_get_entries(self::$ldapConn, $searchRes);
+
+            if (!$ldapSearchData) {
+                $message['text'][] = _('Error al buscar RDN de grupo');
+                $message['text'][] = 'LDAP ERROR: ' . ldap_error(self::$ldapConn) . '(' . ldap_errno(self::$ldapConn) . ')';
+
+                SP_Common::wrLogInfo($message);
+
+                throw new Exception(_('Error al buscar RDN de grupo'));
+            }
+
+            $message['text'][] = _('RDN de grupo encontrado');
+            $message['text'][] = 'RDN: ' . $ldapSearchData[0]["dn"];
+
+            SP_Common::wrLogInfo($message);
+            
+            return $ldapSearchData[0]["dn"];
+        } else {
+            $message['text'][] = _('Error al buscar RDN de grupo');
+            $message['text'][] = 'LDAP FILTER: ' . $filter;
+
+            SP_Common::wrLogInfo($message);
+
+            throw new Exception(_('Error al buscar RDN de grupo'));
+        }
+    }
+
+}
diff --git a/inc/locales/en_US/LC_MESSAGES/messages.mo b/inc/locales/en_US/LC_MESSAGES/messages.mo
index 62f08220e6a66013e0a2446845c6d4425f1d5e83..661df5f92d745b135518ed13227a78bffafa1bb9 100644
GIT binary patch
delta 13159
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
YQtt4Q2iHvTs@S!(3tPDNnQmqO56eM>!T<mO

delta 12694
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
bU(RP!O8e&An%SjjPU`Y8d2-IKNb&nG{GA8l

diff --git a/inc/tpl/config.php b/inc/tpl/config.php
index 4a71c193..bc78302c 100644
--- a/inc/tpl/config.php
+++ b/inc/tpl/config.php
@@ -293,6 +293,14 @@ $allowedExts = SP_Config::getValue('allowed_exts');
             <input type="text" name="ldapgroup" class="txtLong" value="<?php echo SP_Config::getValue('ldapgroup'); ?>" maxlength="128" />
         </td>
     </tr>
+    <tr>
+        <td class="descField">
+            <?php echo _('Comprobar'); ?>
+        </td>
+        <td class="valField">
+            <img src="imgs/refresh.png" class="inputImg" title="<?php echo _('Comprobar conexión con LDAP'); ?>" onclick="checkLdapConn();"/>
+        </td>
+    </tr>
 <?php else: ?>
     <tr>
         <td class="option-disabled">
diff --git a/js/functions.js b/js/functions.js
index 9ac1859f..3b4e6759 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1004,4 +1004,50 @@ function resMsg(type, txt, url, action){
     $.fancybox(html,{afterLoad: function(){
         $('.fancybox-skin,.fancybox-outer,.fancybox-inner').css({'border-radius':'25px','-moz-border-radius':'25px','-webkit-border-radius':'25px'});
         },afterClose : function() { if ( typeof(action) !== "undefined" ) eval(action);} });
+}
+
+// Función para comprobar la conexión con LDAP
+function checkLdapConn(){
+    var ldapServer = $('#frmConfig [name=ldapserver]').val();
+    var ldapBase = $('#frmConfig [name=ldapbase]').val();
+    var ldapGroup = $('#frmConfig [name=ldapgroup]').val();
+    var ldapBindUser = $('#frmConfig [name=ldapbinduser]').val();
+    var ldapBindPass = $('#frmConfig [name=ldapbindpass]').val();
+    var sk = $('#frmConfig [name=sk]').val();
+    
+    $.fancybox.showLoading();
+
+    $.ajax({
+        type: 'POST',
+        dataType: 'json',
+        url: APP_ROOT + '/ajax/ajax_checkLdap.php',
+        data: {'ldapserver' : ldapServer, 'ldapbase' : ldapBase, 'ldapgroup' : ldapGroup, 'ldapbinduser' : ldapBindUser, 'ldapbindpass' : ldapBindPass, 'is_ajax' : 1, 'sk' : sk},
+    success: function(json){
+        var status = json.status;
+        var description = json.description;
+        
+        description = description.replace(/;;/g,"<br />");
+
+        switch(status){
+            case 0:
+                $.fancybox.close();
+                resMsg("ok", description);
+                break;
+            case 1:
+                $.fancybox.close();
+                resMsg("error", description);
+                break;
+            case 10:
+                doLogout();
+                break;
+            default:
+                return;
+         }  
+    },
+    error:function(jqXHR, textStatus, errorThrown){
+        var txt = LANG[1] + '<p>' + errorThrown + textStatus + '</p>';
+        resMsg("error", txt);
+    },
+    complete: function(){$.fancybox.hideLoading();}
+    });
 }
\ No newline at end of file