X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_userinfo.inc;h=c69ef528ea0a9a759db25124bbff2f7feba9d6e5;hb=a1042e3e00ba59c4bf021996296bed796f1a815c;hp=08e232de746e1c7f0b263c45eac5c3995d2d5d5f;hpb=26ed90923dc2292f528c4abb08a8a4ef0fc14b36;p=gosa.git

diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index 08e232de7..c69ef528e 100644
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -27,6 +27,7 @@ class userinfo
   var $username;
   var $cn;
   var $uid;
+  var $restrictions= array();
   var $gidNumber= -1;
   var $language= "";
   var $config;
@@ -36,7 +37,7 @@ class userinfo
   var $ocMapping= array();
   var $groups= array();
   var $result_cache =array();
-  var $ignoreACl = FALSE;
+  var $ignoreACL = FALSE;
   var $ACLperPath = array();
   var $ACLperPath_usesFilter = array();
 
@@ -45,7 +46,7 @@ class userinfo
   function userinfo(&$config, $userdn){
     $this->config= &$config;
     $ldap= $this->config->get_ldap_link();
-    $ldap->cat($userdn,array('sn', 'givenName', 'uid', 'gidNumber', 'preferredLanguage', 'gosaUnitTag'));
+    $ldap->cat($userdn,array('sn', 'givenName', 'uid', 'gidNumber', 'preferredLanguage', 'gosaUnitTag', 'gosaLoginRestriction'));
     $attrs= $ldap->fetch();
 
     if (isset($attrs['givenName'][0]) && isset($attrs['sn'][0])){
@@ -57,6 +58,12 @@ class userinfo
       $this->gidNumber= $attrs['gidNumber'][0];
     }
 
+    /* Restrictions? */
+    if (isset($attrs['gosaLoginRestriction'])){
+      $this->restrictions= $attrs['gosaLoginRestriction'];
+      unset($this->restrictions['count']);
+    }
+
     /* Assign user language */
     if (isset($attrs['preferredLanguage'][0])){
       $this->language= $attrs['preferredLanguage'][0];
@@ -70,7 +77,7 @@ class userinfo
     $this->uid= $attrs['uid'][0];
     $this->ip= $_SERVER['REMOTE_ADDR'];
 
-    $this->ignoreACL = ($this->config->get_cfg_value("ignoreAcl") == $this->dn);
+    $this->ignoreACL = ($this->config->get_cfg_value("core","ignoreAcl") == $this->dn);
 
     /* Initialize ACL_CACHE */
     $this->reset_acl_cache();
@@ -80,12 +87,13 @@ class userinfo
   public function reset_acl_cache()
   {
     /* Initialize ACL_CACHE */
-    session::set('ACL_CACHE',array());
+    session::global_set('ACL_CACHE',array());
   }
 
   function loadACL()
   {
     $this->ACL= array();    
+    $this->allACLs= array();    
     $this->groups= array();    
     $this->result_cache =array();
     $this->reset_acl_cache();
@@ -151,15 +159,16 @@ class userinfo
       foreach($aclc[$dn] as $idx => $type){
         $interresting= FALSE;
         
-        /* No members? This is good for all users... */
+        /* No members? This ACL rule is deactivated ... */
         if (!count($type['members'])){
-          $interresting= TRUE;
+          $interresting= FALSE; 
         } else {
 
           /* 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;
             }
 
@@ -167,6 +176,12 @@ class userinfo
             if (preg_replace('/^U:/', '', $grp) == $this->dn){
               $interresting= TRUE;
             }
+
+            /* Wildcard? */
+            if (preg_match('/^G:\*/',  $grp)){
+              $interresting= TRUE;
+            }
+            $this->allACLs[$dn][$idx]= $type;
           }
         }
 
@@ -196,8 +211,9 @@ class userinfo
     $without_self_acl = $all_acl = array();
     foreach($this->ACL as $dn => $acl){
       $sdn =$dn;
-      while(strpos($dn,",") !== FALSE){
-
+      $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]; 
@@ -211,10 +227,12 @@ class userinfo
           
             /* 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]);
-              }
+            if(isset($acl_set['acl'])){ 
+                foreach($acl_set['acl'] as $object => $object_acls){
+                    if(isset($object_acls[0]) && strpos($object_acls[0],"s")){
+                        unset($without_self_acl[$sdn][$dn][$acl_id]['acl'][$object]);
+                    }
+                }
             }
           }
         }
@@ -234,9 +252,17 @@ class userinfo
   }
 
 
+  /* Returns an array containing all target objects we've permssions on.
+   */
+  function get_acl_target_objects()
+  {
+    return(array_keys($this->ACLperPath));
+  }
+  
+
   function get_category_permissions($dn, $category, $any_acl = FALSE)
   {
-    return(@$this->get_permissions($dn,$category.'/0',""));
+    return($this->get_permissions($dn,$category.'/0',""));
   }
 
   
@@ -328,7 +354,7 @@ 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"])){
       $ret = $ACL_CACHE["$dn+$object+$attribute"];
       if($skip_write){
@@ -337,6 +363,31 @@ class userinfo
       return($ret);
     }
 
+    /* Check for correct category and class values... */
+    if(strpos($object,'/') !== FALSE){
+      list($aclCategory, $aclClass) = preg_split("!/!", $object);
+    }else{
+      $aclCategory = $object;
+    }
+
+    if($this->config->boolValueIsTrue("core","developmentMode")){
+
+        if(!isset($this->ocMapping[$aclCategory])){
+            trigger_error("Invalid ACL category '".$aclCategory."'! ({$object})");
+            return("");
+        }elseif(isset($aclClass) && !in_array($aclClass, $this->ocMapping[$aclCategory])){
+            trigger_error("Invalid ACL class '".$aclClass."'! ({$object})");
+            return("");
+        }
+        if(isset($aclClass) &&class_available($aclClass)){
+            $plInfo = call_user_func(array($aclClass, 'plInfo'));
+            if(!empty($attribute) && !isset($plInfo['plProvidedAcls'][$attribute])){
+                trigger_error("Invalid ACL attribute '".$attribute."'! ({$object})");
+                return("");
+            }
+        }
+    }
+
     /* Detect the set of ACLs we have to check for this object 
      */
     $adn = $dn;
@@ -375,7 +426,7 @@ class userinfo
     $acl= array("r" => "", "w" => "", "c" => "", "d" => "", "m" => "", "a" => "");
 
     /* Build dn array */
-    $path= split(',', $dn);
+    $path= explode(',', $dn);
     $path= array_reverse($path);
 
     /* Walk along the path to evaluate the acl */
@@ -398,12 +449,6 @@ class userinfo
         /* Inspect this ACL, place the result into ACL */
         foreach ($ACL[$cpath] as $subacl){
 
-          /* Reset? Just clean the ACL and turn over to the next one... */
-          if ($subacl['type'] == 'reset'){
-            $acl= $this->cleanACL($acl, TRUE);
-            continue;
-          }
-
           if($subacl['type'] == "role") {
             echo "role skipped";
             continue;
@@ -420,9 +465,15 @@ class userinfo
             }
           }
 
+          /* Reset? Just clean the ACL and turn over to the next one... */
+          if ($subacl['type'] == 'reset'){
+            $acl= $this->cleanACL($acl, TRUE);
+            continue;
+          }
+
           /* 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;
           }
 
@@ -449,6 +500,12 @@ class userinfo
           }
 
           /* Global ACL? */
+          if (isset($subacl['acl']['all/all'][0])){
+            $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl']['all/all'][0]);
+            continue;
+          }
+
+          /* Global ACL? - Old style global ACL - Was removed since class_core.inc was created */
           if (isset($subacl['acl']['all'][0])){
             $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl']['all'][0]);
             continue;
@@ -466,6 +523,12 @@ class userinfo
               if($attribute == ""){    
                 foreach($this->ocMapping[$ocs] as $oc){
                   if (isset($subacl['acl'][$ocs.'/'.$oc])){
+
+                      // Skip ACLs wich are defined for ourselfs only - if not checking against ($ui->dn)
+                      if(isset($subacl['acl'][$ocs.'/'.$oc][0]) && 
+                              $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]);
                     }
@@ -474,6 +537,7 @@ class userinfo
                 }
               }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]);
                 }
               }
@@ -522,7 +586,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);
@@ -542,15 +606,17 @@ class userinfo
       foreach($this->ACL as $dn => $infos){
         foreach($infos as $info){
           $found = FALSE;
-          foreach($info['acl'] as $cat => $data){
-
-            /* Skip self acls? */
-            if($skip_self_acls && isset($data['0']) && strpos($data['0'], "s")) continue;
-            if(preg_match("/^".preg_quote($mod, '/')."/",$cat)){
-              $found =TRUE;
-              break;
-            }
-          } 
+          if(isset($info['acl'])){
+              foreach($info['acl'] as $cat => $data){
+
+                  /* Skip self acls? */
+                  if($skip_self_acls && isset($data['0']) && (strpos($data['0'], "s") !== FALSE)) continue;
+                  if(preg_match("/^".preg_quote($mod, '/')."/",$cat)){
+                      $found =TRUE;
+                      break;
+                  }
+              } 
+        } 
 
           if($found && !isset($this->config->idepartments[$dn])){
             while(!isset($this->config->idepartments[$dn]) && strpos($dn, ",")){
@@ -598,6 +664,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;
@@ -674,7 +745,9 @@ class userinfo
             }
           }
         }else{
-          trigger_error("Invalid type of category ".$category);
+            if($this->config->boolValueIsTrue("core","developmentMode")){
+                trigger_error("Invalid type of category ".$category);
+            }
           $acl = "";
         }
         $this->result_cache['has_complete_category_acls'][$dn][$category] = $acl;
@@ -694,7 +767,52 @@ class userinfo
     return($this->ignoreACL);
   }
 
+
+  function loginAllowed()
+  {
+    // Need to check restrictions?
+    if (count($this->restrictions)){
+
+      // We have restrictions but cannot check them
+      if (!isset($_SERVER['REMOTE_ADDR'])){
+        return false;
+      }
+
+      // Move to binary...
+      $source= $_SERVER['REMOTE_ADDR'];
+      foreach ($this->restrictions as $restriction) {
+
+        // Single IP
+        if (preg_match('/^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/', $restriction)) {
+           if ($source == $restriction){
+             return true;
+           }
+        }
+
+        // Match with short netmask
+        if (preg_match('/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\/([0-9]+)$/', $restriction, $matches)) {
+          if (isIpInNet($source, $matches[1], long2ip(~(pow(2, (32-$matches[2]))-1)))) {
+            return true;
+          }
+        }
+
+        // Match with long netmask
+        if (preg_match('/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\/([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)$/', $restriction, $matches)) {
+          if (isIpInNet($source, $matches[1], $matches[2])) {
+            return true;
+          }
+        }
+
+      }
+
+      return false;
+    }
+
+    return true;
+  }
+
 }
 
+
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>