fix update-ldap-cache.php

Author: simonLeary42

workers/update-ldap-cache.php

@@ -32,16 +32,20 @@
     echo " use -f argument to flush cache, or -u argument to update without flush.\n";
 } else {
     echo "updating cache...\n";
-    echo "waiting for LDAP response (users)...\n";
-    $users = $LDAP->search("objectClass=posixAccount", $CONFIG["ldap"]["basedn"]);
-    echo "response received.\n";
-    // phpcs:disable
-    $user_CNs = array_map(function ($x){return $x->getAttribute("cn")[0];}, $users);
-    // phpcs:enable
+
+    $user_CNs = $LDAP->getUserGroup()->getAttribute("memberuid");
     sort($user_CNs);
     $REDIS->setCache("sorted_users", "", $user_CNs);
+
+    // search entire tree, some users created for admin purposes might not be in the normal OU
+    echo "waiting for LDAP search (users)...\n";
+    $users = $LDAP->search("objectClass=posixAccount", $CONFIG["ldap"]["basedn"]);
+    echo "response received.\n";
     foreach ($users as $user) {
         $uid = $user->getAttribute("cn")[0];
+        if (!in_array($uid, $user_CNs)) {
+            continue;
+        }
         $REDIS->setCache($uid, "firstname", $user->getAttribute("givenname")[0]);
         $REDIS->setCache($uid, "lastname", $user->getAttribute("sn")[0]);
         $REDIS->setCache($uid, "org", $user->getAttribute("o")[0]);
@@ -52,21 +56,21 @@
     }
 
     $org_group_ou = new LDAPEntry($LDAP->getConn(), $CONFIG["ldap"]["orggroup_ou"]);
-    echo "waiting for LDAP response (org_groups)...\n";
-    $org_groups = $LDAP->search("objectClass=posixGroup", $CONFIG["ldap"]["basedn"]);
+    echo "waiting for LDAP search (org groups)...\n";
+    $org_groups = $org_group_ou->getChildrenArray(true);
     echo "response received.\n";
     // phpcs:disable
-    $org_group_CNs = array_map(function($x){return $x->getAttribute("cn")[0];}, $org_groups);
+    $org_group_CNs = array_map(function($x){return $x["cn"][0];}, $org_groups);
     // phpcs:enable
     sort($org_group_CNs);
     $REDIS->setCache("sorted_orgs", "", $org_group_CNs);
     foreach ($org_groups as $org_group) {
-        $gid = $org_group->getAttribute("cn")[0];
-        $REDIS->setCache($gid, "members", $org_group->getAttribute("memberuid"));
+        $gid = $org_group["cn"][0];
+        $REDIS->setCache($gid, "members", (@$org_group["memberuid"] ?? []));
     }
 
     $pi_group_ou = new LDAPEntry($LDAP->getConn(), $CONFIG["ldap"]["pigroup_ou"]);
-    echo "waiting for LDAP response (pi_groups)...\n";
+    echo "waiting for LDAP search (pi groups)...\n";
     $pi_groups = $pi_group_ou->getChildrenArray(true);
     echo "response received.\n";
     // phpcs:disable
@@ -75,13 +79,14 @@
     sort($pi_group_CNs);
     // FIXME should be sorted_pi_groups
     $REDIS->setCache("sorted_groups", "", $pi_group_CNs);
+
     $user_pi_group_member_of = [];
     foreach ($user_CNs as $uid) {
         $user_pi_group_member_of[$uid] = [];
     }
     foreach ($pi_groups as $pi_group) {
-        $gid = $pi_group->getAttribute("cn")[0];
-        $REDIS->setCache($gid, "members", $pi_group->getAttribute("memberuid"));
+        $gid = $pi_group["cn"][0];
+        $REDIS->setCache($gid, "members", (@$pi_group["memberuid"] ?? []));
     }
     foreach ($user_pi_group_member_of as $uid => $pi_groups) {
         // FIXME should be pi_groups