mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Respect all Class attributes returned by the RADIUS server, not only the last one received. Fixes #6086

Browse Source
This commit is contained in:
jim-p 2016-04-07 10:58:38 -04:00
parent 0ef6fddce9
commit 461bae6b08
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1441,8 +1441,15 @@ function radius_backed($username, $passwd, $authcfg, &$attributes = array()) {
*/
function radius_get_groups($attributes) {
$groups = array();
if (!empty($attributes) && is_array($attributes) && !empty($attributes['class'])) {
$groups = explode(";", $attributes['class']);
if (!empty($attributes) && is_array($attributes) && (!empty($attributes['class']) || !empty($attributes['class_int']))) {
/* Some RADIUS servers return multiple class attributes, so check them all. */
$groups = array();
if (!empty($attributes['class']) && is_array($attributes['class'])) {
foreach ($attributes['class'] as $class) {
$groups = array_unique(array_merge($groups, explode(";", $class)));
}
}
foreach ($groups as & $grp) {
$grp = trim($grp);
if (strtolower(substr($grp, 0, 3)) == "ou=") {

5
src/etc/inc/radius.inc
View File

@ -480,7 +480,10 @@ class Auth_RADIUS extends PEAR {
break;
case RADIUS_CLASS:
$this->attributes['class'] = radius_cvt_string($data);
if (!array($this->attributes['class'])) {
$this->attributes['class'] = array();
}
$this->attributes['class'][] = radius_cvt_string($data);
break;
case RADIUS_FRAMED_PROTOCOL: