Request 2588 (accepted)

Overview

Request 2588 (accepted)

Check in 1.1.1

Created by vanmeeuwen over 5 years ago
In state accepted

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

debian.changelog Changed

pear-Net-LDAP3-1.1.0.tar.gz/composer.json -> pear-Net-LDAP3-1.1.1.tar.gz/composer.json Changed

pear-Net-LDAP3-1.1.0.tar.gz/lib/Net/LDAP3.php -> pear-Net-LDAP3-1.1.1.tar.gz/lib/Net/LDAP3.php Changed

@@ -278,20 +278,24 @@
             $ldap->connect();
             $ldap->bind($this->_current_bind_dn, $this->_current_bind_pw);
 
-            $replica_attrs = array(
+            $attrs = array(
+                'nsDS5ReplicaBindDN',
+                'nsDS5ReplicaType',
+                'nsds5ReplicaPurgeDelay',
+                'nsDS5Flags'
+            );
+
+            $replica_attrs = $ldap->get_entry_attributes($replica_dn, $attrs);
+            $replica_attrs = array_merge((array) $replica_attrs, array(
                 'cn' => 'replica',
                 'objectclass' => array(
                     'top',
                     'nsds5replica',
                     'extensibleobject',
                 ),
-                '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")
-            );
+                'nsDS5ReplicaId'   => ($max_repl_id + $num + 1),
+                'nsDS5ReplicaRoot' => $domain_root_dn,
+            ));
 
             $new_replica_dn = 'cn=replica,cn="' . $domain_root_dn . '",cn=mapping tree,cn=config';
 
@@ -985,6 +989,14 @@
         return $entry[strtolower($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);
@@ -997,7 +1009,8 @@
             unset($result['dn']);
         }
 
-        return $result;
+        // change keys case for historical reasons
+        return array_change_key_case($result, CASE_LOWER);
     }
 
     /**
@@ -1007,7 +1020,7 @@
      * @param array  $attributes Attributes to return
      * @param array  $controls   LDAP Controls
      *
-     * @return array Hash array
+     * @return array Hash array (keys in original case)
      */
     public function get_entry($dn, $attributes = array("*"), $controls = array())
     {
@@ -1242,7 +1255,7 @@
             }
         }
         else {
-            $entry = $this->get_entry($dn, array('member', 'uniquemember', 'memberurl', 'objectclass'));
+            $entry = $this->get_entry_attributes($dn, array('member', 'uniquemember', 'memberurl', 'objectclass'));
 
             if (!$entry) {
                 return array();
@@ -1831,7 +1844,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);
@@ -2245,7 +2258,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($member, array('member', 'uniquemember', 'memberurl', 'objectclass'));
+            $member_entry = $this->get_entry_attributes($member, array('member', 'uniquemember', 'memberurl', 'objectclass'));
 
             if (empty($member_entry)) {
                 continue;
@@ -2276,7 +2289,7 @@
         unset($uniquemembers['count']);
 
         foreach ($uniquemembers as $member) {
-            $member_entry = $this->get_entry($member, array('member', 'uniquemember', 'memberurl', 'objectclass'));
+            $member_entry = $this->get_entry_attributes($member, array('member', 'uniquemember', 'memberurl', 'objectclass'));
 
             if (empty($member_entry)) {
                 continue;
@@ -2373,9 +2386,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;
                 }
 
@@ -2402,7 +2415,7 @@
             }
             else {
                 $this->_debug("S: " . ldap_error($this->conn));
-                $this->_warning("LDAP: Failed to replace attributes on $subject_dn: " . json_encode($attributes['replace']));
+                $this->_warning("LDAP: Failed to replace attributes on $subject_dn: " . $this->_encode_attrs($attributes['replace']));
                 return false;
             }
         }
@@ -2417,7 +2430,7 @@
             }
             else {
                 $this->_debug("S: " . ldap_error($this->conn));
-                $this->_warning("LDAP: Failed to delete attributes on $subject_dn: " . json_encode($attributes['del']));
+                $this->_warning("LDAP: Failed to delete attributes on $subject_dn: " . $this->_encode_attrs($attributes['del']));
                 return false;
             }
         }
@@ -2432,7 +2445,7 @@
             }
             else {
                 $this->_debug("S: " . ldap_error($this->conn));
-                $this->_warning("LDAP: Failed to add attributes on $subject_dn: " . json_encode($attributes['add']));
+                $this->_warning("LDAP: Failed to add attributes on $subject_dn: " . $this->_encode_attrs($attributes['add']));
                 return false;
             }
         }
@@ -2442,10 +2455,9 @@
 
     protected 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_components[1]) {
@@ -2616,6 +2628,19 @@
     }
 
     /**
+     * Convert attributes array into a string for logging
+     * Remove plain text passwords
+     */
+    private function _encode_attrs($attributes)
+    {
+        if (isset($attributes['userpassword'])) {
+            $attributes['userpassword'] = '*';
+        }
+
+        return json_encode($attributes);
+    }
+
+    /**
      * Quotes attribute value string
      *
      * @param string $str     Attribute value

php-net-ldap3.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2588 0

Request History

vanmeeuwen created request over 5 years ago

Check in 1.1.1

vanmeeuwen accepted review over 5 years ago

vanmeeuwen approved review over 5 years ago

vanmeeuwen accepted request over 5 years ago