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

Merge pull request #20139 from nextcloud/unify-default-value-for-restricting-user-enumeration-with-settings 

Unify default value for restricting user enumeration with settings
This commit is contained in:
Roeland Jago Douma 2020-04-04 10:33:04 +02:00 committed by GitHub
parent 0e53be44d5 4ec370016f
commit 4a292126e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 60 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/lib/CardDAV/SystemAddressbook.php
View File

@ -42,7 +42,7 @@ class SystemAddressbook extends AddressBook {
public function getChildren() {
$shareEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
$restrictShareEnumeration = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'yes') === 'yes';
$restrictShareEnumeration = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
if (!$shareEnumeration || ($shareEnumeration && $restrictShareEnumeration)) {
return [];
}

2
lib/private/Contacts/ContactsMenu/ContactsStore.php
View File

@ -108,7 +108,7 @@ class ContactsStore implements IContactsStore {
array $entries,
$filter) {
$disallowEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') !== 'yes';
$restrictEnumeration = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'yes') === 'yes';
$restrictEnumeration = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
$excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups', 'no') === 'yes';
// whether to filter out local users

44
tests/acceptance/features/bootstrap/SettingsContext.php
View File

@ -46,6 +46,25 @@ class SettingsContext implements Context, ActorAwareInterface {
describedAs("Accept shares by default checkbox input in Sharing section in Personal Sharing Settings");
}
/**
* @return Locator
*/
public static function restrictUsernameAutocompletionToGroupsCheckbox() {
// forThe()->checkbox("Restrict username...") can not be used here; that
// would return the checkbox itself, but the element that the user
// interacts with is the label.
return Locator::forThe()->xpath("//label[normalize-space() = 'Restrict username autocompletion to users within the same groups']")->
describedAs("Restrict username autocompletion to groups checkbox in Sharing section in Administration Sharing Settings");
}
/**
* @return Locator
*/
public static function restrictUsernameAutocompletionToGroupsCheckboxInput() {
return Locator::forThe()->checkbox("Restrict username autocompletion to users within the same groups")->
describedAs("Restrict username autocompletion to groups checkbox input in Sharing section in Administration Sharing Settings");
}
/**
* @return Locator
*/
@ -112,6 +131,15 @@ class SettingsContext implements Context, ActorAwareInterface {
$this->actor->find(self::acceptSharesByDefaultCheckbox(), 2)->click();
}
/**
* @When I enable restricting username autocompletion to groups
*/
public function iEnableRestrictingUsernameAutocompletionToGroups() {
$this->iSeeThatUsernameAutocompletionIsNotRestrictedToGroups();
$this->actor->find(self::restrictUsernameAutocompletionToGroupsCheckbox(), 2)->click();
}
/**
* @When I create the tag :tag in the settings
*/
@ -129,6 +157,22 @@ class SettingsContext implements Context, ActorAwareInterface {
$this->actor->find(self::acceptSharesByDefaultCheckboxInput(), 10)->isChecked());
}
/**
* @Then I see that username autocompletion is restricted to groups
*/
public function iSeeThatUsernameAutocompletionIsRestrictedToGroups() {
PHPUnit_Framework_Assert::assertTrue(
$this->actor->find(self::restrictUsernameAutocompletionToGroupsCheckboxInput(), 10)->isChecked());
}
/**
* @Then I see that username autocompletion is not restricted to groups
*/
public function iSeeThatUsernameAutocompletionIsNotRestrictedToGroups() {
PHPUnit_Framework_Assert::assertFalse(
$this->actor->find(self::restrictUsernameAutocompletionToGroupsCheckboxInput(), 10)->isChecked());
}
/**
* @Then I see that shares are not accepted by default
*/

11
tests/acceptance/features/header.feature
View File

@ -28,6 +28,17 @@ Feature: header
And I see that the contact "user0" in the Contacts menu is shown
And I see that the contact "admin" in the Contacts menu is not shown
Scenario: users from other groups are not seen in the contacts menu when autocompletion is restricted within the same group
Given I am logged in as the admin
And I visit the settings page
And I open the "Sharing" section of the "Administration" group
And I enable restricting username autocompletion to groups
And I see that username autocompletion is restricted to groups
When I open the Contacts menu
Then I see that the Contacts menu is shown
And I see that the contact "user0" in the Contacts menu is not shown
And I see that the contact "admin" in the Contacts menu is not shown
Scenario: just added users are seen in the contacts menu
Given I am logged in as the admin
And I open the User settings

6
tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php
View File

@ -178,7 +178,7 @@ class ContactsStoreTest extends TestCase {
$this->config->expects($this->at(1))
->method('getAppValue')
->with($this->equalTo('core'), $this->equalTo('shareapi_restrict_user_enumeration_to_group'), $this->equalTo('yes'))
->with($this->equalTo('core'), $this->equalTo('shareapi_restrict_user_enumeration_to_group'), $this->equalTo('no'))
->willReturn('no');
$this->config->expects($this->at(2))
@ -234,7 +234,7 @@ class ContactsStoreTest extends TestCase {
->willReturn('yes');
$this->config->expects($this->at(1)) ->method('getAppValue')
->with($this->equalTo('core'), $this->equalTo('shareapi_restrict_user_enumeration_to_group'), $this->equalTo('yes'))
->with($this->equalTo('core'), $this->equalTo('shareapi_restrict_user_enumeration_to_group'), $this->equalTo('no'))
->willReturn('no');
$this->config->expects($this->at(2)) ->method('getAppValue')
@ -320,7 +320,7 @@ class ContactsStoreTest extends TestCase {
->willReturn('yes');
$this->config->expects($this->at(1)) ->method('getAppValue')
->with($this->equalTo('core'), $this->equalTo('shareapi_restrict_user_enumeration_to_group'), $this->equalTo('yes'))
->with($this->equalTo('core'), $this->equalTo('shareapi_restrict_user_enumeration_to_group'), $this->equalTo('no'))
->willReturn('yes');
$this->config->expects($this->at(2)) ->method('getAppValue')