lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 16:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for https://github.com/opnsense/core/issues/116 (group handling tried to remove groups)

Browse Source
This commit is contained in:
Ad Schellevis 2015-03-29 12:22:51 +00:00
parent 5e22c02082
commit 49c891985f
2 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/etc/inc/auth.inc
View File

@ -519,17 +519,16 @@ function local_user_get_groups($user, $all = false)
global $config;
$groups = array();
if (!is_array($config['system']['group']))
if (!is_array($config['system']['group'])) {
return $groups;
}
foreach ($config['system']['group'] as $group)
if ( $all || ( !$all && ($group['name'] != "all")))
if (is_array($group['member']))
if (in_array($user['uid'], $group['member']))
$groups[] = $group['name'];
if ($all) {
$groups[] = 'all';
foreach ($config['system']['group'] as $group) {
if (is_array($group['member'])) {
if (in_array($user['uid'], $group['member']) || ($group['name'] == "all" && $all)) {
$groups[] = $group['name'];
}
}
}
sort($groups);
@ -548,28 +547,33 @@ function local_user_set_groups($user, $new_groups = null)
$cur_groups = local_user_get_groups($user, true);
$mod_groups = array();
if (!is_array($new_groups))
if (!is_array($new_groups)) {
$new_groups = array();
}
if (!is_array($cur_groups))
if (!is_array($cur_groups)) {
$cur_groups = array();
}
/* determine which memberships to add */
foreach ($new_groups as $groupname) {
if (in_array($groupname,$cur_groups))
if (in_array($groupname,$cur_groups) || !isset($groupindex[$groupname])) {
// continue if group is already in current list or the groupname is invalid
continue;
}
$group = & $config['system']['group'][$groupindex[$groupname]];
$group['member'][] = $user['uid'];
$mod_groups[] = $group;
}
unset($group);
/* determine which memberships to remove */
foreach ($cur_groups as $groupname) {
if (in_array($groupname,$new_groups))
if (in_array($groupname,$new_groups)) {
continue;
if (!isset($config['system']['group'][$groupindex[$groupname]]))
}
if (!isset($config['system']['group'][$groupindex[$groupname]])) {
continue;
}
$group = & $config['system']['group'][$groupindex[$groupname]];
if (is_array($group['member'])) {
$index = array_search($user['uid'], $group['member']);
@ -577,11 +581,11 @@ function local_user_set_groups($user, $new_groups = null)
$mod_groups[] = $group;
}
}
unset($group);
/* sync all modified groups */
foreach ($mod_groups as $group)
foreach ($mod_groups as $group) {
local_group_set($group);
}
}
function local_group_del_user($user) {

28
src/www/system_usermanager.php
View File

@ -248,21 +248,23 @@ if ($_POST['save']) {
if (!$input_errors) {
$userent = array();
if (isset($id) && $a_user[$id])
if (isset($id) && $a_user[$id]) {
$userent = $a_user[$id];
/* the user name was modified */
if ($_POST['usernamefld'] <> $_POST['oldusername']) {
$_SERVER['REMOTE_USER'] = $_POST['usernamefld'];
local_user_del($userent);
}
/* the user password was mofified */
if ($_POST['passwordfld1']) {
local_user_set_password($userent, $_POST['passwordfld1']);
}
}
isset($_POST['utype']) ? $userent['scope'] = $_POST['utype'] : $userent['scope'] = "system";
/* the user name was modified */
if ($_POST['usernamefld'] <> $_POST['oldusername']) {
$_SERVER['REMOTE_USER'] = $_POST['usernamefld'];
local_user_del($userent);
}
/* the user password was mofified */
if ($_POST['passwordfld1'])
local_user_set_password($userent, $_POST['passwordfld1']);
$userent['name'] = $_POST['usernamefld'];
$userent['descr'] = $_POST['descr'];
$userent['expires'] = $_POST['expires'];
@ -320,10 +322,6 @@ if ($_POST['save']) {
local_user_set($userent);
write_config();
//if(is_dir("/usr/local/etc/inc/privhooks"))
// run_plugins("/usr/local/etc/inc/privhooks");
pfSenseHeader("system_usermanager.php");
}
}