Skip to content

fix(UserPlugin): Don't return mail matches on user id search #61981

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

Open
DerDreschner wants to merge 1 commit into
base: master
Choose a base branch
from
+38 −1
Open

fix(UserPlugin): Don't return mail matches on user id search #61981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 34 additions & 0 deletions build/integration/sharees_features/sharees.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,40 @@ Feature: sharees
And "exact emails" sharees returned is empty
And "emails" sharees returned is empty

Scenario: Search user by system e-mail address with e-mail full match disabled
Given As an "test"
And parameter "shareapi_restrict_user_enumeration_full_match_email" of app "core" is set to "no"
When getting sharees for
| search | sharee2@system.com |
| itemType | file |
| shareType | 0 |
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And "exact users" sharees returned is empty
# With enumeration allowed the user is still found as non-exact match, as
# enumeration also searches in the e-mail address
And "users" sharees returned are
| Sharee2 | 0 | Sharee2 | sharee2@system.com |
And "exact emails" sharees returned is empty
And "emails" sharees returned is empty

Scenario: Search user by system e-mail address with e-mail full match and user enumeration disabled
Given As an "test"
And parameter "shareapi_restrict_user_enumeration_full_match_email" of app "core" is set to "no"
And parameter "shareapi_allow_share_dialog_user_enumeration" of app "core" is set to "no"
When getting sharees for
| search | sharee2@system.com |
| itemType | file |
| shareType | 0 |
Then the OCS status code should be "100"
And the HTTP status code should be "200"
# The user id full match must not resolve e-mail addresses through the user
# backends (login via e-mail address)
And "exact users" sharees returned is empty
And "users" sharees returned is empty
And "exact emails" sharees returned is empty
And "emails" sharees returned is empty

Scenario: Search e-mail
Given As an "test"
When getting sharees for
Expand Down
5 changes: 4 additions & 1 deletion lib/private/Collaboration/Collaborators/UserPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,10 @@ public function search($search, $limit, $offset, ISearchResult $searchResult): b

if ($shareeEnumerationFullMatchUserId) {
$user = $this->userManager->get($search);
if ($user !== null) {
// User backends may also resolve email addresses or other login names here
// (e.g. for login via email). Only an actual user id match counts as user id
// full match, everything else is governed by the email setting below.
if ($user !== null && mb_strtolower($user->getUID()) === $lowerSearch) {
$users[$user->getUID()] = ['exact', $user];
}
}
Expand Down
Loading