Request 2281 (superseded)

This request is superseded by request 2282 (Show diff)

Overview

Request 2281 (superseded)

Check in 1.0.7

Created by vanmeeuwen almost 6 years ago
In state superseded
Superseded by 2282
Open review for Admin
Open review for vanmeeuwen

Submit php-kolab-net-ldap3

Submit package Kolab:Winterfell / php-kolab-net-ldap3 to package Kolab:16 / php-kolab-net-ldap3

php-kolab-net-ldap3.spec Changed

@@ -24,7 +24,7 @@
 %else
 Name:               php-kolab-net-ldap3
 %endif
-Version:            1.1.3
+Version:            1.0.7
 Release:            1%{?dist}
 Summary:            Object oriented interface for searching and manipulating LDAP-entries
 Group:              Development/Libraries
@@ -39,10 +39,8 @@
 Requires:           mozldap-tools >= 6.0.5
 Requires:           php-ldap
 Requires:           php-pear(Net_LDAP2)
-%if 0%{?rhel} < 8
 Obsoletes:          php-pear(%{pear_name}) < %{version}-%{release}
 Provides:           php-pear(%{pear_name}) = %{version}-%{release}
-%endif
 Obsoletes:          php-Net-LDAP3 < %{version}-%{release}
 
 %description
@@ -73,18 +71,6 @@
 %{_datadir}/%{php}/Net/LDAP3/Result.php
 
 %changelog
-* Mon Oct 21 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.1.3-1
-- Release of version 1.1.3
-
-* Sat Oct 19 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.1.2-1
-- Release of version 1.1.2
-
-* Fri Aug 23 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.1.1-1
-- Release of version 1.1.1
-
-* Wed Jun  5 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.1.0-1
-- Release of version 1.1.0
-
 * Wed Jun 20 2018 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.0.7-1
 - Release of version 1.0.7

0001-Improve-setup-of-the-schema-cache-location.patch Added

@@ -0,0 +1,30 @@
+From d2d74d6aaa43af3dd1735d5afdc51ccd2f78e837 Mon Sep 17 00:00:00 2001
+Message-Id: <d2d74d6aaa43af3dd1735d5afdc51ccd2f78e837.1525290244.git.christoph@terra.fritz.box>
+From: Aleksander Machniak <machniak@kolabsys.com>
+Date: Fri, 24 Nov 2017 11:59:50 +0100
+Subject: PATCH 1/3 Improve setup of the schema cache location
+
+1. Prevent from errors when the host is configured e.g. with ldap:// prefix
+2. Use sys_get_temp_dir() to get the system tmp directory
+---
+ lib/Net/LDAP3.php | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/Net/LDAP3.php b/lib/Net/LDAP3.php
+index 8872e47..b5dcae3 100644
+--- a/lib/Net/LDAP3.php
++++ b/lib/Net/LDAP3.php
+@@ -2149,8 +2149,9 @@ class Net_LDAP3
+             );
+ 
+             $_ldap_schema_cache_cfg = array(
+-                'path' => "/tmp/" . $host . ":" . ($port ? $port : '389') . "-Net_LDAP2_Schema.cache",
+                 'max_age' => 86400,
++                'path' => sprintf('%s/%s:%d-Net_LDAP2_Schema.cache',
++                    (sys_get_temp_dir() ?: '/tmp'), str_replace('://', ':', $host) . (strpos($host, ":$port") ? '' : ":$port")),
+             );
+ 
+             $_ldap = Net_LDAP2::connect($_ldap_cfg);
+-- 
+2.14.1
+

0002-Fix-regression-in-setting-LDAP-cache-file-path.patch Added

@@ -0,0 +1,30 @@
+From 858fd6076366626b6ff45e8bdf57dedeb210ce34 Mon Sep 17 00:00:00 2001
+Message-Id: <858fd6076366626b6ff45e8bdf57dedeb210ce34.1525290244.git.christoph@terra.fritz.box>
+In-Reply-To: <d2d74d6aaa43af3dd1735d5afdc51ccd2f78e837.1525290244.git.christoph@terra.fritz.box>
+References: <d2d74d6aaa43af3dd1735d5afdc51ccd2f78e837.1525290244.git.christoph@terra.fritz.box>
+From: Aleksander Machniak <machniak@kolabsys.com>
+Date: Tue, 26 Dec 2017 08:10:41 +0000
+Subject: PATCH 2/3 Fix regression in setting LDAP cache file path
+
+---
+ lib/Net/LDAP3.php | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Net/LDAP3.php b/lib/Net/LDAP3.php
+index b5dcae3..937c785 100644
+--- a/lib/Net/LDAP3.php
++++ b/lib/Net/LDAP3.php
+@@ -2150,8 +2150,8 @@ class Net_LDAP3
+ 
+             $_ldap_schema_cache_cfg = array(
+                 'max_age' => 86400,
+-                'path' => sprintf('%s/%s:%d-Net_LDAP2_Schema.cache',
+-                    (sys_get_temp_dir() ?: '/tmp'), str_replace('://', ':', $host) . (strpos($host, ":$port") ? '' : ":$port")),
++                'path' => sprintf('%s/%s-Net_LDAP2_Schema.cache',
++                    sys_get_temp_dir() ?: '/tmp', str_replace('://', ':', $host) . (strpos($host, ":$port") ? '' : ":$port")),
+             );
+ 
+             $_ldap = Net_LDAP2::connect($_ldap_cfg);
+-- 
+2.14.1
+

0003-Fix-bug-where-ldapsearch-command-was-failing-when-co.patch Added

@@ -0,0 +1,29 @@
+From 56210fdaec70bc1f8f7455a75a6cd34e3a2f7e6d Mon Sep 17 00:00:00 2001
+Message-Id: <56210fdaec70bc1f8f7455a75a6cd34e3a2f7e6d.1525290244.git.christoph@terra.fritz.box>
+In-Reply-To: <d2d74d6aaa43af3dd1735d5afdc51ccd2f78e837.1525290244.git.christoph@terra.fritz.box>
+References: <d2d74d6aaa43af3dd1735d5afdc51ccd2f78e837.1525290244.git.christoph@terra.fritz.box>
+From: Aleksander Machniak <machniak@kolabsys.com>
+Date: Tue, 26 Dec 2017 08:13:24 +0000
+Subject: PATCH 3/3 Fix bug where ldapsearch command was failing when
+ configured host contained protocol schema prefix
+
+---
+ lib/Net/LDAP3.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Net/LDAP3.php b/lib/Net/LDAP3.php
+index 937c785..b12185f 100644
+--- a/lib/Net/LDAP3.php
++++ b/lib/Net/LDAP3.php
+@@ -738,7 +738,7 @@ class Net_LDAP3
+                 $moz_ldapsearch,
+                 '-x',
+                 '-h',
+-                $this->_current_host,
++                preg_replace('|^a-z+://|i', '', $this->_current_host),
+                 '-p',
+                 $this->config_get('port', 389),
+                 '-b',
+-- 
+2.14.1
+

debian.changelog Changed

pear-Net-LDAP3-1.1.3.tar.gz/composer.json -> pear-Net-LDAP3-1.0.7.tar.gz/composer.json Changed

pear-Net-LDAP3-1.1.3.tar.gz/lib/Net/LDAP3.php -> pear-Net-LDAP3-1.0.7.tar.gz/lib/Net/LDAP3.php Changed

@@ -41,11 +41,6 @@
  */
 class Net_LDAP3
 {
-    const CONTROL_EFFECTIVE_RIGHTS = '1.3.6.1.4.1.42.2.27.9.5.2';
-    const CONTROL_SORT_REQUEST     = '1.2.840.113556.1.4.473';
-    const CONTROL_VLV_REQUEST      = '2.16.840.1.113730.3.4.9';
-    const CONTROL_VLV_RESPONSE     = '2.16.840.1.113730.3.4.10';
-
     public $conn;
     public $vlv_active = false;
 
@@ -88,9 +83,8 @@
      *       'root_dn'         => 'dc=example,dc=org',
      */
     protected $config = array(
-        'sizelimit'      => 0,
-        'timelimit'      => 0,
-        'config_root_dn' => 'cn=config',
+        'sizelimit' => 0,
+        'timelimit' => 0,
     );
 
     protected $debug_level = false;
@@ -119,29 +113,32 @@
     protected $_current_bind_dn;
     protected $_current_bind_pw;
     protected $_current_host;
-    protected $_metadata;
+    protected $_supported_control = array();
     protected $_vlv_indexes_and_searches;
 
-
     /**
      * Constructor
      *
-     * @param array $config Configuration parameters. After initialization use
-     *                      the config_set() method.
+     * @param array $config Configuration parameters that have not already
+     *                      been initialized. For configuration parameters
+     *                      that have in fact been set, use the config_set()
+     *                      method after initialization.
      */
     public function __construct($config = array())
     {
         if (!empty($config) && is_array($config)) {
             foreach ($config as $key => $value) {
-                $setter = 'config_set_' . $key;
-                if (method_exists($this, $setter)) {
-                    $this->$setter($value);
-                }
-                else if (isset($this->$key)) {
-                    $this->$key = $value;
-                }
-                else {
-                    $this->config$key = $value;
+                if (empty($this->config$key)) {
+                    $setter = 'config_set_' . $key;
+                    if (method_exists($this, $setter)) {
+                        $this->$setter($value);
+                    }
+                    else if (isset($this->$key)) {
+                        $this->$key = $value;
+                    }
+                    else {
+                        $this->config$key = $value;
+                    }
                 }
             }
         }
@@ -278,24 +275,20 @@
             $ldap->connect();
             $ldap->bind($this->_current_bind_dn, $this->_current_bind_pw);
 
-            $attrs = array(
-                'nsDS5ReplicaBindDN',
-                'nsDS5ReplicaType',
-                'nsds5ReplicaPurgeDelay',
-                'nsDS5Flags'
-            );
-
-            $replica_attrs = $ldap->get_entry_attributes($replica_dn, $attrs);
-            $replica_attrs = array_merge((array) $replica_attrs, array(
+            $replica_attrs = array(
                 'cn' => 'replica',
                 'objectclass' => array(
                     'top',
                     'nsds5replica',
                     'extensibleobject',
                 ),
-                'nsDS5ReplicaId'   => ($max_repl_id + $num + 1),
-                'nsDS5ReplicaRoot' => $domain_root_dn,
-            ));
+                'nsDS5ReplicaBindDN'     => $ldap->get_entry_attribute($replica_dn, "nsDS5ReplicaBindDN"),
+                'nsDS5ReplicaId'         => ($max_repl_id + $num + 1),
+                'nsDS5ReplicaRoot'       => $domain_root_dn,
+                'nsDS5ReplicaType'       => $ldap->get_entry_attribute($replica_dn, "nsDS5ReplicaType"),
+                'nsds5ReplicaPurgeDelay' => $ldap->get_entry_attribute($replica_dn, "nsds5ReplicaPurgeDelay"),
+                'nsDS5Flags'             => $ldap->get_entry_attribute($replica_dn, "nsDS5Flags")
+            );
 
             $new_replica_dn = 'cn=replica,cn="' . $domain_root_dn . '",cn=mapping tree,cn=config';
 
@@ -695,16 +688,22 @@
         return true;
     }
 
-    /**
-     * Gets effective rights of an ldap entry
-     */
     public function effective_rights($subject)
     {
-        if (!in_array(self::CONTROL_EFFECTIVE_RIGHTS, $this->supported_controls())) {
+        $effective_rights_control_oid = "1.3.6.1.4.1.42.2.27.9.5.2";
+
+        $supported_controls = $this->supported_controls();
+
+        if (!in_array($effective_rights_control_oid, $supported_controls)) {
             $this->_debug("LDAP: No getEffectiveRights control in supportedControls");
             return false;
         }
 
+        $attributes = array(
+            'attributeLevelRights' => array(),
+            'entryLevelRights' => array(),
+        );
+
         $entry_dn = $this->entry_dn($subject);
 
         if (!$entry_dn) {
@@ -721,53 +720,6 @@
 
         $this->_debug("effective_rights for subject $subject resolves to entry dn $entry_dn");
 
-        if (PHP_VERSION_ID >= 70300) {
-            // Note: This get_entry() have to request all attributes to be working
-            $result = $this->get_entry($entry_dn, array('*'), array(
-                    array(
-                        'oid'        => self::CONTROL_EFFECTIVE_RIGHTS,
-                        'value'      => 'dn:' . $this->_current_bind_dn,
-                        'iscritical' => true,
-                    ),
-                ));
-
-            if (!empty($result)) {
-                $attributes = array(
-                    'dn'                   => $entry_dn,
-                    'attributelevelrights' => array(),
-                    'entrylevelrights'     => array(),
-                );
-
-                foreach (array('aclrights', 'attributelevelrights', 'entrylevelrights') as $attr_name) {
-                    if ($attr_value = $result$attr_name) {
-                        switch ($attr_name) {
-                        case 'aclrights':
-                            $this->parse_aclrights($attributes, $attr_value);
-                            break;
-                        case 'attributelevelrights':
-                            $attributes$attr_name = $this->parse_attribute_level_rights($attr_value);
-                            break;
-                        case 'entrylevelrights':
-                            $attributes$attr_name = $this->parse_entry_level_rights($attr_value);
-                            break;
-                        }
-                    }
-                }
-
-                $this->_debug("LDAP: Effective rights:" . var_export($attributes, true));
-
-                return $attributes;
-            }
-
-            return false;
-        }
-
-        // Use ldapsearch command
-        return $this->effective_rights_mozldap($entry_dn);
-    }
-
-    protected function effective_rights_mozldap($entry_dn)
-    {
         $moz_ldapsearch = "/usr/lib64/mozldap/ldapsearch";
         if (!is_file($moz_ldapsearch)) {
             $moz_ldapsearch = "/usr/lib/mozldap/ldapsearch";
@@ -777,7 +729,7 @@
         }
 
         if (empty($moz_ldapsearch)) {
-            $this->_error("Mozilla LDAP C SDK binary ldapsearch not found, cannot get effective rights");
+            $this->_error("Mozilla LDAP C SDK binary ldapsearch not found, cannot get effective rights on subject $subject");
             return null;
         }
 
@@ -802,13 +754,33 @@
         if ($this->vendor_name() == "Oracle Corporation") {
             // For Oracle DSEE
             $command = "-J";
-            $command = escapeshellarg(self::CONTROL_EFFECTIVE_RIGHTS . ':true');
+            $command = escapeshellarg(
+                    implode(
+                            ':',
+                            Array(
+                                    $effective_rights_control_oid,          // OID
+                                    'true'                                  // Criticality
+                                )
+                        )
+                );
             $command = "-c";
-            $command = escapeshellarg('dn:' . $this->_current_bind_dn);
+            $command = escapeshellarg(
+                    'dn:' . $this->_current_bind_dn
+                );
+
         } else {
             // For 389 DS:
             $command = "-J";
-            $command = escapeshellarg(self::CONTROL_EFFECTIVE_RIGHTS . ':true:dn:' . $this->_current_bind_dn);
+            $command = escapeshellarg(
+                    implode(
+                            ':',
+                            Array(
+                                    $effective_rights_control_oid,          // OID
+                                    'true',                                 // Criticality
+                                    'dn:' . $this->_current_bind_dn         // User DN
+                                )
+                        )
+                );
         }
 
         // For both
@@ -849,12 +821,6 @@
             }
         }
 
-        $attributes = array(
-            'dn'                   => $subject_dn,
-            'attributelevelrights' => array(),
-            'entrylevelrights'     => array(),
-        );
-
         if ($this->vendor_name() == "Oracle Corporation") {
             // Example for attribute level rights:
             // aclRights;attributeLevel;$attr:$right:$bool,$right:$bool
@@ -862,12 +828,20 @@
             // aclRights;entryLevel: add:1,delete:1,read:1,write:1,proxy:1
             foreach ($lines as $line) {
                 $line_components = explode(':', $line);
-                $attribute_name  = explode(';', array_shift($line_components));
+                $attribute_name = explode(';', array_shift($line_components));
 
-                if ($attribute_name0 === "aclRights") {
-                    $this->parse_aclrights($attributes, $line);
+                switch ($attribute_name0) {
+                    case "aclRights":
+                        $this->parse_aclrights($attributes, $line);
+                        break;
+                    case "dn":
+                        $attributes$attribute_name0 = trim(implode(';', $line_components));
+                        break;
+                    default:
+                        break;
                 }
             }
+
         } else {
             foreach ($lines as $line) {
                 $line_components = explode(':', $line);
@@ -875,12 +849,17 @@
                 $attribute_value = trim(implode(':', $line_components));
 
                 switch ($attribute_name) {
-                case "attributeLevelRights":
-                    $attributes'attributelevelrights' = $this->parse_attribute_level_rights($attribute_value);
-                    break;
-                case "entryLevelRights":
-                    $attributes'entrylevelrights' = $this->parse_entry_level_rights($attribute_value);
-                    break;
+                    case "attributeLevelRights":
+                        $attributes$attribute_name = $this->parse_attribute_level_rights($attribute_value);
+                        break;
+                    case "dn":
+                        $attributes$attribute_name = $attribute_value;
+                        break;
+                    case "entryLevelRights":
+                        $attributes$attribute_name = $this->parse_entry_level_rights($attribute_value);
+                        break;
+                    default:
+                        break;
                 }
             }
         }
@@ -989,28 +968,20 @@
         return $entrystrtolower($attribute);
     }
 
-    /**
-     * Get a specific LDAP entry attributes
-     *
-     * @param string $dn         Record identifier
-     * @param array  $attributes Attributes to return
-     *
-     * @return array Hash array (keys in lower case)
-     */
     public function get_entry_attributes($subject_dn, $attributes)
     {
-        $result = $this->get_entry($subject_dn, $attributes);
+        // @TODO: use get_entry?
+        $result = $this->search($subject_dn, '(objectclass=*)', 'base', $attributes);
 
         if (!$result) {
             return array();
         }
 
-        if (!in_array('*', $attributes) && !in_array('dn', $attributes)) {
-            unset($result'dn');
-        }
+        $entries  = $result->entries(true);
+        $entry_dn = key($entries);
+        $entry    = $entries$entry_dn;
 
-        // change keys case for historical reasons
-        return array_change_key_case($result, CASE_LOWER);
+        return $entry;
     }
 
     /**
@@ -1018,25 +989,17 @@
      *
      * @param string $dn         Record identifier
      * @param array  $attributes Attributes to return
-     * @param array  $controls   LDAP Controls
      *
-     * @return array Hash array (keys in original case)
+     * @return array Hash array
      */
-    public function get_entry($dn, $attributes = array("*"), $controls = array())
+    public function get_entry($dn, $attributes = array())
     {
         $rec = null;
 
-        if ($this->conn) {
+        if ($this->conn && $dn) {
             $this->_debug("C: Read dn: $dn (objectclass=*)");
 
-            if (!empty($controls)) {
-                $ldap_result = @ldap_read($this->conn, $dn, '(objectclass=*)', $attributes, 0, -1, -1, LDAP_DEREF_NEVER, $controls);
-            }
-            else {
-                $ldap_result = @ldap_read($this->conn, $dn, '(objectclass=*)', $attributes);
-            }
-
-            if ($ldap_result) {
+            if ($ldap_result = @ldap_read($this->conn, $dn, '(objectclass=*)', $attributes)) {
                 $this->_debug("S: OK");
 
                 if ($entry = ldap_first_entry($this->conn, $ldap_result)) {
@@ -1049,10 +1012,7 @@
             }
 
             if (!empty($rec)) {
-                $rec = self::normalize_entry($rec, true);
-                if ($dn) {
-                    $rec'dn' = $dn; // Add in the dn for the entry.
-                }
+                $rec'dn' = $dn; // Add in the dn for the entry.
             }
         }
 
@@ -1161,6 +1121,7 @@
             // fetch user attributes if requested
             if (!empty($attributes)) {
                 $attributes = $this->get_entry($entry_dn, $attributes);
+                $attributes = self::normalize_entry($attributes, true);
             }
 
             return $entry_dn;
@@ -1255,7 +1216,7 @@
             }
         }
         else {
-            $entry = $this->get_entry_attributes($dn, array('member', 'uniquemember', 'memberurl', 'objectclass'));
+            $entry = $this->get_entry($dn, array('member', 'uniquemember', 'memberurl', 'objectclass'));
 
             if (!$entry) {
                 return array();
@@ -1608,12 +1569,6 @@
      */
     public function search($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $attrs = array('dn'), $props = array(), $count_only = false)
     {
-        $controls = null;
-
-        if (!array_key_exists('sort', $props)) {
-            $props'sort' = false;
-        }
-
         if (!$this->conn) {
             $this->_debug("No active connection for " . __CLASS__ . "::" . __FUNCTION__);
             return false;
@@ -1644,17 +1599,14 @@
                 }
                 $this->_debug("D: total numsubordinates = " . $vlv_count);
             }
-            // ...or by parsing the controls in the response, and if that's not supported
-            // by fetching all records dn and counting them
-            else if (PHP_VERSION_ID < 70305 && !function_exists('ldap_parse_virtuallist_control')) {
+            // ...or by fetching all records dn and count them
+            else if (!function_exists('ldap_parse_virtuallist_control')) {
                 // @FIXME: this search will ignore $props'search'
                 $vlv_count = $this->search($base_dn, $filter, $scope, array('dn'), $props, true);
             }
 
-            $controls = $this->_vlv_set_controls($sort, $this->list_page, $this->page_size,
+            $this->vlv_active = $this->_vlv_set_controls($sort, $this->list_page, $this->page_size,
                 $this->_vlv_search($sort, $props'search'));
-
-            $this->vlv_active = (bool) $controls;
         }
         else {
             $this->vlv_active = false;
@@ -1690,32 +1642,18 @@
 
         $this->_debug("Executing search with return attributes: " . var_export($attrs, true));
 
-        if (is_array($controls)) {
-            $ldap_result = $function($this->conn, $base_dn, $filter, $attrs, 0, $sizelimit, $timelimit, LDAP_DEREF_NEVER, $controls);
-        }
-        else {
-            $ldap_result = @$function($this->conn, $base_dn, $filter, $attrs, 0, $sizelimit, $timelimit);
-        }
+        $ldap_result = @$function($this->conn, $base_dn, $filter, $attrs, 0, $sizelimit, $timelimit);
 
         if (!$ldap_result) {
             $this->_warning("LDAP: $function failed for dn=$base_dn. " . ldap_error($this->conn));
             return false;
         }
 
-        // when running on a PHP with server controls support we can
-        // retrieve the total count from the LDAP search result
-        if ($this->vlv_active && (is_array($controls) || function_exists('ldap_parse_virtuallist_control'))) {
+        // when running on a patched PHP we can use the extended functions
+        // to retrieve the total count from the LDAP search result
+        if ($this->vlv_active && function_exists('ldap_parse_virtuallist_control')) {
             if (ldap_parse_result($this->conn, $ldap_result, $errcode, $matcheddn, $errmsg, $referrals, $serverctrls)) {
-                if (PHP_VERSION_ID >= 70300) {
-                    $vlv_count   = (int) $serverctrlsself::CONTROL_VLV_RESPONSE'value''count';
-                    // FIXME: I don't know this is the same offset value as in ldap_parse_virtuallist_control() below
-                    //        but anyway it looks like we do not use that value for anything
-                    $last_offset = (int) $serverctrlsself::CONTROL_VLV_RESPONSE'value''target';
-                }
-                else {
-                    ldap_parse_virtuallist_control($this->conn, $serverctrls, $last_offset, $vlv_count, $vresult);
-                }
-
+                ldap_parse_virtuallist_control($this->conn, $serverctrls, $last_offset, $vlv_count, $vresult);
                 $this->_debug("S: VLV result: last_offset=$last_offset; content_count=$vlv_count");
             }
             else {
@@ -1850,7 +1788,7 @@
                     $val          = self::quote_string($val);
                     $val_filter = "(" . $field . $operator . $prefix . $val . $suffix . ")";
                 }
-                $filter .= "(|" . implode($val_filter) . ")";
+                $filter .= "(|" . implode($val_filter, '') . ")";
             }
             else {
                 $value = self::quote_string($value);
@@ -1889,17 +1827,14 @@
     public static function normalize_entry($entry, $flat = false)
     {
         $rec = array();
-
         for ($i=0; $i < $entry'count'; $i++) {
             $attr = $entry$i;
-            $_attr = strtolower($attr);
-
             for ($j=0; $j < $entry$attr'count'; $j++) {
-                $rec$_attr$j = $entry$attr$j;
+                $rec$attr$j = $entry$attr$j;
             }
 
-            if ($flat && count($rec$_attr) == 1) {
-                $rec$_attr = $rec$_attr0;
+            if ($flat && count($rec$attr) == 1) {
+                $rec$attr = $rec$attr0;
             }
         }
 
@@ -2133,44 +2068,39 @@
             return $this->_vlv_indexes_and_searches;
         }
 
-        $search_filter = '(objectclass=vlvsearch)';
-        $index_filter  = '(objectclass=vlvindex)';
-
-        $this->_debug("C: Search base dn: $config_root_dn scope sub with filter $search_filter");
+        $this->_debug("No VLV information available yet, refreshing");
 
+        $search_filter = '(objectclass=vlvsearch)';
         $search_result = ldap_search($this->conn, $config_root_dn, $search_filter, array('*'), 0, 0, 0);
 
         if ($search_result === false) {
-            $this->_debug("S: " . ldap_error($this->conn));
-            return array();
+            $this->_debug("Search for '$search_filter' on '$config_root_dn' failed:".ldap_error($this->conn));
+            return;
         }
 
-        $this->_debug("S: " . ldap_count_entries($this->conn, $search_result) . " record(s) found");
-
         $vlv_searches = new Net_LDAP3_Result($this->conn, $config_root_dn, $search_filter, 'sub', $search_result);
 
         if ($vlv_searches->count() < 1) {
-            return array();
+            $this->_debug("Empty result from search for '(objectclass=vlvsearch)' on '$config_root_dn'");
+            return;
         }
 
+        $index_filter = '(objectclass=vlvindex)';
+
         foreach ($vlv_searches->entries(true) as $vlv_search_dn => $vlv_search_attrs) {
             // The attributes we are interested in are as follows:
             $_vlv_base_dn = self::unified_dn($vlv_search_attrs'vlvbase');
             $_vlv_scope   = $vlv_search_attrs'vlvscope';
             $_vlv_filter  = $vlv_search_attrs'vlvfilter';
 
-            $this->_debug("C: Search base dn: $vlv_search_dn scope sub with filter $index_filter");
-
             // Multiple indexes may exist
             $index_result = ldap_search($this->conn, $vlv_search_dn, $index_filter, array('*'), 0, 0, 0);
 
             if ($index_result === false) {
-                $this->_debug("S: " . ldap_error($this->conn));
+                $this->_debug("Search for '$index_filter' on '$vlv_search_dn' failed:".ldap_error($this->conn));
                 continue;
             }
 
-            $this->_debug("S: " . ldap_count_entries($this->conn, $index_result) . " record(s) found");
-
             $vlv_indexes = new Net_LDAP3_Result($this->conn, $vlv_search_dn, $index_filter, 'sub', $index_result);
             $vlv_indexes = $vlv_indexes->entries(true);
 
@@ -2182,12 +2112,12 @@
             }
 
             $this->_vlv_indexes_and_searches = array(
-                $_vlv_base_dn => array(
-                    'scope'  => self::scopeint2str($_vlv_scope),
-                    'filter' => strtolower($_vlv_filter),
-                    'sort'   => $_vlv_sort,
-                ),
-            );
+                    $_vlv_base_dn => array(
+                            'scope'  => self::scopeint2str($_vlv_scope),
+                            'filter' => strtolower($_vlv_filter),
+                            'sort'   => $_vlv_sort,
+                        ),
+                );
         }
 
         // cache this
@@ -2254,7 +2184,7 @@
         return $_schema;
     }
 
-    protected function list_group_member($dn, $members, $recurse = true)
+    private function list_group_member($dn, $members, $recurse = true)
     {
         $this->_debug("Net_LDAP3::list_group_member($dn)");
 
@@ -2267,7 +2197,7 @@
         // Use the member attributes to return an array of member ldap objects
         // NOTE that the member attribute is supposed to contain a DN
         foreach ($members as $member) {
-            $member_entry = $this->get_entry_attributes($member, array('member', 'uniquemember', 'memberurl', 'objectclass'));
+            $member_entry = $this->get_entry($member, array('member', 'uniquemember', 'memberurl', 'objectclass'));
 
             if (empty($member_entry)) {
                 continue;
@@ -2287,7 +2217,7 @@
         return array_filter($group_members);
     }
 
-    protected function list_group_uniquemember($dn, $uniquemembers, $recurse = true)
+    private function list_group_uniquemember($dn, $uniquemembers, $recurse = true)
     {
         $this->_debug("Net_LDAP3::list_group_uniquemember($dn)", $entry);
 
@@ -2298,7 +2228,7 @@
         unset($uniquemembers'count');
 
         foreach ($uniquemembers as $member) {
-            $member_entry = $this->get_entry_attributes($member, array('member', 'uniquemember', 'memberurl', 'objectclass'));
+            $member_entry = $this->get_entry($member, array('member', 'uniquemember', 'memberurl', 'objectclass'));
 
             if (empty($member_entry)) {
                 continue;
@@ -2318,7 +2248,7 @@
         return array_filter($group_members);
     }
 
-    protected function list_group_memberurl($dn, $memberurls, $recurse = true)
+    private function list_group_memberurl($dn, $memberurls, $recurse = true)
     {
         $this->_debug("Net_LDAP3::list_group_memberurl($dn)");
 
@@ -2361,13 +2291,13 @@
      *
      * @return array URL elements
      */
-    protected function parse_memberurl($url)
+    private function parse_memberurl($url)
     {
         preg_match('/(.*):\/\/(.*)\/(.*)\?(.*)\?(.*)\?(.*)/', $url, $matches);
         return $matches;
     }
 
-    protected function modify_entry_attributes($subject_dn, $attributes)
+    private function modify_entry_attributes($subject_dn, $attributes)
     {
         if (is_array($attributes'rename') && !empty($attributes'rename')) {
             $olddn      = $attributes'rename''dn';
@@ -2395,9 +2325,9 @@
                 }
                 else {
                     $old_parent_dn_components = ldap_explode_dn($olddn, 0);
-                    unset($old_parent_dn_components'count');
+                    unset($old_parent_dn_components"count");
                     $old_rdn       = array_shift($old_parent_dn_components);
-                    $old_parent_dn = implode(',', $old_parent_dn_components);
+                    $old_parent_dn = implode(",", $old_parent_dn_components);
                     $subject_dn    = $newrdn . ',' . $old_parent_dn;
                 }
 
@@ -2424,7 +2354,7 @@
             }
             else {
                 $this->_debug("S: " . ldap_error($this->conn));
-                $this->_warning("LDAP: Failed to replace attributes on $subject_dn: " . $this->_encode_attrs($attributes'replace'));
+                $this->_warning("LDAP: Failed to replace attributes on $subject_dn: " . json_encode($attributes'replace'));
                 return false;
             }
         }
@@ -2439,7 +2369,7 @@
             }
             else {
                 $this->_debug("S: " . ldap_error($this->conn));
-                $this->_warning("LDAP: Failed to delete attributes on $subject_dn: " . $this->_encode_attrs($attributes'del'));
+                $this->_warning("LDAP: Failed to delete attributes on $subject_dn: " . json_encode($attributes'del'));
                 return false;
             }
         }
@@ -2454,7 +2384,7 @@
             }
             else {
                 $this->_debug("S: " . ldap_error($this->conn));
-                $this->_warning("LDAP: Failed to add attributes on $subject_dn: " . $this->_encode_attrs($attributes'add'));
+                $this->_warning("LDAP: Failed to add attributes on $subject_dn: " . json_encode($attributes'add'));
                 return false;
             }
         }
@@ -2462,35 +2392,36 @@
         return true;
     }
 
-    protected function parse_aclrights(&$attributes, $attribute_value)
+    private function parse_aclrights(&$attributes, $attribute_value)
     {
-        $components      = explode(':', $attribute_value);
-        $_acl_target     = array_shift($components);
-        $_acl_value      = trim(implode(':', $components));
+        $components = explode(':', $attribute_value);
+        $_acl_target = array_shift($components);
+        $_acl_value = trim(implode(':', $components));
+
         $_acl_components = explode(';', $_acl_target);
 
         switch ($_acl_components1) {
             case "entryLevel":
-                $attributes'entrylevelrights' = Array();
+                $attributes'entryLevelRights' = Array();
                 $_acl_value = explode(',', $_acl_value);
 
                 foreach ($_acl_value as $right) {
                     list($method, $bool) = explode(':', $right);
-                    if ($bool == "1" && !in_array($method, $attributes'entrylevelrights')) {
-                        $attributes'entrylevelrights' = $method;
+                    if ($bool == "1" && !in_array($method, $attributes'entryLevelRights')) {
+                        $attributes'entryLevelRights' = $method;
                     }
                 }
 
                 break;
 
             case "attributeLevel":
-                $attributes'attributelevelrights'$_acl_components2 = Array();
+                $attributes'attributeLevelRights'$_acl_components2 = Array();
                 $_acl_value = explode(',', $_acl_value);
 
                 foreach ($_acl_value as $right) {
                     list($method, $bool) = explode(':', $right);
-                    if ($bool == "1" && !in_array($method, $attributes'attributelevelrights'$_acl_components2)) {
-                        $attributes'attributelevelrights'$_acl_components2 = $method;
+                    if ($bool == "1" && !in_array($method, $attributes'attributeLevelRights'$_acl_components2)) {
+                        $attributes'attributeLevelRights'$_acl_components2 = $method;
                     }
                 }
 
@@ -2501,7 +2432,7 @@
         }
     }
 
-    protected function parse_attribute_level_rights($attribute_value)
+    private function parse_attribute_level_rights($attribute_value)
     {
         $attribute_value  = str_replace(", ", ",", $attribute_value);
         $attribute_values = explode(",", $attribute_value);
@@ -2526,7 +2457,7 @@
         return $attribute_value;
     }
 
-    protected function parse_entry_level_rights($attribute_value)
+    private function parse_entry_level_rights($attribute_value)
     {
         $_attribute_value = array();
 
@@ -2541,38 +2472,53 @@
         return $_attribute_value;
     }
 
-    protected function supported_controls()
+    private function supported_controls()
     {
-        $metadata = $this->server_metadata();
+        if (!empty($this->supported_controls)) {
+            return $this->supported_controls;
+        }
 
-        return (array) $metadata'supportedcontrol';
-    }
+        $this->_info("Obtaining supported controls");
 
-    protected function vendor_name()
-    {
-        $metadata = $this->server_metadata();
+        if ($result = $this->search('', '(objectclass=*)', 'base', array('supportedcontrol'))) {
+            $result  = $result->entries(true);
+            $control = $result'''supportedcontrol';
+        }
+        else {
+            $control = array();
+        }
+
+        $this->_info("Obtained " . count($control) . " supported controls");
+        $this->supported_controls = $control;
 
-        return (string) $metadata'vendorname';
+        return $control;
     }
 
-    protected function server_metadata()
+    private function vendor_name()
     {
-        if ($this->_metadata === null) {
-            $this->_debug("Obtaining LDAP server metadata");
+        if (!empty($this->vendor_name)) {
+            return $this->vendor_name;
+        }
 
-            $result = $this->get_entry('', array('vendorname', 'supportedcontrol'));
+        $this->_info("Obtaining LDAP server vendor name");
 
-            if ($result) {
-                $this->_metadata = $result;
-                $this->_debug("LDAP Server metadata: " . var_export($result, true));
-            }
-            else {
-                $this->_metadata = array();
-                $this->_warning("LDAP: Failed to get server metadata");
-            }
+        if ($result = $this->search('', '(objectclass=*)', 'base', array('vendorname'))) {
+            $result  = $result->entries(true);
+            $name = $result'''vendorname';
         }
+        else {
+            $name = false;
+        }
+
+        if ($name !== false) {
+            $this->_info("Vendor name is $name");
+        } else {
+            $this->_info("No vendor name!");
+        }
+
+        $this->vendor = $name;
 
-        return $this->_metadata;
+        return $name;
     }
 
     protected function _alert()
@@ -2637,16 +2583,36 @@
     }
 
     /**
-     * Convert attributes array into a string for logging
-     * Remove plain text passwords
+     * Add BER sequence with correct length and the given identifier
      */
-    private function _encode_attrs($attributes)
+    private static function _ber_addseq($str, $identifier)
+    {
+        $len = dechex(strlen($str)/2);
+        if (strlen($len) % 2 != 0) {
+            $len = '0'.$len;
+        }
+
+        return $identifier . $len . $str;
+    }
+
+    /**
+     * Returns BER encoded integer value in hex format
+     */
+    private static function _ber_encode_int($offset)
     {
-        if (isset($attributes'userpassword')) {
-            $attributes'userpassword' = '*';
+        $val    = dechex($offset);
+        $prefix = '';
+
+        // check if bit 8 of high byte is 1
+        if (preg_match('/^89abcdef/', $val)) {
+            $prefix = '00';
         }
 
-        return json_encode($attributes);
+        if (strlen($val)%2 != 0) {
+            $prefix .= '0';
+        }
+
+        return $prefix . $val;
     }
 
     /**
@@ -2723,107 +2689,6 @@
         return implode(',', $result);
     }
 
-    private function _fuzzy_search_prefix()
-    {
-        switch ($this->config_get("fuzzy_search", 2)) {
-            case 2:
-                return "*";
-                break;
-            case 1:
-            case 0:
-            default:
-                return "";
-                break;
-        }
-    }
-
-    private function _fuzzy_search_suffix()
-    {
-        switch ($this->config_get("fuzzy_search", 2)) {
-            case 2:
-                return "*";
-                break;
-            case 1:
-                return "*";
-            case 0:
-            default:
-                return "";
-                break;
-        }
-    }
-
-    /**
-     * Return the search string value to be used in VLV controls
-     *
-     * @param array        $sort   List of attributes in vlv index
-     * @param array|string $search Search string or attribute => value hash
-     *
-     * @return string Search string
-     */
-    private function _vlv_search($sort, $search)
-    {
-        if (!empty($this->additional_filter)) {
-            $this->_debug("Not setting a VLV search filter because we already have a filter");
-            return;
-        }
-
-        if (empty($search)) {
-            return;
-        }
-
-        foreach ((array) $search as $attr => $value) {
-            if ($attr && !in_array(strtolower($attr), $sort)) {
-                $this->_debug("Cannot use VLV search using attribute not indexed: $attr (not in " . var_export($sort, true) . ")");
-                return;
-            }
-            else {
-                return $value . $this->_fuzzy_search_suffix();
-            }
-        }
-    }
-
-    /**
-     * Set server controls for Virtual List View (paginated listing)
-     */
-    private function _vlv_set_controls($sort, $list_page, $page_size, $search = null)
-    {
-        $sort_ctrl = array(
-            'oid'   => self::CONTROL_SORT_REQUEST,
-            'value' => self::_sort_ber_encode($sort)
-        );
-
-        if (!empty($search)) {
-            $this->_debug("_vlv_set_controls to include search: " . var_export($search, true));
-        }
-
-        $vlv_ctrl  = array(
-            'oid' => self::CONTROL_VLV_REQUEST,
-            'value' => self::_vlv_ber_encode(
-                    $offset = ($list_page-1) * $page_size + 1,
-                    $page_size,
-                    $search
-            ),
-            'iscritical' => true
-        );
-
-        $this->_debug("C: set controls sort=" . join(' ', unpack('H'.(strlen($sort_ctrl'value')*2), $sort_ctrl'value'))
-            . " (" . implode(',', (array) $sort) . ");"
-            . " vlv=" . join(' ', (unpack('H'.(strlen($vlv_ctrl'value')*2), $vlv_ctrl'value'))) . " ($offset/$page_size)");
-
-        $controls = array($sort_ctrl, $vlv_ctrl);
-
-        if (PHP_VERSION_ID >= 70305) {
-            return $controls;
-        }
-
-        if (!ldap_set_option($this->conn, LDAP_OPT_SERVER_CONTROLS, $controls)) {
-            $this->_debug("S: ".ldap_error($this->conn));
-            return false;
-        }
-
-        return true;
-    }
-
     /**
      * create ber encoding for sort control
      *
@@ -2849,6 +2714,18 @@
     }
 
     /**
+     * Returns ascii string encoded in hex
+     */
+    private static function _string2hex($str)
+    {
+        $hex = '';
+        for ($i=0; $i < strlen($str); $i++)
+            $hex .= dechex(ord($str$i));
+
+        return $hex;
+    }
+
+    /**
      * Generate BER encoded string for Virtual List View option
      *
      * @param integer List offset (first record)
@@ -2910,45 +2787,101 @@
         return pack('H'.strlen($str), $str);
     }
 
-    /**
-     * Add BER sequence with correct length and the given identifier
-     */
-    private static function _ber_addseq($str, $identifier)
+    private function _fuzzy_search_prefix()
     {
-        $len = dechex(strlen($str)/2);
-        if (strlen($len) % 2 != 0) {
-            $len = '0'.$len;
+        switch ($this->config_get("fuzzy_search", 2)) {
+            case 2:
+                return "*";
+                break;
+            case 1:
+            case 0:
+            default:
+                return "";
+                break;
         }
+    }
 
-        return $identifier . $len . $str;
+    private function _fuzzy_search_suffix()
+    {
+        switch ($this->config_get("fuzzy_search", 2)) {
+            case 2:
+                return "*";
+                break;
+            case 1:
+                return "*";
+            case 0:
+            default:
+                return "";
+                break;
+        }
     }
 
     /**
-     * Returns BER encoded integer value in hex format
+     * Return the search string value to be used in VLV controls
+     *
+     * @param array        $sort   List of attributes in vlv index
+     * @param array|string $search Search string or attribute => value hash
+     *
+     * @return string Search string
      */
-    private static function _ber_encode_int($offset)
+    private function _vlv_search($sort, $search)
     {
-        $val    = dechex($offset);
-        $prefix = '';
-
-        // check if bit 8 of high byte is 1
-        if (preg_match('/^89abcdef/', $val)) {
-            $prefix = '00';
+        if (!empty($this->additional_filter)) {
+            $this->_debug("Not setting a VLV search filter because we already have a filter");
+            return;
         }
 
-        if (strlen($val)%2 != 0) {
-            $prefix .= '0';
+        if (empty($search)) {
+            return;
         }
 
-        return $prefix . $val;
+        foreach ((array) $search as $attr => $value) {
+            if ($attr && !in_array(strtolower($attr), $sort)) {
+                $this->_debug("Cannot use VLV search using attribute not indexed: $attr (not in " . var_export($sort, true) . ")");
+                return;
+            }
+            else {
+                return $value . $this->_fuzzy_search_suffix();
+            }
+        }
     }
 
     /**
-     * Returns ascii string encoded in hex
+     * Set server controls for Virtual List View (paginated listing)
      */
-    private static function _string2hex($str)
+    private function _vlv_set_controls($sort, $list_page, $page_size, $search = null)
     {
-        return implode(unpack("H*", $str));
+        $sort_ctrl = array(
+            'oid'   => "1.2.840.113556.1.4.473",
+            'value' => self::_sort_ber_encode($sort)
+        );
+
+        if (!empty($search)) {
+            $this->_debug("_vlv_set_controls to include search: " . var_export($search, true));
+        }
+
+        $vlv_ctrl  = array(
+            'oid' => "2.16.840.1.113730.3.4.9",
+            'value' => self::_vlv_ber_encode(
+                    $offset = ($list_page-1) * $page_size + 1,
+                    $page_size,
+                    $search
+            ),
+            'iscritical' => true
+        );
+
+        $this->_debug("C: set controls sort=" . join(' ', unpack('H'.(strlen($sort_ctrl'value')*2), $sort_ctrl'value'))
+            . " (" . implode(',', (array) $sort) . ");"
+            . " vlv=" . join(' ', (unpack('H'.(strlen($vlv_ctrl'value')*2), $vlv_ctrl'value'))) . " ($offset/$page_size)");
+
+        if (!ldap_set_option($this->conn, LDAP_OPT_SERVER_CONTROLS, array($sort_ctrl, $vlv_ctrl))) {
+            $this->_debug("S: ".ldap_error($this->conn));
+            $this->set_error(self::ERROR_SEARCH, 'vlvnotsupported');
+
+            return false;
+        }
+
+        return true;
     }
 
     /**
@@ -3040,9 +2973,8 @@
     public function set_cache_data($key, $data, $ttl = 3600)
     {
         if ($cache = $this->get_cache()) {
-            $flags = defined('MEMCACHE_COMPRESSED') ? MEMCACHE_COMPRESSED : 0;
-            if (!method_exists($cache, 'replace') || !$cache->replace($key, $data, $flags, $ttl)) {
-                return $cache->set($key, $data, $flags, $ttl);
+            if (!method_exists($cache, 'replace') || !$cache->replace($key, $data, MEMCACHE_COMPRESSED, $ttl)) {
+                return $cache->set($key, $data, MEMCACHE_COMPRESSED, $ttl);
             }
             else {
                 return true;
@@ -3066,8 +2998,8 @@
         }
 
         $ckey = 'domain.root::' . $domain;
-        if (array_key_exists($ckey, $this->icache)) {
-            return $this->icache$ckey;
+        if ($result = $this->icache$ckey) {
+            return $result;
         }
 
         $this->_debug("Net_LDAP3::domain_root_dn($domain)");
@@ -3120,7 +3052,7 @@
         $ckey  = 'domain::' . $domain;
         $ickey = $ckey . '::' . md5(implode(',', $attributes));
 
-        if (array_key_exists($ickey, $this->icache)) {
+        if (isset($this->icache$ickey)) {
             return $this->icache$ickey;
         }
 
@@ -3131,7 +3063,6 @@
 
         if ($domain_dn) {
             $result = $this->get_entry_attributes($domain_dn, $attributes);
-
             if (!empty($result)) {
                 $result'dn' = $domain_dn;
             }

pear-Net-LDAP3-1.1.3.tar.gz/lib/Net/LDAP3/Result.php -> pear-Net-LDAP3-1.0.7.tar.gz/lib/Net/LDAP3/Result.php Changed

php-net-ldap3.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2281 0

Request History

vanmeeuwen created request almost 6 years ago

Check in 1.0.7

vanmeeuwen superseded request almost 6 years ago

superseded by 2282