X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_userinfo.inc;h=06a9648d1782d875d72483966014d5fc683af4be;hb=7b9eac53d0a01b7a79fc31199e8983c333c86a43;hp=1966462bf8b04b64b64935de471452f11860a6ca;hpb=271c0e9443fe7078450085bfdcca623bf6fe120f;p=gosa.git

diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index 1966462bf..06a9648d1 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];
@@ -151,15 +158,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;
             }
 
@@ -213,7 +221,7 @@ 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")){
+              if(isset($object_acls[0]) && strpos($object_acls[0],"s")){
                 unset($without_self_acl[$sdn][$dn][$acl_id]['acl'][$object]);
               }
             }
@@ -235,6 +243,14 @@ 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',""));
@@ -704,7 +720,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:
 ?>