Skip to content

Restrict sharing user enumeration to groups #19569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 10 commits into from
Mar 20, 2020
Merged

Restrict sharing user enumeration to groups #19569

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
381decc
Add setting to restrict user enumeration to groups
juliusknorr Feb 18, 2020
87393a7
Remove unused properties in ShareesAPIController
juliusknorr Feb 18, 2020
c97ab39
Limit user search in Collaborators plugins
juliusknorr Feb 18, 2020
49e7576
Limit enumeration in contacts store
juliusknorr Feb 18, 2020
8edc824
Expose enumeration config though share manager
juliusknorr Feb 20, 2020
0fa897f
Limit enumeration in principal search
juliusknorr Feb 20, 2020
78beb9e
Add tests for user group enumeration limit
juliusknorr Feb 20, 2020
0ef53eb
Add tests for ContactsStore filtering
juliusknorr Mar 10, 2020
ae4dc34
Return empty system addressbook since we cannot easily limit it to gr…
juliusknorr Mar 10, 2020
47271e5
Fix tests due to config adjustments
juliusknorr Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Expose enumeration config though share manager 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
  • Loading branch information
@juliusknorr
juliusknorr committed Mar 20, 2020
commit 8edc824526570fcfbd0b5f48606015ba0ae2b81b
9 changes: 9 additions & 0 deletions lib/private/Share20/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1764,6 +1764,15 @@ public function allowGroupSharing() {
return $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes';
}

public function allowEnumeration(): bool {
return $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
}

public function limitEnumerationToGroups(): bool {
return $this->allowEnumeration() &&
$this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
}

/**
* Copied from \OC_Util::isSharingDisabledForUser
*
Expand Down
16 changes: 16 additions & 0 deletions lib/public/Share/IManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,22 @@ public function shareWithGroupMembersOnly();
*/
public function allowGroupSharing();

/**
* Check if user enumeration is allowed
*
* @return bool
* @since 19.0.0
*/
public function allowEnumeration(): bool;

/**
* Check if user enumeration is limited to the users groups
*
* @return bool
* @since 19.0.0
*/
public function limitEnumerationToGroups(): bool;

/**
* Check if sharing is disabled for the given user
*
Expand Down