mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove logging message carrying no valuable information 

the exception caught is not an error, but due to valid configuration and
code flow is expecting this. For an admin it is confusing, and it carries
no information worth for debugging.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2020-08-12 09:10:23 +02:00 committed by backportbot[bot]
parent 8ffc3c0de6
commit f32b1e4856
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/user_ldap/lib/Access.php
View File

@ -46,6 +46,7 @@
namespace OCA\User_LDAP; namespace OCA\User_LDAP;
use DomainException;
use OC\HintException; use OC\HintException;
use OC\Hooks\PublicEmitter; use OC\Hooks\PublicEmitter;
use OC\ServerNotAvailableException; use OC\ServerNotAvailableException;
@ -1518,11 +1519,11 @@ class Access extends LDAPUtility {
* @param string[] $searchAttributes needs to have at least two attributes, * @param string[] $searchAttributes needs to have at least two attributes,
* otherwise it does not make sense :) * otherwise it does not make sense :)
* @return string the final filter part to use in LDAP searches * @return string the final filter part to use in LDAP searches
* @throws \Exception * @throws DomainException
*/ */
private function getAdvancedFilterPartForSearch($search, $searchAttributes) { private function getAdvancedFilterPartForSearch($search, $searchAttributes) {
if (!is_array($searchAttributes) || count($searchAttributes) < 2) { if (!is_array($searchAttributes) || count($searchAttributes) < 2) {
throw new \Exception('searchAttributes must be an array with at least two string'); throw new DomainException('searchAttributes must be an array with at least two string');
} }
$searchWords = explode(' ', trim($search)); $searchWords = explode(' ', trim($search));
$wordFilters = []; $wordFilters = [];
@ -1553,12 +1554,8 @@ class Access extends LDAPUtility {
if ($haveMultiSearchAttributes && strpos(trim($search), ' ') !== false) { if ($haveMultiSearchAttributes && strpos(trim($search), ' ') !== false) {
try { try {
return $this->getAdvancedFilterPartForSearch($search, $searchAttributes); return $this->getAdvancedFilterPartForSearch($search, $searchAttributes);
} catch (\Exception $e) { } catch (DomainException $e) {
\OCP\Util::writeLog( // Creating advanced filter for search failed, falling back to simple method. Edge case, but valid.
'user_ldap',
'Creating advanced filter for search failed, falling back to simple method.',
ILogger::INFO
);
} }
} }