tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LdapUserGroupBackend: Log what the ambiguity check does

This commit is contained in:
Johannes Meyer 2018-10-02 11:46:25 +02:00
parent b3e0b5d587
commit 3c69a63ce3
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
View File

@ -466,15 +466,41 @@ class LdapUserGroupBackend extends LdapRepository implements Inspectable, UserGr
);
}
$sampleValue = $this->ds
$sampleValues = $this->ds
->select()
->from($this->groupClass, array($this->groupMemberAttribute))
->where($this->groupMemberAttribute, '*')
->limit(Logger::getInstance()->getLevel() === Logger::DEBUG ? 3 : 1)
->setUnfoldAttribute($this->groupMemberAttribute)
->setBase($this->groupBaseDn)
->fetchOne();
->fetchAll();
$this->ambiguousMemberAttribute = ! LdapUtils::isDn($sampleValue);
Logger::debug('Ambiguity query returned %d results', count($sampleValues));
$i = 0;
$sampleValue = null;
foreach ($sampleValues as $key => $value) {
if ($sampleValue === null) {
$sampleValue = $value;
}
Logger::debug('Result %d: %s (%s)', ++$i, $value, $key);
}
if (is_object($sampleValue) && isset($sampleValue->{$this->groupMemberAttribute})) {
$this->ambiguousMemberAttribute = ! LdapUtils::isDn($sampleValue->{$this->groupMemberAttribute});
Logger::debug(
'Ambiguity check came to the conclusion that the member attribute %s ambiguous. Tested sample: %s',
$this->ambiguousMemberAttribute ? 'is' : 'is not',
$sampleValue->{$this->groupMemberAttribute}
);
} else {
Logger::warning(
'Ambiguity query returned zero or invalid results. Sample value is `%s`',
print_r($sampleValue, true)
);
}
}
return $this->ambiguousMemberAttribute;