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

use a consistent default value for sharing.maxAutocompleteResults 

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2020-12-12 00:25:10 +01:00
parent 2b017b704a
commit d8ad4ef6b5
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
9 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/dav/lib/Connector/Sabre/Principal.php
View File

@ -39,6 +39,7 @@ use OCA\DAV\CalDAV\Proxy\ProxyMapper;
use OCA\DAV\Traits\PrincipalProxyTrait;
use OCP\App\IAppManager;
use OCP\AppFramework\QueryException;
use OCP\Constants;
use OCP\IConfig;
use OCP\IGroupManager;
use OCP\IUser;
@ -270,7 +271,10 @@ class Principal implements BackendInterface {
}
}
$searchLimit = $this->config->getSystemValue('sharing.maxAutocompleteResults', null);
$searchLimit = $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT);
if ($searchLimit <= 0) {
$searchLimit = null;
}
foreach ($searchProperties as $prop => $value) {
switch ($prop) {
case '{http://sabredav.org/ns}email-address':

6
apps/dav/lib/DAV/GroupPrincipalBackend.php
View File

@ -27,6 +27,7 @@
namespace OCA\DAV\DAV;
use OCP\Constants;
use OCP\IConfig;
use OCP\IGroup;
use OCP\IGroupManager;
@ -212,7 +213,10 @@ class GroupPrincipalBackend implements BackendInterface {
$restrictGroups = $this->groupManager->getUserGroupIds($user);
}
$searchLimit = $this->config->getSystemValue('sharing.maxAutocompleteResults', null);
$searchLimit = $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT);
if ($searchLimit <= 0) {
$searchLimit = null;
}
foreach ($searchProperties as $prop => $value) {
switch ($prop) {
case '{DAV:}displayname':

3
apps/files_sharing/lib/Controller/ShareesAPIController.php
View File

@ -36,6 +36,7 @@ declare(strict_types=1);
namespace OCA\Files_Sharing\Controller;
use OCP\Constants;
use function array_slice;
use function array_values;
use Generator;
@ -148,7 +149,7 @@ class ShareesAPIController extends OCSController {
}
// never return more than the max. number of results configured in the config.php
$maxResults = (int)$this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
$maxResults = $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT);
if ($maxResults > 0) {
$perPage = min($perPage, $maxResults);
}

2
apps/files_sharing/src/services/ConfigService.js
View File

@ -248,7 +248,7 @@ export default class Config {
* @memberof Config
*/
get maxAutocompleteResults() {
return parseInt(OC.config['sharing.maxAutocompleteResults'], 10) || 200
return parseInt(OC.config['sharing.maxAutocompleteResults'], 10) || 25
}
/**

13
config/config.sample.php
View File

@ -1410,10 +1410,17 @@ $CONFIG = [
'sharing.managerFactory' => '\OC\Share20\ProviderFactory',
/**
* Define max number of results returned by the user search for auto-completion
* Default is unlimited (value set to 0).
* Define max number of results returned by the search for auto-completion of
* users, groups, etc. The value must not be lower than 0 (for unlimited).
*
* If more, different sources are requested (e.g. different user backends; or
* both users and groups), the value is applied per source and might not be
* truncated after collecting the results. I.e. more results can appear than
* configured here.
*
* Default is 25.
*/
'sharing.maxAutocompleteResults' => 0,
'sharing.maxAutocompleteResults' => 25,
/**
* Define the minimum length of the search string before we start auto-completion

3
lib/private/Contacts/ContactsMenu/Manager.php
View File

@ -27,6 +27,7 @@
namespace OC\Contacts\ContactsMenu;
use OCP\App\IAppManager;
use OCP\Constants;
use OCP\Contacts\ContactsMenu\IEntry;
use OCP\IConfig;
use OCP\IUser;
@ -63,7 +64,7 @@ class Manager {
* @return array
*/
public function getEntries(IUser $user, $filter) {
$maxAutocompleteResults = $this->config->getSystemValueInt('sharing.maxAutocompleteResults', 25);
$maxAutocompleteResults = max(0, $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT));
$minSearchStringLength = $this->config->getSystemValueInt('sharing.minSearchStringLength', 0);
$topEntries = [];
if (strlen($filter) >= $minSearchStringLength) {

5
lib/private/Template/JSConfigHelper.php
View File

@ -33,6 +33,7 @@ namespace OC\Template;
use bantu\IniGetWrapper\IniGetWrapper;
use OC\CapabilitiesManager;
use OCP\App\IAppManager;
use OCP\Constants;
use OCP\Defaults;
use OCP\IConfig;
use OCP\IGroupManager;
@ -189,8 +190,8 @@ class JSConfigHelper {
'enable_avatars' => true, // here for legacy reasons - to not crash existing code that relies on this value
'lost_password_link' => $this->config->getSystemValue('lost_password_link', null),
'modRewriteWorking' => $this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true',
'sharing.maxAutocompleteResults' => (int)$this->config->getSystemValue('sharing.maxAutocompleteResults', 0),
'sharing.minSearchStringLength' => (int)$this->config->getSystemValue('sharing.minSearchStringLength', 0),
'sharing.maxAutocompleteResults' => max(0, $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT)),
'sharing.minSearchStringLength' => $this->config->getSystemValueInt('sharing.minSearchStringLength', 0),
'blacklist_files_regex' => \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX,
];

6
lib/public/Constants.php
View File

@ -52,4 +52,10 @@ class Constants {
* longer support windows as server platform.
*/
public const FILENAME_INVALID_CHARS = "\\/";
/**
* @since 21.0.0 – default value for autocomplete/search results limit,
* cf. sharing.maxAutocompleteResults in config.sample.php.
*/
public const SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT = 25;
}

7
tests/lib/Contacts/ContactsMenu/ManagerTest.php
View File

@ -28,6 +28,7 @@ use OC\Contacts\ContactsMenu\ActionProviderStore;
use OC\Contacts\ContactsMenu\ContactsStore;
use OC\Contacts\ContactsMenu\Manager;
use OCP\App\IAppManager;
use OCP\Constants;
use OCP\Contacts\ContactsMenu\IEntry;
use OCP\Contacts\ContactsMenu\IProvider;
use OCP\IConfig;
@ -82,7 +83,7 @@ class ManagerTest extends TestCase {
$this->config->expects($this->at(0))
->method('getSystemValueInt')
->with('sharing.maxAutocompleteResults', 25)
->with('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT)
->willReturn(25);
$this->config->expects($this->at(1))
->method('getSystemValueInt')
@ -120,7 +121,7 @@ class ManagerTest extends TestCase {
$this->config->expects($this->at(0))
->method('getSystemValueInt')
->with('sharing.maxAutocompleteResults', 25)
->with('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT)
->willReturn(3);
$this->config->expects($this->at(1))
->method('getSystemValueInt')
@ -157,7 +158,7 @@ class ManagerTest extends TestCase {
$this->config->expects($this->at(0))
->method('getSystemValueInt')
->with('sharing.maxAutocompleteResults', 25)
->with('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT)
->willReturn(3);
$this->config->expects($this->at(1))
->method('getSystemValueInt')