From a4122ffc1b3a18849f9de619b20bfc78c28e36ed Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 14 Aug 2023 07:46:42 +0200
Subject: [PATCH] Revert "Extends Functionality to add groups in groups"

This reverts a variant of commit 4fa70a94f2ce51d908409d30776ecd2883261272.

Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
---
 plugins/admin/groups/class_group.inc | 297 ++++++++++++---------------
 1 file changed, 134 insertions(+), 163 deletions(-)

--- a/plugins/admin/groups/class_group.inc
+++ b/plugins/admin/groups/class_group.inc
@@ -3,7 +3,7 @@
  * This code is part of GOsa (http://www.gosa-project.org)
  * Copyright (C) 2003-2008 GONICUS GmbH
  *
- * ID: $$Id: class_group.inc 20952 2011-07-27 06:38:29Z hickert $$
+ * ID: $$Id$$
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,9 @@
 {
     /* Group attributes */
     var $cn= "";
+    var $description= "";
     var $gidNumber= "";
+    var $memberUid= array();
     var $memberUid_used_by_some= array();
 
     /* Helpers */
@@ -40,6 +42,8 @@
     var $ridBase= 0;
     var $members= array();
     var $users= array();
+    var $member= array();
+    var $allusers= array();
     var $saved_gidNumber= "";
     var $oldgroupType= "";
     var $orig_dn= "";
@@ -52,12 +56,13 @@
     var $dialog;
     var $rfc2307bis= FALSE;
     var $OnlyShowFirstEntries =200;
+    var $dnMapping= array();
     var $view_logged = FALSE;
     var $allowGroupsWithSameNameInOtherSubtrees = true;
     var $baseSelector;
 
     /* attribute list for save action */
-    var $attributes= array("cn", "description", "gidNumber","sambaGroupType","sambaSID","member");
+    var $attributes= array("cn", "description", "gidNumber", "memberUid", "sambaGroupType","sambaSID");
     var $objectclasses= array("top");
 
     var $CopyPasteVars  = array("force_gid","fon_group","smbgroup","groupType","sambaSID","sambaDomainName","SID","nagios_group","sambaGroupType");
@@ -90,25 +95,15 @@
         $this->orig_cn= $this->cn;
 
         /* Get member list */
-        if (isset($this->attrs['member'][0])){
+        if (isset($this->attrs['memberUid'][0])){
             $tmp= array();
-            for ($i= 0; $i<$this->attrs['member']['count']; $i++){
-                $tmp[]= $this->attrs['member'][$i];
+            for ($i= 0; $i<$this->attrs['memberUid']['count']; $i++){
+                $tmp[$this->attrs['memberUid'][$i]]= $this->attrs['memberUid'][$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);
+            $this->memberUid= $tmp;
+            ksort ($this->memberUid);
         }
 
-        /* Get group list */
-
-
         /* Save gidNumber for later use */
         if (isset($this->attrs['gidNumber'])){
             $this->saved_gidNumber= $this->attrs['gidNumber'][0];
@@ -213,8 +208,8 @@
         $this->memberList->setEditable(false);
         $this->memberList->setWidth("100%");
         $this->memberList->setHeight("300px");
-        $this->memberList->setHeader(array('~',_("Common Name"),_("UID")));
-        $this->memberList->setColspecs(array('20px','*','*','20px'));
+        $this->memberList->setHeader(array('~',_("Surname"),_("Given name"),_("UID")));
+        $this->memberList->setColspecs(array('20px','*','*','*','20px'));
         $this->memberList->setDefaultSortColumn(1);
 
         $this->reload(TRUE);
@@ -253,17 +248,12 @@
 
             // Check if list is available, depends on multi- or sinlge- group editing. 
             if($this->$list){
-                // ensure we can delete group members if we have
-                // write permission to the memberUid attribute
-                $mu_acl = $this->getacl("member");
-                if (preg_match("/w/",$mu_acl) && !preg_match("/d/",$mu_acl)) {
-                    $this->$list->setAcl($mu_acl.'d');
-                }
                 $this->$list->save_object();
                 $action = $this->$list->getAction();
-                if($action['action'] == 'delete' && preg_match("/w/",$this->getacl("member"))){
+                if($action['action'] == 'delete' && preg_match("/w/",$this->getacl("memberUid"))){
                     foreach ($action['targets'] as $id){
                         $value = $this->$list->getKey($id);
+                        unset ($this->members["$value"]);
                         $this->removeUser($value);
                     }
                     $this->reload();
@@ -272,7 +262,7 @@
         }
 
         /* Add objects? */
-        if (isset($_POST["edit_membership"]) && preg_match("/w/",$this->getacl("member"))){
+        if (isset($_POST["edit_membership"]) && preg_match("/w/",$this->getacl("memberUid"))){
             $this->userSelect= new userSelect($this->config, get_userinfo());
         }
 
@@ -289,8 +279,9 @@
                 $headpage = $this->userSelect->getHeadpage();
                 foreach($users['targets'] as $dn){
                     $attrs = $headpage->getEntry($dn);
-                    $this->addUser($attrs['dn']);                        
-
+                    $value = $attrs['uid'][0];
+                    $this->addUser($value);
+                    $this->members["$value"]= $this->allusers[$value];
                     $this->reload();
                 }
             }
@@ -307,6 +298,9 @@
             return($trustModeDialog);
         }
         $smarty->assign("trustModeDialog" , $trustModeDialog);
+
+
+
         $smarty->assign("nagios", $this->config->pluginEnabled("nagiosAccount") && class_available("nagiosAccount"));
         $smarty->assign("pickupGroup", $this->config->pluginEnabled("phoneAccount") && class_available("phoneAccount"));
 
@@ -340,39 +334,25 @@
 
         /* Members and users */
         if(!$this->multiple_support_active){
-            $this->memberList->setAcl($this->getacl("member"));
+            $this->memberList->setAcl($this->getacl("memberUid"));
             $data = $lData = array();
             foreach($this->members as $uid => $member){
-                if ($uid !== $this->cn) {                
-                    $data[$uid] = $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($member['sn'])){
-                        switch ($theme) {
-                            case 'classic':
-                                $image = image("plugins/users/images/select_user.png");
-                                break;
-                            
-                            default:
-                                $image = image("<i class='material-icons'>person</i>");
-                                break;
-                        }
-                    }elseif(isset($member['gidNumber'])){
-                        switch ($variable) {
-                            case 'classic':
-                                $image = image("plugins/groups/images/select_group.png");
-                                break;
-                            
-                            default:
-                                $image = image("<i class='material-icons'>groups</i>");
-                                break;
-                        }
+                $data[$uid] = $member;
+                $givenName = $sn = _("Unknown");
+                if(isset($member['sn']) && isset($member['sn'][0])) $sn = $member['sn'][0];
+                if(isset($member['givenName']) && isset($member['givenName'][0])) $givenName = $member['givenName'][0];
+                $image = image('images/false.png');
+                if(isset($member['sn'])){
+                    switch ($theme) {
+                        case 'classic':
+                            $image = image("plugins/users/images/select_user.png");
+                            break;
+                        default:
+                            $image = image("<i class='material-icons'>person</i>");
+                            break;
                     }
-                    $lData[$uid] = array('data' => array($image,$cn/*,$sn,$givenName*/, $data[$uid]['uid'][0] ?? ""));
                 }
+                $lData[$uid] = array('data' => array($image,$sn, $givenName, $uid));
             }
             $this->memberList->setListData($data,$lData);
             $bool = $this->isRestrictedByDynGroup();
@@ -381,40 +361,28 @@
             $smarty->assign("memberList", $this->memberList->render());
         }else{
 
-            $this->commonList->setAcl($this->getacl("member"));
-            $this->partialList->setAcl($this->getacl("member"));
+            $this->commonList->setAcl($this->getacl("memberUid"));
+            $this->partialList->setAcl($this->getacl("memberUid"));
 
             $data = $lData = array();
             foreach($this->members as $uid => $member){
                 $member = $this->members[$member];
                 $data[$uid] = $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];
+                $givenName = $sn = _("Unknown");
+                if(isset($member['sn'][0])) $sn = $member['sn'][0];
+                if(isset($member['givenName'][0])) $givenName = $member['givenName'][0];
                 $image = image('images/false.png');
                 if(isset($member['sn'])){
                     switch ($theme) {
                         case 'classic':
                             $image = image("plugins/users/images/select_user.png");
                             break;
-                        
                         default:
                             $image = image("<i class='material-icons'>person</i>");
                             break;
                     }
-                }elseif(isset($member['gidNumber'])){
-                    switch ($theme) {
-                        case 'classic':
-                            $image = image("plugins/groups/images/select_group.png");
-                            break;
-                        
-                        default:
-                            $image = image("<i class='material-icons'>groups</i>");
-                            break;
-                    }
                 }
-                $lData[$uid] = array('data' => array($image,$cn/*,$sn,$givenName,*/,$uid));
+                $lData[$uid] = array('data' => array($image,$sn ,$givenName, $uid));
             }
             $this->commonList->setListData($data,$lData);
             $this->commonList->update();
@@ -422,37 +390,24 @@
 
             $data = $lData = array();
 
-            foreach($this->members_used_by_some as $uid => $member){
-                $member = (isset($this->members[$member])) ?? NULL;
+            foreach($this->memberUid_used_by_some as $uid => $member){
+                $member = (isset($this->members[$member])) ? $this->members[$member] : NULL;
                 $data[$uid] = $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];
+                $givenName = $sn = _("Unknown");
+                if(isset($member['sn']) && isset($member['sn'][0])) $sn = $member['sn'][0];
+                if(isset($member['givenName'][0]) && isset($member['givenName'][0])) $givenName = $member['givenName'][0];
                 $image = image('images/false.png');
                 if(isset($member['sn'])){
                     switch ($theme) {
                         case 'classic':
                             $image = image("plugins/users/images/select_user.png");
                             break;
-                        
                         default:
                             $image = image("<i class='material-icons'>person</i>");
                             break;
                     }
-                    
-                }elseif(isset($member['gidNumber'])){
-                    switch ($theme) {
-                        case 'classic':
-                            $image = image("plugins/groups/images/select_group.png");
-                            break;
-                        
-                        default:
-                            $image = image("<i class='material-icons'>groups</i>");
-                            break;
-                    }
                 }
-                $lData[$uid] = array('data' => array($image,$cn/*,$sn, $givenName*/, $uid));
+                $lData[$uid] = array('data' => array($image,$sn, $givenName, $uid));
             }
             $this->partialList->setListData($data,$lData);
             $this->partialList->update();
@@ -521,7 +476,7 @@
         $bool = $this->isRestrictedByDynGroup();
         $smarty->assign("restrictedByDynGroup", $bool);
         if($bool){
-            $smarty->assign("memberUidACL", preg_replace("/[^r]/","",$this->getacl('member')));
+            $smarty->assign("memberUidACL", preg_replace("/[^r]/","",$this->getacl('memberUid')));
              
         }
         return($smarty->fetch (get_template_path('generic.tpl', TRUE)));
@@ -532,13 +487,13 @@
     {
         $bool = FALSE;
         if(isset($this->parent->by_object['DynamicLdapGroup'])){
-            $bool = $this->parent->by_object['DynamicLdapGroup']->isAttributeDynamic('member') ||
+            $bool = $this->parent->by_object['DynamicLdapGroup']->isAttributeDynamic('memberUid') ||
                 $this->parent->by_object['DynamicLdapGroup']->isAttributeDynamic('member');
         }
         return($bool);
     }
 
-    function addUser($dn)
+    function addUser($uid)
     {
         /* In mutliple edit we have to handle two arrays.
          *  memberUid               : Containing users used in all groups
@@ -546,41 +501,48 @@
          * So we have to remove the given $uid from the ..used_by_some array first.
          */
         if($this->multiple_support_active){
-            if(isset($this->memberUid_used_by_some[$dn])){
-                unset($this->memberUid_used_by_some[$dn]);
+            if(isset($this->memberUid_used_by_some[$uid])){
+                unset($this->memberUid_used_by_some[$uid]);
             }
         }  
 
         /* Ensure that the requested object is known to the group class 
          */
-        $ldap = $this->config->get_ldap_link();
-        $ldap->cd($this->config->current['BASE']);
-        $ldap->cat($dn,array("dn","cn","uid","sn","givenName","gidNumber"));
-        if($ldap->count() == 0 ){
-            msg_dialog::display(_("Error"), 
-                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 UID '%s' to group '%s' failed: UID is used more than once!"),
-                    $uid,$this->cn), 
-                ERROR_DIALOG);
-            return;
-        }else{
-            while($attrs = $ldap->fetch()){
-                $this->members[$attrs['cn'][0]] = $attrs;
+        if(!isset($this->dnMapping[$uid])){
+            $ldap = $this->config->get_ldap_link();
+            $ldap->cd($this->config->current['BASE']);
+            $ldap->search("(&(objectClass=gosaAccount)(uid=".$uid."))",array("dn", "uid","sn","givenName"));
+            if($ldap->count() == 0 ){
+                msg_dialog::display(_("Error"), 
+                        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 UID '%s' to group '%s' failed: UID is used more than once!"),
+                            $uid,$this->cn), 
+                        ERROR_DIALOG);
+                return;
+            }else{
+                while($attrs = $ldap->fetch()){
+                    $this->dnMapping[$attrs['uid'][0]] = $attrs['dn'];
+                    $this->members[$attrs['uid'][0]] = $attrs;
+                    $this->allusers[$attrs['uid'][0]]= $attrs;
+                }
             }
         }
         
+        $this->memberUid[$uid]= $uid;
+        $this->reload();
     }
 
 
-    function removeUser($id)
+    function removeUser($uid)
     {
-        if(isset($this->members[$id])){
-            unset($this->members[$id]);
+        $temp= array();
+        if(isset($this->memberUid[$uid])){
+            unset($this->memberUid[$uid]);
         }
 
         /* We have two array contianing group members in multiple edit.
@@ -589,8 +551,8 @@
          * So we have to remove the specified uid from both arrays.
          */
         if($this->multiple_support_active){
-            if(isset($this->memberUid_used_by_some[$id])){
-                unset($this->memberUid_used_by_some[$id]);
+            if(isset($this->memberUid_used_by_some[$uid])){
+                unset($this->memberUid_used_by_some[$uid]);
             }
         }
     }
@@ -612,10 +574,15 @@
     
 
         // Merge in partial uids in multiple edit
-        $allUids = array_keys($this->members);
+        $allUids = array_keys($this->memberUid);
         if($this->multiple_support_active) {
             $allUids = array_merge($allUids,  array_keys($this->memberUid_used_by_some));
         }
+
+        // Do not request data for users we've already fetched before.
+        foreach($allUids as $key => $uid){
+            if(isset($this->dnMapping[$uid])) unset($allUids[$key]);
+        }
         $allUids = array_values($allUids);
 
         // To resolve the usernames out of the 'uid' we've to perform ldap queries. 
@@ -642,19 +609,21 @@
             for ( $done = $start; $done < $end; $done++ ) {
                 if(!isset($allUids[$done])) break;
                 $value = $allUids[$done];
-                $filter .= "(cn=".normalizeLdap($value).")";
+                $filter .= "(uid=".normalizeLdap($value).")";
             }
 
             // Retrieve the data to LDAP
             $ldap->cd($this->config->current['BASE']);
-            $ldap->search("(|".$filter."))",array("dn","cn","uid","sn","givenName","gidNumber"));
+            $ldap->search("(&(objectClass=gosaAccount)(|".$filter."))",array("dn", "uid","sn","givenName"));
             while( $attrs = $ldap->fetch() ) {
-                $this->members[$attrs['cn'][0]] = $attrs;
+                $this->dnMapping[$attrs['uid'][0]] = $attrs['dn'];
+                $this->members[$attrs['uid'][0]] = $attrs;
+                $this->allusers[$attrs['uid'][0]]= $attrs;
             }
         }
 
         /* check if all uids are resolved */
-        foreach ($this->members as $value){
+        foreach ($this->memberUid as $value){
             if(!isset($this->members[$value])){
                 $this->members[$value] = "";
             }
@@ -879,9 +848,9 @@
 
         /* Take members array */
         
-        /*if (!$this->isRestrictedByDynGroup() && count ($this->memberUid)){
-            $this->attrs['member']= array_values(array_unique($this->member));
-        }*/
+        if (!$this->isRestrictedByDynGroup() && count ($this->memberUid)){
+            $this->attrs['memberUid']= array_values(array_unique($this->memberUid));
+        }
 
         /* New accounts need proper 'dn', propagate it to remaining objects */
         if ($this->dn == 'new'){
@@ -890,16 +859,15 @@
 
         /* Add member dn's for RFC2307bis Support */
         if ($this->rfc2307bis){
-            $temp = array();
-            if (count($this->members)){
-                foreach($this->members as $member) {
-                    if ($member['dn'] !== $this->dn) {
-                        $temp[] = $member['dn'];
-                    }   
-                }
-                $this->attrs['member']= $temp;
-            }else {
-                $this->attrs['member']= $this->dn;
+            $this->attrs['member'] = array();
+            if (count($this->memberUid)){
+                foreach($this->attrs['memberUid'] as $uid) {
+                    if(isset($this->dnMapping[$uid])){
+                        $this->attrs['member'][]= $this->dnMapping[$uid];
+                    }
+                }
+            } else {
+                $this->attrs['member'][]= $this->dn;
             }
         }
 
@@ -908,8 +876,8 @@
         $ldap->cat ($this->dn, array('dn'));
         if ($ldap->fetch()){
             /* Modify needs array() to remove values :-( */
-            if (!count ($this->members)){
-                $this->attrs['member']= $this->dn;;
+            if (!count ($this->memberUid)){
+                $this->attrs['memberUid']= array();
             }
             if (!$this->smbgroup){
                 $this->attrs['sambaGroupType']= array();
@@ -927,7 +895,11 @@
          */
         if($this->gidNumber != ""){
             $ldap->cd($this->config->current['BASE']);
-            $ldap->search("(&(!(cn=".$this->orig_cn."))(objectClass=posixGroup)(gidNumber=".$this->gidNumber."))",array("cn"));
+            $chk_attr = "orig_cn";
+            if ($this->cn != $this->orig_cn) {
+                $chk_attr = "cn";
+            }
+            $ldap->search("(&(!(cn=".$this->$chk_attr."))(objectClass=posixGroup)(gidNumber=".$this->gidNumber."))",array("cn"));
             if($ldap->count()){
                 $cns = "";
                 while($attrs = $ldap->fetch()){
@@ -1151,8 +1123,7 @@
                     "fonGroup"          => _("Phone pickup group"),
                     "nagiosGroup"       => _("Nagios group"),
 
-                    "memberUid"         => _("Group member"),
-                    "member"            => _("Group member"))
+                    "memberUid"         => _("Group member"))
                 ));
     }
 
@@ -1226,7 +1197,7 @@
             }
         }
 
-        $ret['member'] = $this->members;
+        $ret['memberUid'] = $this->memberUid;
         $ret['memberUid_used_by_some'] = $this->memberUid_used_by_some;
         return($ret);
     }
@@ -1244,19 +1215,19 @@
         plugin::init_multiple_support($attrs,$all);
         $this->trustModeDialog->init_multiple_support($attrs,$all);
 
-        $this->members = array();
-        $this->members_used_by_some = array();
-        if (isset($attrs['member'])){
-            for ($i= 0; $i<$attrs['member']['count']; $i++){
-                $this->members[$attrs['member'][$i]]= $attrs['member'][$i];
-            }
-            ksort($this->members);
+        $this->memberUid = array();
+        $this->memberUid_used_by_some = array();
+        if (isset($attrs['memberUid'])){
+            for ($i= 0; $i<$attrs['memberUid']['count']; $i++){
+                $this->memberUid[$attrs['memberUid'][$i]]= $attrs['memberUid'][$i];
+            }
+            ksort($this->memberUid);
         }
 
-        if (isset($all['member'])){
-            for ($i= 0; $i<$all['member']['count']; $i++){
-                if(!in_array_strict($all['member'][$i],$this->members)){
-                    $this->memberUid_used_by_some[$all['member'][$i]]= $all['member'][$i];
+        if (isset($all['memberUid'])){
+            for ($i= 0; $i<$all['memberUid']['count']; $i++){
+                if(!in_array_strict($all['memberUid'][$i],$this->memberUid)){
+                    $this->memberUid_used_by_some[$all['memberUid'][$i]]= $all['memberUid'][$i];
                 }
             }
             ksort($this->memberUid_used_by_some);
@@ -1341,10 +1312,10 @@
             $this->sambaSID = $this->getSambaSID(); 
         } 
 
-        $this->members = array();
-        if(isset($source['member'])){
-            for($i = 0 ; $i < $source['member']['count']; $i ++){
-                $this->members[] = $source['member'][$i];
+        $this->memberUid = array();
+        if(isset($source['memberUid'])){
+            for($i = 0 ; $i < $source['memberUid']['count']; $i ++){
+                $this->memberUid[] = $source['memberUid'][$i];
             }
         }
     }
@@ -1372,18 +1343,18 @@
 
         /* Update groupMembership, keep optinal group */
         foreach($attrs['memberUid_used_by_some'] as $uid){
-            if(in_array_strict($uid,$this->members)){
+            if(in_array_strict($uid,$this->memberUid)){
                 $users[$uid] = $uid;
             }
         }
 
         /* Update groupMembership, add forced groups */
-        foreach($attrs['member'] as $uid){
+        foreach($attrs['memberUid'] as $uid){
             $users[$uid] = $uid;
         }
         plugin::set_multi_edit_values($attrs);
         $this->trustModeDialog->set_multi_edit_values($attrs);
-        $this->members = $users;
+        $this->memberUid = $users;
     }