WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replaced caching

This commit is contained in:
Roland Gruber 2010-11-21 19:00:33 +00:00
parent d05e2dd818
commit 55fc2b7117
1 changed files with 75 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
lam/lib/modules/posixGroup.inc
View File

@ -41,12 +41,14 @@ class posixGroup extends baseModule implements passwordService {
/** change GIDs of users and hosts? */ /** change GIDs of users and hosts? */
private $changegids; private $changegids;
/** specifies if the cn attribute should be managed by this module */ /** specifies if the cn attribute should be managed by this module */
protected $manageCnAttribute = true; protected $manageCnAttribute = true;
/** specifies if the description attribute should be managed by this module */ /** specifies if the description attribute should be managed by this module */
protected $manageDescriptionAttribute = true; protected $manageDescriptionAttribute = true;
/** cache for existing GID numbers */
private $cachedGIDList = null;
/** cache for existing users and their GIDs */
private $cachedUserToGIDList = null;
/** /**
* In this function the LDAP account is built up. * In this function the LDAP account is built up.
@ -132,29 +134,20 @@ class posixGroup extends baseModule implements passwordService {
return $error_messages; return $error_messages;
} }
/** /**
* Checks if the group which should be deleted is still used as primary group. * Checks if the group which should be deleted is still used as primary group.
* *
* @return List of LDAP operations, same as for save_attributes() * @return List of LDAP operations, same as for save_attributes()
*/ */
function delete_attributes() { function delete_attributes() {
$data = $_SESSION['cache']->get_cache('gidNumber', 'posixAccount', 'user'); $return = array();
$DNs = array_keys($data); $result = searchLDAPByFilter('gidNumber=' . $this->attributes['gidNumber'][0], array('dn'), array('user', 'host'));
$found = false; if (sizeof($result) > 0) {
for ($i = 0; $i < sizeof($DNs); $i++) {
if ($data[$DNs[$i]][0] == $this->attributes['gidNumber'][0]) {
$found = true;
break;
}
}
if ($found) {
$return[$this->getAccountContainer()->dn]['errors'][] = $this->messages['primaryGroup'][0]; $return[$this->getAccountContainer()->dn]['errors'][] = $this->messages['primaryGroup'][0];
} }
return $return; return $return;
} }
/** /**
* Returns the HTML meta data for the main account page. * Returns the HTML meta data for the main account page.
* *
@ -223,25 +216,22 @@ class posixGroup extends baseModule implements passwordService {
*/ */
function display_html_user() { function display_html_user() {
$return = new htmlTable(); $return = new htmlTable();
if (!isset($this->attributes['memberUid'])) {
$this->attributes['memberUid'] = array();
}
// load list with all users // load list with all users
$dn_users = $_SESSION['cache']->get_cache(array('uid', 'gidNumber'), 'posixAccount', 'user'); $userAndGIDs = $this->getUserAndGIDs();
$users = array(); $users = array();
if (is_array($dn_users)) { foreach ($userAndGIDs as $user => $GID) {
$DNs = array_keys($dn_users); if (!in_array($user, $this->attributes['memberUid'])) {
for ($i = 0; $i < sizeof($DNs); $i++) { if ($this->attributes['gidNumber'][0] == $GID) {
// users who can be added have a uid and gidNumber
if (isset($dn_users[$DNs[$i]]['uid'][0]) && isset($dn_users[$DNs[$i]]['gidNumber'][0]) &&
// are not already member
(!isset($this->attributes['memberUid']) || !in_array($dn_users[$DNs[$i]]['uid'][0], $this->attributes['memberUid']))) {
if ($this->attributes['gidNumber'][0] == $dn_users[$DNs[$i]]['gidNumber'][0]) {
if (isset($this->moduleSettings['posixAccount_primaryGroupAsSecondary'][0]) if (isset($this->moduleSettings['posixAccount_primaryGroupAsSecondary'][0])
&& ($this->moduleSettings['posixAccount_primaryGroupAsSecondary'][0] == 'true')) { && ($this->moduleSettings['posixAccount_primaryGroupAsSecondary'][0] == 'true')) {
$users[] = $dn_users[$DNs[$i]]['uid'][0]; $users[] = $user;
} }
} }
else { else {
$users[] = $dn_users[$DNs[$i]]['uid'][0]; $users[] = $user;
}
} }
} }
} }
@ -258,6 +248,7 @@ class posixGroup extends baseModule implements passwordService {
} }
$remSelect = new htmlSelect('removeusers', $remGroups, null, 15); $remSelect = new htmlSelect('removeusers', $remGroups, null, 15);
$remSelect->setMultiSelect(true); $remSelect->setMultiSelect(true);
$remSelect->setTransformSingleSelect(false);
$return->addElement($remSelect); $return->addElement($remSelect);
$buttonContainer = new htmlTable(); $buttonContainer = new htmlTable();
$buttonContainer->addElement(new htmlButton('addusers_button', 'back.gif', true), true); $buttonContainer->addElement(new htmlButton('addusers_button', 'back.gif', true), true);
@ -266,6 +257,7 @@ class posixGroup extends baseModule implements passwordService {
$return->addElement($buttonContainer); $return->addElement($buttonContainer);
$addSelect = new htmlSelect('addusers', $users, null, 15); $addSelect = new htmlSelect('addusers', $users, null, 15);
$addSelect->setMultiSelect(true); $addSelect->setMultiSelect(true);
$addSelect->setTransformSingleSelect(false);
$return->addElement($addSelect); $return->addElement($addSelect);
$return->addNewLine(); $return->addNewLine();
@ -420,6 +412,10 @@ class posixGroup extends baseModule implements passwordService {
'cn' => array( 'cn' => array(
"Headline" => _("Group name"), "Headline" => _("Group name"),
"Text" => _("Group name of the group which should be created. Valid characters are: a-z, A-Z, 0-9 and .-_ . If group name is already used group name will be expanded with a number. The next free number will be used.") "Text" => _("Group name of the group which should be created. Valid characters are: a-z, A-Z, 0-9 and .-_ . If group name is already used group name will be expanded with a number. The next free number will be used.")
),
'changegids' => array(
"Headline" => _("Change GID number of users and hosts"),
"Text" => _("The ID of this group was changed. You can update all user and host entries to the new group ID.")
) )
); );
@ -550,21 +546,15 @@ class posixGroup extends baseModule implements passwordService {
} }
if (isset($_POST['changegids'])) $this->changegids=true; if (isset($_POST['changegids'])) $this->changegids=true;
else $this->changegids=false; else $this->changegids=false;
if (($this->attributes['gidNumber'][0] != $_POST['gidNumber']) || !isset($this->attributes['gidNumber'][0])) { if (!isset($this->attributes['gidNumber'][0]) || ($this->attributes['gidNumber'][0] != $_POST['gidNumber'])) {
// Check if GID is valid. If none value was entered, the next useable value will be inserted // Check if GID is valid. If none value was entered, the next useable value will be inserted
// load min and max GID number // load min and max GID number
$minID = intval($this->moduleSettings['posixGroup_minGID'][0]); $minID = intval($this->moduleSettings['posixGroup_minGID'][0]);
$maxID = intval($this->moduleSettings['posixGroup_maxGID'][0]); $maxID = intval($this->moduleSettings['posixGroup_maxGID'][0]);
$dn_gids = $_SESSION['cache']->get_cache('gidNumber', 'posixGroup', 'group');
// get_cache will return an array ( dn1 => array(uidnumber1), dn2 => array(uidnumber2), ... )
if(is_array($dn_gids) && (sizeof($dn_gids) > 0)) {
foreach ($dn_gids as $gid) $gids[] = $gid[0];
sort ($gids, SORT_NUMERIC);
}
$this->attributes['gidNumber'][0] = $_POST['gidNumber']; $this->attributes['gidNumber'][0] = $_POST['gidNumber'];
if ($this->attributes['gidNumber'][0]=='') { if ($this->attributes['gidNumber'][0]=='') {
// No id-number given, find free GID // No id-number given, find free GID
if ($this->orig['gidNumber'][0]=='') { if (!isset($this->orig['gidNumber'][0])) {
$newGID = $this->getNextGIDs(1, $errors); $newGID = $this->getNextGIDs(1, $errors);
if (is_array($newGID)) { if (is_array($newGID)) {
$this->attributes['gidNumber'][0] = $newGID[0]; $this->attributes['gidNumber'][0] = $newGID[0];
@ -577,6 +567,7 @@ class posixGroup extends baseModule implements passwordService {
// old account -> return id-number which has been used // old account -> return id-number which has been used
} }
else { else {
$gids = $this->getGIDs();
// Check manual ID // Check manual ID
if ($this->getAccountContainer()->isNewAccount || !isset($this->orig['gidNumber'][0]) || ($this->orig['gidNumber'][0] != $this->attributes['gidNumber'][0])) { if ($this->getAccountContainer()->isNewAccount || !isset($this->orig['gidNumber'][0]) || ($this->orig['gidNumber'][0] != $this->attributes['gidNumber'][0])) {
// check range // check range
@ -589,7 +580,7 @@ class posixGroup extends baseModule implements passwordService {
if (is_array($gids)) { if (is_array($gids)) {
// id-number is in use and account is a new account // id-number is in use and account is a new account
if ((in_array($this->attributes['gidNumber'][0], $gids)) && $this->orig['gidNumber'][0]=='') { if ((in_array($this->attributes['gidNumber'][0], $gids)) && $this->orig['gidNumber'][0]=='') {
$errors[] = array('ERROR', _('ID-Number'), _('ID is already in use')); $errors[] = $this->messages['gidNumber'][4];
unset($this->attributes['gidNumber'][0]); unset($this->attributes['gidNumber'][0]);
} }
// id-number is in use, account is existing account and id-number is not used by itself // id-number is in use, account is existing account and id-number is not used by itself
@ -698,14 +689,11 @@ class posixGroup extends baseModule implements passwordService {
$return = $this->getAccountContainer()->save_module_attributes($this->attributes, $this->orig); $return = $this->getAccountContainer()->save_module_attributes($this->attributes, $this->orig);
// Change gids of users and hosts? // Change gids of users and hosts?
if ($this->changegids) { if ($this->changegids) {
// get gidNumber // find all accounts to change
$result = $_SESSION['cache']->get_cache('gidNumber', 'posixAccount', array('user', 'host')); $result = searchLDAPByFilter('(&(objectClass=posixAccount)(gidNumber=' . $this->orig['gidNumber'][0] . '))', array('dn'), array('user', 'host'));
if (is_array($result)) { if (sizeof($result) > 0) {
$DNs = array_keys($result); for ($i = 0; $i < sizeof($result); $i++) {
for ($i=0; $i<count($DNs); $i++) { $return[$result[$i]['dn']]['modify']['gidNumber'][0] = $this->attributes['gidNumber'][0];
if ($result[$DNs[$i]][0] == $this->orig['gidNumber'][0]) {
$return[$DNs[$i]]['modify']['gidNumber'][0] = $this->attributes['gidNumber'][0];
}
} }
} }
} }
@ -724,14 +712,10 @@ class posixGroup extends baseModule implements passwordService {
$ret = array(); $ret = array();
$minID = intval($this->moduleSettings['posixGroup_minGID'][0]); $minID = intval($this->moduleSettings['posixGroup_minGID'][0]);
$maxID = intval($this->moduleSettings['posixGroup_maxGID'][0]); $maxID = intval($this->moduleSettings['posixGroup_maxGID'][0]);
$dn_gids = $_SESSION['cache']->get_cache('gidNumber', 'posixGroup', 'group'); $gidList = $this->getGIDs();
// get_cache will return an array ( dn1 => array(gidnumber1), dn2 => array(gidnumber2), ... )
$gids = array(); $gids = array();
if(is_array($dn_gids)) { foreach ($gidList as $gid) {
foreach ($dn_gids as $gid) { if (($gid <= $maxID) && ($gid >= $minID)) $gids[] = $gid; // ignore GIDs > maxID and GIDs < minID
if (($gid[0] <= $maxID) && ($gid[0] >= $minID)) $gids[] = $gid[0]; // ignore GIDs > maxID and GIDs < minID
}
sort ($gids, SORT_NUMERIC);
} }
for ($i = 0; $i < $count; $i++) { for ($i = 0; $i < $count; $i++) {
if (count($gids) != 0) { if (count($gids) != 0) {
@ -799,6 +783,41 @@ class posixGroup extends baseModule implements passwordService {
return array(); return array();
} }
/**
* Returns a list of existing GID numbers.
*
* @return array list of GID numbers
*/
private function getGIDs() {
if ($this->cachedGIDList != null) {
return $this->cachedGIDList;
}
$result = searchLDAPByAttribute('gidNumber', '*', 'posixGroup', array('gidNumber'), array('group'));
$this->cachedGIDList = array();
for ($i = 0; $i < sizeof($result); $i++) {
$this->cachedGIDList[] = $result[$i]['gidnumber'][0];
}
sort($this->cachedGIDList, SORT_NUMERIC);
return $this->cachedGIDList;
}
/**
* Returns a list of existing users and their GID numbers.
*
* @return array list in format array(uid => gidNumber)
*/
private function getUserAndGIDs() {
if ($this->cachedUserToGIDList != null) {
return $this->cachedUserToGIDList;
}
$result = searchLDAPByAttribute('gidNumber', '*', 'posixAccount', array('uid', 'gidNumber'), array('user'));
$this->cachedUserToGIDList = array();
for ($i = 0; $i < sizeof($result); $i++) {
$this->cachedUserToGIDList[$result[$i]['uid'][0]] = $result[$i]['gidnumber'][0];
}
return $this->cachedUserToGIDList;
}
} }
?> ?>