diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2022-04-13 10:52:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-13 10:52:38 +0300 |
| commit | cd95fce105fe5f0e71b1bcac7685464f936b9749 (patch) | |
| tree | 5fd674310f9dfa14c711a43ffbb8d6dcf545ac75 /lib | |
| parent | 02e5001646b3a006fbc9073f6c50110dfa20cb85 (diff) | |
| parent | 37f1c8640eef8230489df2cae886ff8cb236e9b7 (diff) | |
Merge pull request #31932 from nextcloud/feat/ignore_second_dn
Add settings to ignore second display name in search
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Collaboration/Collaborators/UserPlugin.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/Collaboration/Collaborators/UserPlugin.php b/lib/private/Collaboration/Collaborators/UserPlugin.php index 4d8bc4cbf3a..af4d8b2ccca 100644 --- a/lib/private/Collaboration/Collaborators/UserPlugin.php +++ b/lib/private/Collaboration/Collaborators/UserPlugin.php @@ -56,6 +56,8 @@ class UserPlugin implements ISearchPlugin { protected $shareeEnumerationFullMatch; /* @var bool */ protected $shareeEnumerationFullMatchUserId; + /* @var bool */ + protected $shareeEnumerationFullMatchIgnoreSecondDisplayName; /** @var IConfig */ private $config; @@ -90,6 +92,7 @@ class UserPlugin implements ISearchPlugin { $this->shareeEnumerationPhone = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_phone', 'no') === 'yes'; $this->shareeEnumerationFullMatch = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match', 'yes') === 'yes'; $this->shareeEnumerationFullMatchUserId = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes') === 'yes'; + $this->shareeEnumerationFullMatchIgnoreSecondDisplayName = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name', 'no') === 'yes'; } public function search($search, $limit, $offset, ISearchResult $searchResult) { @@ -181,6 +184,7 @@ class UserPlugin implements ISearchPlugin { $this->shareeEnumerationFullMatch && $lowerSearch !== '' && (strtolower($uid) === $lowerSearch || strtolower($userDisplayName) === $lowerSearch || + ($this->shareeEnumerationFullMatchIgnoreSecondDisplayName && trim(strtolower(preg_replace('/ \(.*\)$/', '', $userDisplayName))) === $lowerSearch) || strtolower($userEmail ?? '') === $lowerSearch) ) { if (strtolower($uid) === $lowerSearch) { |