remove only native users from qualified users group (#546)

Author: simonLeary42

test/functional/WorkerUpdateQualifiedUsersGroupTest.php

@@ -11,7 +11,11 @@ public function testQualifyUser()
         $pi_group = $USER->getPIGroup();
         $this->switchUser("Blank");
         $user = $USER;
-        $expectedOutput = ["added" => [$user->uid], "removed" => []];
+        $expectedOutput = [
+            "added" => [$user->uid],
+            "removed" => [],
+            "not removed (non-native)" => [],
+        ];
         try {
             $pi_group_entry = $LDAP->getPIGroupEntry($pi_group->gid);
             $pi_group_entry->appendAttribute("memberuid", $user->uid);
@@ -36,7 +40,11 @@ public function testDisqualifyUser()
     {
         global $USER, $LDAP, $SQL, $MAILER, $WEBHOOK;
         $this->switchUser("Blank");
-        $expectedOutput = ["added" => [], "removed" => [$USER->uid]];
+        $expectedOutput = [
+            "added" => [],
+            "removed" => [$USER->uid],
+            "not removed (non-native)" => [],
+        ];
         try {
             $qualified_user_group = $LDAP->userFlagGroups["qualified"];
             $qualified_user_group->addMemberUID($USER->uid);
@@ -54,4 +62,33 @@ public function testDisqualifyUser()
             }
         }
     }
+
+    public function testIgnoreNonNativeUser()
+    {
+        global $USER, $LDAP, $SQL, $MAILER, $WEBHOOK;
+        $this->switchUser("Blank");
+        $expectedOutput = [
+            "added" => [],
+            "removed" => [],
+            "not removed (non-native)" => ["non_native_user1"],
+        ];
+        try {
+            $qualified_user_group = $LDAP->userFlagGroups["qualified"];
+            $qualified_user_group->addMemberUID("non_native_user1");
+            [$_, $output_lines] = executeWorker("update-qualified-users-group.php");
+            $output_str = implode("\n", $output_lines);
+            $output = jsonDecode($output_str, associative: true);
+            $this->assertEquals($expectedOutput, $output);
+            // refresh LDAP to pick up changes from subprocess
+            unset($GLOBALS["ldapconn"]);
+            $this->switchUser("Blank");
+            $this->assertTrue(
+                $LDAP->userFlagGroups["qualified"]->memberUIDExists("non_native_user1"),
+            );
+        } finally {
+            if ($LDAP->userFlagGroups["qualified"]->memberUIDExists("non_native_user1")) {
+                $LDAP->userFlagGroups["qualified"]->removeMemberUID("non_native_user1");
+            }
+        }
+    }
 }

workers/update-qualified-users-group.php

@@ -18,14 +18,20 @@
 $users_with_at_least_one_group = array_merge(
     ...array_map(fn($x) => $x["memberuid"], $pi_groups_attributes),
 );
-$qualified_list_after = array_values(array_unique($users_with_at_least_one_group));
+$users_with_at_least_one_group = array_values(array_unique($users_with_at_least_one_group));
+$native_users_attributes = $LDAP->getAllNativeUsersAttributes(["uid"]);
+$native_users = array_map(fn($x) => $x["uid"][0], $native_users_attributes);
+$non_native_users = array_diff($qualified_list_before, $native_users);
+$non_native_users = array_values(array_unique($non_native_users));
+$qualified_list_after = array_merge($users_with_at_least_one_group, $non_native_users);
 sort($qualified_list_after);
 $users_added = array_values(array_diff($qualified_list_after, $qualified_list_before));
 $users_removed = array_values(array_diff($qualified_list_before, $qualified_list_after));
 echo jsonEncode(
     [
         "added" => $users_added,
         "removed" => $users_removed,
+        "not removed (non-native)" => $non_native_users,
     ],
     JSON_PRETTY_PRINT,
 ) . "\n";