X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_userinfo.inc;h=992f3da004b79c77a9db20bd85d77452b4b13287;hb=ec7198b4b87d963ce804f052eafc90e69858f93f;hp=e5ba9c7365cda1dbabc40bcd1f7557984260f1ea;hpb=6381009eee8c0717c482d8f30edfff6bf3acd774;p=gosa.git

diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index e5ba9c736..992f3da00 100644
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -37,6 +37,8 @@ class userinfo
   var $groups= array();
   var $result_cache =array();
   var $ignoreACl = FALSE;
+  var $ACLperPath = array();
+  var $ACLperPath_usesFilter = array();
 
   /* get acl's an put them into the userinfo object
      attr subtreeACL (userdn:components, userdn:component1#sub1#sub2,component2,...) */
@@ -78,7 +80,7 @@ class userinfo
   public function reset_acl_cache()
   {
     /* Initialize ACL_CACHE */
-    session::set('ACL_CACHE',array());
+    session::global_set('ACL_CACHE',array());
   }
 
   function loadACL()
@@ -156,8 +158,9 @@ class userinfo
 
           /* Inspect members... */
           foreach ($type['members'] as $grp => $grpdsc){
+
             /* Some group inside the members that is relevant for us? */
-            if (in_array_ics(preg_replace('/^G:/', '', $grp), $this->groups)){
+            if (in_array_ics(@LDAP::convert(preg_replace('/^G:/', '', $grp)), $this->groups)){
               $interresting= TRUE;
             }
 
@@ -175,42 +178,67 @@ class userinfo
           $this->ACL[$dn][$idx]= $type;
         }
       }
-
     }
-  }
-
 
-  function get_category_permissions($dn, $category, $any_acl = FALSE)
-  {
-    /* If we are forced to skip ACLs checks for the current user 
-        then return all permissions.
-     */
-    if($this->ignore_acl_for_current_user()){
-      return("rwcdm");
-    }
+    /* Create an array which represenet all relevant permissions settings 
+        per dn.
 
-    $ACL_CACHE = &session::get("ACL_CACHE");
-    $id = $dn."+".$category."+".$any_acl;
-    if(isset($ACL_CACHE['CATEGORY_ACL'][$id])){
-      return($ACL_CACHE['CATEGORY_ACL'][$id]);
-    }
+      The array will look like this:
+      
+      .     ['ou=base']        ['ou=base']          = array(ACLs);
+      .     
+      .     ['ou=dep1,ou=base']['ou=dep1,ou=base']  = array(ACLs);
+      .                        ['ou=base']          = array(ACLs);
 
 
-    /* Get list of objectClasses and get the permissions for it */
-    $acl= "";
-    if (isset($this->ocMapping[$category])){
-      foreach($this->ocMapping[$category] as $oc){
-        $acl.= $this->get_permissions($dn, $category."/".$oc);
-        if($any_acl && !empty($acl)){
-          break;
+      For object located in 'ou=dep1,ou=base' we have to both ACLs,
+       for objects in 'ou=base' we only have to apply on ACL.
+     */
+    $without_self_acl = $all_acl = array();
+    foreach($this->ACL as $dn => $acl){
+      $sdn =$dn;
+      $first= TRUE; // Run at least once 
+      while(strpos($dn,",") !== FALSE || $first){
+        $first = FALSE;
+        if(isset($this->ACL[$dn])){
+          $all_acl[$sdn][$dn] = $this->ACL[$dn];
+          $without_self_acl[$sdn][$dn] = $this->ACL[$dn]; 
+          foreach($without_self_acl[$sdn][$dn] as $acl_id => $acl_set){
+  
+            /* Remember which ACL set has speicial user filter 
+             */
+            if(isset($acl_set['filter']{1})){
+              $this->ACLperPath_usesFilter[$sdn] = TRUE;
+            }
+          
+            /* Remove all acl entries which are especially for the current user (self acl)
+             */
+            foreach($acl_set['acl'] as $object => $object_acls){
+              if(strpos($object_acls[0],"s")){
+                unset($without_self_acl[$sdn][$dn][$acl_id]['acl'][$object]);
+              }
+            }
+          }
         }
+        $dn = preg_replace("/^[^,]*+,/","",$dn);
       }
-    }else{
-      trigger_error("ACL request for an invalid category (".$category.").");
+    } 
+    $this->ACLperPath =$without_self_acl;
+
+    /* Append Self entry */
+    $dn = $this->dn;
+    while(strpos($dn,",") && !isset($all_acl[$dn])){
+      $dn = preg_replace("/^[^,]*+,/","",$dn);
     }
-    $ACL_CACHE = &session::get("ACL_CACHE");
-    $ACL_CACHE['CATEGORY_ACL'][$id] = $acl;
-    return ($acl);
+    if(isset($all_acl[$dn])){
+      $this->ACLperPath[$this->dn] = $all_acl[$dn];
+    }
+  }
+
+
+  function get_category_permissions($dn, $category, $any_acl = FALSE)
+  {
+    return(@$this->get_permissions($dn,$category.'/0',""));
   }
 
   
@@ -302,18 +330,46 @@ class userinfo
     }
 
     /* Push cache answer? */
-    $ACL_CACHE = &session::get('ACL_CACHE');
+    $ACL_CACHE = &session::global_get('ACL_CACHE');
     if (isset($ACL_CACHE["$dn+$object+$attribute"])){
-
-      /* Remove write if needed */
-      if ($skip_write){
-        $ret = preg_replace('/w/', '', $ACL_CACHE["$dn+$object+$attribute"]);
-      }else{
-        $ret = $ACL_CACHE["$dn+$object+$attribute"];
-      } 
+      $ret = $ACL_CACHE["$dn+$object+$attribute"];
+      if($skip_write){
+        $ret = str_replace(array('w','c','d','m'), '',$ret);
+      }
       return($ret);
     }
 
+    /* Detect the set of ACLs we have to check for this object 
+     */
+    $adn = $dn;
+    while(!isset($this->ACLperPath[$adn]) && strpos($adn,",") !== FALSE){
+      $adn = preg_replace("/^[^,]*+,/","",$adn);
+    }
+    if(isset($this->ACLperPath[$adn])){
+      $ACL = $this->ACLperPath[$adn];
+    }else{
+      $ACL_CACHE["$dn+$object+$attribute"] = "";
+      return("");
+    }
+ 
+    /* If we do not need to respect any user-filter settings 
+        we can skip the per object ACL checks.
+     */
+    $orig_dn= $dn;
+    if(!isset($this->ACLperPath_usesFilter[$adn])){
+      $dn = $adn;
+      if (isset($ACL_CACHE["$dn+$object+$attribute"])){
+        $ret = $ACL_CACHE["$dn+$object+$attribute"];
+        if(!isset($ACL_CACHE["$orig_dn+$object+$attribute"])){
+          $ACL_CACHE["$orig_dn+$object+$attribute"] = $ACL_CACHE["$dn+$object+$attribute"];
+        }
+        if($skip_write){
+          $ret = str_replace('w','',$ret);
+        }
+        return($ret);
+      }
+    }
+ 
     /* Get ldap object, for later filter checks 
      */
     $ldap = $this->config->get_ldap_link();
@@ -339,10 +395,10 @@ class userinfo
         $cpath= $element.','.$cpath;
       }
 
-      if (isset($this->ACL[$cpath])){
+      if (isset($ACL[$cpath])){
 
         /* Inspect this ACL, place the result into ACL */
-        foreach ($this->ACL[$cpath] as $subacl){
+        foreach ($ACL[$cpath] as $subacl){
 
           /* Reset? Just clean the ACL and turn over to the next one... */
           if ($subacl['type'] == 'reset'){
@@ -368,7 +424,7 @@ class userinfo
 
           /* Self ACLs? 
            */
-          if($dn != $this->dn && isset($subacl['acl'][$object][0]) && strpos($subacl['acl'][$object][0],"s")){
+          if($dn != $this->dn && isset($subacl['acl'][$object][0]) && (strpos($subacl['acl'][$object][0],"s") !== FALSE)){
             continue;
           }
 
@@ -399,6 +455,37 @@ class userinfo
             $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl']['all'][0]);
             continue;
           }
+
+          /* Category ACLs    (e.g. $object = "user/0")
+           */
+          if(strstr($object,"/0")){
+            $ocs = preg_replace("/\/0$/","",$object);
+            if(isset($this->ocMapping[$ocs])){
+
+              /* if $attribute is "", then check every single attribute for this object.
+                 if it is 0, then just check the object category ACL.
+               */
+              if($attribute == ""){    
+                foreach($this->ocMapping[$ocs] as $oc){
+                  if (isset($subacl['acl'][$ocs.'/'.$oc])){
+
+                    if($dn != $this->dn && strpos($subacl['acl'][$ocs.'/'.$oc][0],"s") !== FALSE) continue;
+
+                    foreach($subacl['acl'][$ocs.'/'.$oc] as $attr => $dummy){
+                      $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl'][$ocs.'/'.$oc][$attr]);
+                    }
+                    continue;
+                  }
+                }
+              }else{
+                if(isset($subacl['acl'][$ocs.'/'.$oc][0])){
+                  if($dn != $this->dn && strpos($subacl['acl'][$ocs.'/'.$oc][0],"s") !== FALSE) continue;
+                  $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl'][$ocs.'/'.$oc][0]);
+                }
+              }
+            }
+            continue;
+          }
         }
       }
     }
@@ -419,10 +506,11 @@ class userinfo
     }
 
     $ACL_CACHE["$dn+$object+$attribute"]= $ret;
+    $ACL_CACHE["$orig_dn+$object+$attribute"]= $ret;
 
     /* Remove write if needed */
     if ($skip_write){
-      $ret= preg_replace('/w/', '', $ret);
+      $ret = str_replace(array('w','c','d','m'), '',$ret);
     }
     return ($ret);
   }
@@ -440,7 +528,7 @@ class userinfo
     }
 
     /* Use cached results if possilbe */
-    $ACL_CACHE = &session::get('ACL_CACHE');
+    $ACL_CACHE = &session::global_get('ACL_CACHE');
 
     if(!is_array($module)){
       $module = array($module);
@@ -463,8 +551,8 @@ class userinfo
           foreach($info['acl'] as $cat => $data){
 
             /* Skip self acls? */
-            if($skip_self_acls && isset($data['0']) && strpos($data['0'], "s")) continue;
-            if(preg_match("/^".normalizePreg($mod)."/",$cat)){
+            if($skip_self_acls && isset($data['0']) && (strpos($data['0'], "s") !== FALSE)) continue;
+            if(preg_match("/^".preg_quote($mod, '/')."/",$cat)){
               $found =TRUE;
               break;
             }
@@ -475,7 +563,7 @@ class userinfo
               $dn = preg_replace("/^[^,]+,/","",$dn);
             }
             if(isset($this->config->idepartments[$dn])){
-              $deps[] = $dn;
+              $deps[$dn] = $dn;
             }
           }
         }
@@ -483,7 +571,7 @@ class userinfo
 
       /* For all gosaDepartments */
       foreach ($this->config->departments as $dn){
-        if(in_array($dn,$deps)) continue;
+        if(isset($deps[$dn])) continue;
         $acl = "";
         if(strpos($mod, '/')){
           $acl.=  $this->get_permissions($dn,$mod);
@@ -491,14 +579,15 @@ class userinfo
           $acl.=  $this->get_category_permissions($dn,$mod,TRUE);
         }
         if(!empty($acl)) {
-          $deps[] = $dn;
+          $deps[$dn] = $dn;
         }
       }
 
       $ACL_CACHE['MODULE_DEPARTMENTS'][$mod] = $deps;
       $res = array_merge($res,$deps);
-    } 
-    return ($res);
+    }
+
+    return (array_values($res));
   }
 
 
@@ -515,6 +604,11 @@ class userinfo
 
     foreach(str_split($newACL) as $char){
 
+      /* Skip "self" ACLs without combination of rwcdm, they have no effect.
+         -self flag without read/write/create/...
+       */
+      if(empty($char)) continue;
+
       /* Skip permanent and subtree entries */
       if (preg_match('/[sp]/', $acl[$char])){
         continue;
@@ -584,7 +678,7 @@ class userinfo
             /* Skip objectClass '0' (e.g. users/0) get_permissions will ever return '' ??  */
             if($oc == "0") continue;
             $tmp =  $this->get_permissions($dn, $category."/".$oc);
-            for($i = 0 ; $i < strlen($types); $i++) {
+            for($i = 0, $l= strlen($types); $i < $l; $i++) {
               if(!preg_match("/".$types[$i]."/",$tmp)){ 
                 $acl = preg_replace("/".$types[$i]."/","",$acl);
               }