fix update-ldap-cache.php

Author: simonLeary42

resources/lib/UnityLDAP.php

@@ -332,35 +332,4 @@ public function getOrgGroupEntry($gid)
         $gid = ldap_escape($gid, LDAP_ESCAPE_DN);
         return $this->getEntry(unityLDAP::RDN . "=$gid," . $this->STR_ORGGROUPOU);
     }
-
-    public static function parseUserChildrenArray(array $userChildrenArray): array
-    {
-        // input comes from LdapEntry::getChildrenArray on a UnityUser
-        $output = [];
-        $required_string_attributes = [
-            "gidnumber",
-            "givenname",
-            "homedirectory",
-            "loginshell",
-            "mail",
-            "o",
-            "sn",
-            "uid",
-            "uidnumber",
-            "gecos",
-        ];
-        foreach ($required_string_attributes as $key) {
-            $output[$key] = $userChildrenArray[$key][0];
-        }
-        $output["firstname"] = $output["givenname"];
-        $output["lastname"] = $output["sn"];
-        $output["org"] = $output["o"];
-        $output["objectclass"] = $userChildrenArray["objectclass"];
-        if (array_key_exists("sspublickey", $userChildrenArray)) {
-            $output["sshpublickey"] = $userChildrenArray["sshpublickey"];
-        } else {
-            $output["sshpublickey"] = [];
-        }
-        return $output;
-    }
 }

workers/update-ldap-cache.php

@@ -21,36 +21,35 @@
 
 if ((!is_null($REDIS->getCache("initialized", "")) and (!array_key_exists("u", $options)))) {
     echo "cache is already initialized, nothing doing.";
-    echo " use -f argument to flush cache, or -u argument to update without flush.";
+    echo " use -f argument to flush cache, or -u argument to update without flush.\n";
 } else {
     echo "updating cache...\n";
-    $user_ou = new LDAPEntry($LDAP->getConn(), $CONFIG["ldap"]["user_ou"]);
     echo "waiting for LDAP response (users)...\n";
-    $users = $user_ou->getChildrenArray(true);
+    $users = $LDAP->search("objectClass=posixAccount", $CONFIG["ldap"]["basedn"]);
     echo "response received.\n";
     // phpcs:disable
-    $user_CNs = array_map(function ($x){return $x["cn"][0];}, $users);
+    $user_CNs = array_map(function ($x){return $x->getAttribute("cn")[0];}, $users);
     // phpcs:enable
     sort($user_CNs);
     $REDIS->setCache("sorted_users", "", $user_CNs);
     foreach ($users as $user) {
-        $attribute_array = UnityLDAP::parseUserChildrenArray($user);
-        foreach ($attribute_array as $key => $val) {
-            $REDIS->setCache($user["cn"][0], $key, $val);
+        $cn = $user->getAttribute("cn")[0];
+        foreach ($user->getAttributes() as $key => $val) {
+            $REDIS->setCache($cn, $key, $val);
         }
     }
 
     $org_group_ou = new LDAPEntry($LDAP->getConn(), $CONFIG["ldap"]["orggroup_ou"]);
     echo "waiting for LDAP response (org_groups)...\n";
-    $org_groups = $org_group_ou->getChildrenArray(true);
+    $org_groups = $LDAP->search("objectClass=posixGroup", $CONFIG["ldap"]["basedn"]);
     echo "response received.\n";
     // phpcs:disable
-    $org_group_CNs = array_map(function($x){return $x["cn"][0];}, $org_groups);
+    $org_group_CNs = array_map(function($x){return $x->getAttribute("cn")[0];}, $org_groups);
     // phpcs:enable
     sort($org_group_CNs);
     $REDIS->setCache("sorted_orgs", "", $org_group_CNs);
     foreach ($org_groups as $org_group) {
-        $REDIS->setCache($org_group["cn"][0], "members", $org_group["memberuid"]);
+        $REDIS->setCache($org_group->getAttribute("cn")[0], "members", $org_group->getAttribute("memberuid"));
     }
 
     $pi_group_ou = new LDAPEntry($LDAP->getConn(), $CONFIG["ldap"]["pigroup_ou"]);