![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 08e232de746e1c7f0b263c45eac5c3995d2d5d5f..06a9648d1782d875d72483966014d5fc683af4be 100644 (file)
var $username;
var $cn;
var $uid;
+ var $restrictions= array();
var $gidNumber= -1;
var $language= "";
var $config;
var $ocMapping= array();
var $groups= array();
var $result_cache =array();
- var $ignoreACl = FALSE;
+ var $ignoreACL = FALSE;
var $ACLperPath = array();
var $ACLperPath_usesFilter = array();
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])){
$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];
public function reset_acl_cache()
{
/* Initialize ACL_CACHE */
- session::set('ACL_CACHE',array());
+ session::global_set('ACL_CACHE',array());
}
function loadACL()
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;
}
$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];
/* 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]);
}
}
}
+ /* 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',""));
}
/* 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){
/* 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;
}
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]);
}
}
}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]);
}
}
}
/* 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);
foreach($info['acl'] as $cat => $data){
/* Skip self acls? */
- if($skip_self_acls && isset($data['0']) && strpos($data['0'], "s")) continue;
+ if($skip_self_acls && isset($data['0']) && (strpos($data['0'], "s") !== FALSE)) continue;
if(preg_match("/^".preg_quote($mod, '/')."/",$cat)){
$found =TRUE;
break;
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;
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:
?>