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

Automatically strip unnecessary parentheses from custom ldap filters 

fixes #9348
This commit is contained in:
Johannes Meyer 2015-06-23 10:32:45 +02:00
parent 67e31c730a
commit 15220da645
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
application/forms/Config/UserBackend/LdapBackendForm.php
View File

@ -99,8 +99,8 @@ class LdapBackendForm extends Form
. 'Leave empty to not to use any additional filter rules.'
),
'requirement' => $this->translate(
'The filter needs to be expressed as standard LDAP expression, without'
. ' outer parentheses. (e.g. &(foo=bar)(bar=foo) or foo=bar)'
'The filter needs to be expressed as standard LDAP expression.'
. ' (e.g. &(foo=bar)(bar=foo) or foo=bar)'
),
'validators' => array(
array(
@ -108,10 +108,15 @@ class LdapBackendForm extends Form
false,
array(
'callback' => function ($v) {
return strpos($v, '(') !== 0;
// This is not meant to be a full syntax check. It will just
// ensure that we can safely strip unnecessary parentheses.
$v = trim($v);
return ! $v || $v[0] !== '(' || (
strpos($v, ')(') !== false ? substr($v, -2) === '))' : substr($v, -1) === ')'
);
},
'messages' => array(
'callbackValue' => $this->translate('The filter must not be wrapped in parantheses.')
'callbackValue' => $this->translate('The filter is invalid. Please check your syntax.')
)
)
)

4
library/Icinga/Authentication/User/LdapUserBackend.php
View File

@ -148,6 +148,10 @@ class LdapUserBackend extends LdapRepository implements UserBackendInterface
public function setFilter($filter)
{
if (($filter = trim($filter))) {
if ($filter[0] === '(') {
$filter = substr($filter, 1, -1);
}
$this->filter = $filter;
}

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

@ -356,6 +356,10 @@ class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBacken
public function setUserFilter($filter)
{
if (($filter = trim($filter))) {
if ($filter[0] === '(') {
$filter = substr($filter, 1, -1);
}
$this->userFilter = $filter;
}