extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-09 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

ignore exception, do not try to match id, if pattern is no valid GUID for AD

Browse Source
This commit is contained in:
Ralf Becker 2019-03-10 10:04:51 +01:00
parent bf51083891
commit bec78c475a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/Contacts/Ads.php
View File

@ -150,6 +150,7 @@ class Ads extends Ldap
* Return LDAP filter for contact id * Return LDAP filter for contact id
* *
* @param string $contact_id * @param string $contact_id
* @throws Api\Exception\AssertionFailed if $contact_id is no valid GUID
* @return string * @return string
*/ */
protected function id_filter($contact_id) protected function id_filter($contact_id)

9
api/src/Contacts/Ldap.php
View File

@ -382,6 +382,7 @@ class Ldap
* Return LDAP filter for (multiple) contact ids * Return LDAP filter for (multiple) contact ids
* *
* @param array|string $ids * @param array|string $ids
* @throws Api\Exception\AssertionFailed if $contact_id is no valid GUID (for ADS!)
* @return string * @return string
*/ */
protected function ids_filter($ids) protected function ids_filter($ids)
@ -809,7 +810,13 @@ class Ldap
{ {
if (in_array($egwSearchKey, array('id','contact_id'))) if (in_array($egwSearchKey, array('id','contact_id')))
{ {
$searchFilter .= $this->ids_filter($searchValue); try {
$searchFilter .= $this->ids_filter($searchValue);
}
// catch and ignore exception caused by id not being a valid GUID
catch(Api\Exception\AssertionFailed $e) {
unset($e);
}
continue; continue;
} }
foreach($this->schema2egw as $mapping) foreach($this->schema2egw as $mapping)