From 2990356aa8c84ad592cda18b7437e0caf12a3ade Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 14 Aug 2023 07:26:09 +0200
Subject: [PATCH 7/9] Revert "source code and definition adjustments for the
 group extension."

This reverts a variant of commit 6537afc7daed7506ab4fe35030311f7d44994b39.

Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
---
 plugins/admin/groups/class_group.inc          | 247 ++++++++++++------
 .../groups/userSelect/class_userSelect.inc    |  12 +-
 2 files changed, 178 insertions(+), 81 deletions(-)

--- a/plugins/admin/groups/class_group.inc
+++ b/plugins/admin/groups/class_group.inc
@@ -60,14 +60,18 @@
     /* attribute list for save action */
     var $attributes= array("cn", "description", "gidNumber","sambaGroupType","sambaSID","member");
     var $objectclasses= array("top");
+
     var $CopyPasteVars  = array("force_gid","fon_group","smbgroup","groupType","sambaSID","sambaDomainName","SID","nagios_group","sambaGroupType");
+
     var $multiple_support = TRUE;
 
+
     // Lists 
     private $memberList;    // Single group editing
     private $commonList;    // (Multiple support active)
     private $partialList;   // (Multiple support active)
 
+
     function __construct(&$config, $dn= NULL)
     {
         /* Set rfc2307bis flag */
@@ -87,7 +91,21 @@
         $this->orig_cn= $this->cn;
 
         /* Get member list */
-        $this->members =$this->reload($this->attrs);
+        if (isset($this->attrs['member'][0])){
+            $tmp= array();
+            for ($i= 0; $i<$this->attrs['member']['count']; $i++){
+                $tmp[]= $this->attrs['member'][$i];
+            }
+            $ldap= $this->config->get_ldap_link();
+            $ldap->cd($this->config->current['BASE']);
+            foreach ($tmp as $member => $dn) {
+                $ldap->cat($dn,array("dn","cn","uid","sn","givenName","gidNumber"));
+                while ($attrs = $ldap->fetch()) {
+                    $this->members[$attrs['cn'][0]]= $attrs;
+                }
+            }
+            ksort ($this->members);
+        }
 
         /* Save gidNumber for later use */
         if (isset($this->attrs['gidNumber'])){
@@ -184,6 +202,8 @@
         $this->baseSelector->setHeight(300);
         $this->baseSelector->update(true);
 
+
+
         // Prepare lists
         $this->memberList = new sortableListing();
         $this->memberList->setDeleteable(true);
@@ -195,10 +215,7 @@
         $this->memberList->setColspecs(array('20px','*','*','20px'));
         $this->memberList->setDefaultSortColumn(1);
 
-        // Set the dns of selected Group(s)
-        if (!$this->dns[0]) {
-            $this->dns[] = $this->dn;
-        }
+        $this->reload(TRUE);
     }
 
     function execute()
@@ -245,13 +262,17 @@
                 if($action['action'] == 'delete' && preg_match("/w/",$this->getacl("member"))){
                     foreach ($action['targets'] as $id){
                         $value = $this->$list->getKey($id);
-                        $this->removeMember($value);
+                        $this->removeUser($value);
                     }
+                    $this->reload();
                 }
             }
         }
 
         /* Add objects? */
+        if (!$this->dns[0]) {
+            $this->dns[] = $this->dn;
+        }
         if (isset($_POST["edit_membership"]) && preg_match("/w/",$this->getacl("member"))){
             $this->userSelect= new userSelect($this->config, get_userinfo(), $this->dns);
         }
@@ -269,7 +290,9 @@
                 $headpage = $this->userSelect->getHeadpage();
                 foreach($users['targets'] as $dn){
                     $attrs = $headpage->getEntry($dn);
-                    $this->addMember($attrs['dn']);                        
+                    $this->addUser($attrs['dn']);                        
+
+                    $this->reload();
                 }
             }
             $this->userSelect= NULL;
@@ -315,17 +338,20 @@
         $smarty->assign("groupTypes", set_post($groupTypes));
         $smarty->assign("groupType",  set_post($this->groupType));
 
+
         /* Members and users */
         if(!$this->multiple_support_active){
             $this->memberList->setAcl($this->getacl("member"));
             $data = $lData = array();
-            foreach($this->members as $member => $values){
-                if (!in_array($values['dn'], $this->dns)) {                
-                    $data[$member] = $values;
-                    $cn = _("Unknown");
-                    if (isset($values['cn']) && isset($values['cn'][0])) $cn = $values['cn'][0];
+            foreach($this->members as $cn => $member){
+                if ($cn !== $this->cn) {                
+                    $data[$cn] = $member;
+                    $givenName = $sn = $cn = _("Unknown");
+                    // if(isset($member['sn']) && isset($member['sn'][0])) $sn = $member['sn'][0];
+                    if (isset($member['cn']) && isset($member['cn'][0])) $cn = $member['cn'][0];
+                    //if(isset($member['givenName']) && isset($member['givenName'][0])) $givenName = $member['givenName'][0];
                     $image = image('images/false.png');
-                    if(isset($values['sn'])){
+                    if(isset($member['sn'])){
                         switch ($theme) {
                             case 'classic':
                                 $image = image("plugins/users/images/select_user.png");
@@ -335,7 +361,7 @@
                                 $image = image("<i class='material-icons'>person</i>");
                                 break;
                         }
-                    }elseif(isset($values['gidNumber'])){
+                    }elseif(isset($member['gidNumber'])){
                         switch ($variable) {
                             case 'classic':
                                 $image = image("plugins/groups/images/select_group.png");
@@ -346,7 +372,7 @@
                                 break;
                         }
                     }
-                    $lData[$member] = array('data' => array($image,$cn, $data[$member]['uid'][0] ?? ""));
+                    $lData[$cn] = array('data' => array($image,$cn/*,$sn,$givenName*/, $data[$cn]['uid'][0] ?? ""));
                 }
             }
             $this->memberList->setListData($data,$lData);
@@ -360,13 +386,15 @@
             $this->partialList->setAcl($this->getacl("member"));
 
             $data = $lData = array();
-            foreach($this->members as $member => $values){
-                if (!in_array($values['dn'], $this->dns)) {
-                    $data[$member] = $values;
-                    $sn = _("Unknown");
-                    if(isset($values['cn'][0])) $cn = $values['cn'][0];
+            foreach($this->members as $cn => $member){
+                if (!in_array($member['dn'], $this->dns)) {
+                    $data[$cn] = $member;
+                    $givenName = $sn = $cn = _("Unknown");
+                    //if(isset($member['sn'][0])) $sn = $member['sn'][0];
+                    if(isset($member['cn'][0])) $cn = $member['cn'][0];
+                    //if(isset($member['givenName'][0])) $givenName = $member['givenName'][0];
                     $image = image('images/false.png');
-                    if(isset($values['sn'])){
+                    if(isset($member['sn'])){
                         switch ($theme) {
                             case 'classic':
                                 $image = image("plugins/users/images/select_user.png");
@@ -376,7 +404,7 @@
                                 $image = image("<i class='material-icons'>person</i>");
                                 break;
                         }
-                    }elseif(isset($values['gidNumber'])){
+                    }elseif(isset($member['gidNumber'])){
                         switch ($theme) {
                             case 'classic':
                                 $image = image("plugins/groups/images/select_group.png");
@@ -387,7 +415,7 @@
                                 break;
                         }
                     }
-                    $lData[$member] = array('data' => array($image,$cn,$data[$member]['uid'][0] ?? ""));
+                    $lData[$cn] = array('data' => array($image,$cn/*,$sn,$givenName,*/,$data[$cn]['uid'][0] ?? ""));
                 }
             }
             $this->commonList->setListData($data,$lData);
@@ -395,13 +423,16 @@
             $smarty->assign("commonList", $this->commonList->render());
 
             $data = $lData = array();
-            foreach($this->members_used_by_some as $member => $values){
-                if (!in_array($values['dn'], $this->dns) && $member !== 'count') {
-                    $data[$member] = $values;
-                    $sn = _("Unknown");
-                    if(isset($values['cn']) && isset($values['cn'][0])) $cn = $values['cn'][0];
+
+            foreach($this->members_used_by_some as $cn => $member){
+                if (!in_array($member['dn'], $this->dns)) {
+                    $data[$cn] = $member;
+                    $givenName = $sn = $cn = _("Unknown");
+                    //if(isset($member['sn']) && isset($member['sn'][0])) $sn = $member['sn'][0];
+                    if(isset($member['cn']) && isset($member['cn'][0])) $cn = $member['cn'][0];
+                    //if(isset($member['givenName'][0]) && isset($member['givenName'][0])) $givenName = $member['givenName'][0];
                     $image = image('images/false.png');
-                    if(isset($values['sn'])){
+                    if(isset($member['sn'])){
                         switch ($theme) {
                             case 'classic':
                                 $image = image("plugins/users/images/select_user.png");
@@ -412,7 +443,7 @@
                                 break;
                         }
                         
-                    }elseif(isset($values['gidNumber'])){
+                    }elseif(isset($member['gidNumber'])){
                         switch ($theme) {
                             case 'classic':
                                 $image = image("plugins/groups/images/select_group.png");
@@ -423,7 +454,7 @@
                                 break;
                         }
                     }
-                    $lData[$member] = array('data' => array($image,$cn,$data[$member]['uid'][0] ?? ""));
+                    $lData[$cn] = array('data' => array($image,$cn/*,$sn, $givenName*/, $data[$cn]['uid'][0] ?? ""));
                 }
             }
             $this->partialList->setListData($data,$lData);
@@ -499,6 +530,7 @@
         return($smarty->fetch (get_template_path('generic.tpl', TRUE)));
     }
 
+
     function isRestrictedByDynGroup()
     {
         $bool = FALSE;
@@ -509,12 +541,12 @@
         return($bool);
     }
 
-    function addMember($dn)
+    function addUser($dn)
     {
         /* In mutliple edit we have to handle two arrays.
          *  members               : Containing users used in all groups
          *  members_used_by_some  : Those which are not used in all groups
-         * So we have to remove the given $dn from the ..used_by_some array first.
+         * So we have to remove the given $uid from the ..used_by_some array first.
          */
         if($this->multiple_support_active){
             if(isset($this->members_used_by_some[$dn])){
@@ -528,14 +560,14 @@
         $ldap->cat($dn,array("dn","cn","uid","sn","givenName","gidNumber"));
         if($ldap->count() == 0 ){
             msg_dialog::display(_("Error"), 
-                sprintf(_("Adding DN '%s' to group '%s' failed: cannot find user object!"), 
-                    $dn,$this->cn), 
+                sprintf(_("Adding UID '%s' to group '%s' failed: cannot find user object!"), 
+                    $uid,$this->cn), 
                 ERROR_DIALOG);
             return;
         }elseif($ldap->count() >= 2){
             msg_dialog::display(_("Error"), 
-                sprintf(_("Add DN '%s' to group '%s' failed: DN is used more than once!"),
-                    $dn,$this->cn), 
+                sprintf(_("Add UID '%s' to group '%s' failed: UID is used more than once!"),
+                    $uid,$this->cn), 
                 ERROR_DIALOG);
             return;
         }else{
@@ -546,7 +578,7 @@
     }
 
 
-    function removeMember($id)
+    function removeUser($id)
     {
         if(isset($this->members[$id])){
             unset($this->members[$id]);
@@ -555,7 +587,7 @@
         /* We have two array contianing group members in multiple edit.
          *  this->members             : Groups used by all currently edited groups 
          *  this->members_used_by_some: Used by some 
-         * So we have to remove the specified member from both arrays.
+         * So we have to remove the specified uid from both arrays.
          */
         if($this->multiple_support_active){
             if(isset($this->members_used_by_some[$id])){
@@ -565,34 +597,69 @@
     }
 
     /* Reload data */
-    function reload(array $attrs)
+    function reload($silent = FALSE)
     {
-        if (isset($attrs['member'][0])){
-            $tmp= array();
-            $arr= array();
-            foreach ($attrs['member'] as $member => $dn) {
-                if ($member !== 'count') {
-                    $tmp[$member]= $dn;
-                }
+        /* Prepare ldap link */
+        $ldap= $this->config->get_ldap_link();
+        $ldap->cd($this->config->current['BASE']);
+
+
+        /* Resolve still unresolved members to fill the list with sn/giveName attributes 
+           (Store gathered sn/givenName informations in $this->allusers too, 
+           to be prepared when adding/deleting users)
+         */    
+        $filter = "";
+
+    
+
+        // Merge in partial uids in multiple edit
+        $allMember = array_keys($this->members);
+        if($this->multiple_support_active) {
+            $allMember = array_merge($allMember,  array_keys($this->members_used_by_some));
+        }
+        $allMember = array_values($allMember);
+
+        // To resolve the usernames out of the 'uid' we've to perform ldap queries. 
+        // To keep the amount of queries as short as possible, we combine the query 
+        //  for 'sn','givenName','..' for serveral users in one single query:
+        //      (|(uid=hans)(uid=peter)(uid=hubert)(..))
+        // 
+        // Unfortunately there is a filter length limit which causes the query to be invalid,
+        //  we've to split these huge query again into shorter query strings. 
+        // 
+        // maxPerRound specifies the amount of queries we can combine into a 
+        //  single query.
+        $maxPerRound = $this->config->get_cfg_value("core","ldapFilterNestingLimit");
+        if( $maxPerRound == "" ) {
+            $maxPerRound = count($allUids);
+        }
+
+        for ( $added = 0; $added < count($allMember); $added += $maxPerRound ) {
+
+            // First build the query....
+            $start = $added;
+            $end = $added + $maxPerRound;
+            $filter = "";
+            for ( $done = $start; $done < $end; $done++ ) {
+                if(!isset($allMember[$done])) break;
+                $value = $allMember[$done];
+                $filter .= "(cn=".normalizeLdap($value).")";
             }
-            $ldap= $this->config->get_ldap_link();
+
+            // Retrieve the data to LDAP
             $ldap->cd($this->config->current['BASE']);
-            foreach ($tmp as $member => $dn) {
-                $ldap->cat($dn,array("dn","cn","uid","sn","givenName","gidNumber"));
-                while ($attr = $ldap->fetch()) {
-                    $arr[$attr['cn'][0]]= $attr;
-                }
+            $ldap->search("(|".$filter."))",array("dn","cn","uid","sn","givenName","gidNumber"));
+            while( $attrs = $ldap->fetch() ) {
+                $this->members[$attrs['cn'][0]] = $attrs;
             }
-            ksort ($arr);
         }
 
-        /* check if all members are resolved */
-        foreach ($arr as $value){
-            if(!isset($arr[$value])){
-                $arr[$value] = "";
+        /* check if all uids are resolved */
+        foreach ($this->members as $value){
+            if(!isset($this->members[$value])){
+                $this->members[$value] = "";
             }
         }
-        return $arr;
     }
 
 
@@ -607,6 +674,7 @@
         return($ret);
     }
 
+
     function remove_from_parent()
     {
         plugin::remove_from_parent();
@@ -722,12 +790,13 @@
     /* Save to LDAP */
     function save()
     {
+
         /* ID handling */
         if ($this->force_gid == 0){
             if ($this->saved_gidNumber != ""){
                 $this->gidNumber= $this->saved_gidNumber;
             } else {
-                /* Calculate new, lock gids */
+                /* Calculate new, lock uids */
                 $wait= 10;
                 while (get_lock("gidnumber") != ""){
                     sleep (1);
@@ -809,6 +878,12 @@
             $this->attrs['objectClass'][]= "nagiosContactGroup";
         }
 
+        /* Take members array */
+        
+        /*if (!$this->isRestrictedByDynGroup() && count ($this->memberUid)){
+            $this->attrs['member']= array_values(array_unique($this->member));
+        }*/
+
         /* New accounts need proper 'dn', propagate it to remaining objects */
         if ($this->dn == 'new'){
             $this->dn= 'cn='.$this->cn.','.get_groups_ou().$this->base;
@@ -839,6 +914,7 @@
                 $this->attrs['sambaGroupType']= array();
                 $this->attrs['sambaSID']= array();
             }
+
             $mode= "modify";
         } else {
             $mode= "add";
@@ -944,6 +1020,7 @@
                     $message[]= msgPool::duplicated(_("Name"));
                 }
             }
+
         }else{
 
             /* Check for used 'cn' */
@@ -979,7 +1056,8 @@
             }
         }
 
-        /* Check if we are allowed to create or move this object */
+        /* Check if we are allowed to create or move this object 
+         */
         if(!$this->orig_dn == "new" || 
                 $this->orig_base != $this->base || 
                 $this->cn != $this->orig_cn){
@@ -990,6 +1068,7 @@
                 $message[] = msgPool::permMove();
             }
         }
+
         return ($message);
     }
 
@@ -1057,6 +1136,7 @@
                             "group"         => "plugin",
                             "mandatory"     => FALSE)),
 
+
             "plProvidedAcls"    => array(
                     "cn"                => _("Name"),
                     "description"       => _("Description"),
@@ -1132,6 +1212,7 @@
         }
     }
 
+
     function get_multi_edit_values()
     {
         $ret = plugin::get_multi_edit_values();
@@ -1154,39 +1235,46 @@
     }
 
 
-    /* Initialize plugin with given atribute arrays */
+    /* Initialize plugin with given atribute arrays
+     */
     function init_multiple_support($attrs,$all)
     {
-        $ldap = $this->config->get_ldap_link();
-        $ldap->cd($this->config->current['BASE']);
-
         plugin::init_multiple_support($attrs,$all);
         $this->trustModeDialog->init_multiple_support($attrs,$all);
 
+        // sort out members_used_by_some in $diff array
+        $diff= array_diff($all['member'],$attrs['member'] ?? [""]);
+
         $this->dns = $all['dn'];
-        $diff = array();
         $this->members = array();
         $this->members_used_by_some = array();
 
-        // get all members who are in all groups for multiple edit
+        // fetch Members in all Groups to $members for multiple edit
+        $ldap = $this->config->get_ldap_link();
+        $ldap->cd($this->config->current['BASE']);
         if (isset($attrs['member'])){
-            $this->members = $this->reload($attrs);
+            foreach ($attrs['member'] as $member => $dn) {
+                $ldap->cat($dn,array("dn","cn","uid","sn","givenName","gidNumber"));
+                while ($attr = $ldap->fetch()) {
+                    $this->members[$attr['cn'][0]]= $attr;
+                }
+            }
             ksort($this->members);
         }
 
-        // sort out all members that are not in all groups
-        foreach ($all['member'] as $member => $value) {
-            if (!in_array($value, $attrs['member'])) {
-                $diff['member'][] = $value;
+        // fetch all Member in $diff to $members_used_by_some for multiple edit
+        if (isset($diff)){
+            foreach ($diff as $member => $dn) {
+                $ldap->cat($dn,array("dn","cn","uid","sn","givenName","gidNumber"));
+                while ($allAttr = $ldap->fetch()) {
+                    $this->members_used_by_some[$allAttr['cn'][0]]= $allAttr;
+                }
             }
-        }
-
-        // get all members who are not in all groups for multiple edit
-        if (isset($diff['member'])){
-            $this->members_used_by_some = $this->reload($diff);
             ksort($this->members_used_by_some);
         }
 
+        $this->reload(TRUE);
+
         // We've two lists in mutliple support  
         //  - one which represents those users which are part of ALL groups.
         //  - ond one which represents those users which are only part of SOME groups.
@@ -1302,6 +1390,7 @@
 
         /* Update groupMembership, add forced groups */
         foreach($attrs['member'] as $member){
+
             $users[] = $member;
         }
         
@@ -1324,9 +1413,11 @@
                 break; 
             } 
             $gidNumber++; 
-        }
+        } 
+
         return $sid; 
     } 
+
 }
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>
--- a/plugins/admin/groups/userSelect/class_userSelect.inc
+++ b/plugins/admin/groups/userSelect/class_userSelect.inc
@@ -23,6 +23,7 @@
 #[\AllowDynamicProperties]
 class userSelect extends management
 {
+    
     public $plHeadline = "User selection";
     protected $skipFooter = TRUE;
     protected $skipHeader = TRUE;
@@ -31,19 +32,24 @@
     {
         $this->config = $config;
         $this->ui = $ui;
-        $this->storagePoints = array(get_ou("core", "userRDN"),get_ou("core", "groupRDN"));
 
+        $this->storagePoints = array(get_ou("core", "userRDN"),get_ou("core", "groupRDN"));
+        # $this->storagePoints = array( get_ou("core", "groupRDN"));
         // Build filter
         if (session::global_is_set(get_class($this)."_filter")){
             $filter= session::global_get(get_class($this)."_filter");
-            $filter->setConstraint(['dn' => $dns]);
+            $filter->customConstraints['dn'] = $dns;
         } else {
             $filter = new filter(get_template_path("user-filter.xml", true, dirname(__FILE__)));
             $filter->setObjectStorage($this->storagePoints);
-            $filter->setConstraint(['dn' => $dns]);
+            $filter->addConstraint(['dn' => $dns]);
         }
+        
+
         $this->setFilter($filter);
 
+        
+
         // Build headpage
         $headpage = new listing(get_template_path("user-list.xml", true, dirname(__FILE__)));
         $headpage->setFilter($filter);