Merge pull request #57675 from nextcloud/backport/57511/stable32

Author: provokateurin

build/integration/collaboration_features/autocomplete.feature

@@ -71,7 +71,6 @@ Feature: autocomplete
     Then get autocomplete for "autocomplete@example.com"
       | id | source |
       | autocomplete | users |
-      | autocomplete | users |
 
   Scenario: getting autocomplete from address book without enumeration
     Given As an "admin"
@@ -96,7 +95,6 @@ Feature: autocomplete
     Then get autocomplete for "autocomplete@example.com"
       | id | source |
       | autocomplete | users |
-      | autocomplete | users |
 
   Scenario: getting autocomplete emails from address book with enumeration
     Given As an "admin"

build/integration/features/bootstrap/ShareesContext.php

@@ -19,10 +19,17 @@ class ShareesContext implements Context, SnippetAcceptingContext {
 	use AppConfiguration;
 
 	protected function resetAppConfigs() {
-		$this->deleteServerConfig('core', 'shareapi_only_share_with_group_members');
-		$this->deleteServerConfig('core', 'shareapi_allow_share_dialog_user_enumeration');
 		$this->deleteServerConfig('core', 'shareapi_allow_group_sharing');
+		$this->deleteServerConfig('core', 'shareapi_allow_share_dialog_user_enumeration');
 		$this->deleteServerConfig('core', 'shareapi_exclude_groups');
 		$this->deleteServerConfig('core', 'shareapi_exclude_groups_list');
+		$this->deleteServerConfig('core', 'shareapi_only_share_with_group_members');
+		$this->deleteServerConfig('core', 'shareapi_only_share_with_group_members_exclude_group_list');
+		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match');
+		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_email');
+		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn');
+		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_userid');
+		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_to_group');
+		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_to_phone');
 	}
 }

build/integration/sharees_features/sharees.feature

@@ -291,8 +291,7 @@ Feature: sharees
       | itemType | file |
     Then the OCS status code should be "100"
     And the HTTP status code should be "200"
-    Then "exact users" sharees returned are
-      | Sharee1 | 0 | Sharee1 | Sharee1 |
+    Then "exact users" sharees returned is empty
     Then "users" sharees returned is empty
     Then "exact groups" sharees returned is empty
     Then "groups" sharees returned is empty
@@ -354,12 +353,9 @@ Feature: sharees
       | shareType | 0 |
     Then the OCS status code should be "100"
     And the HTTP status code should be "200"
-    # UserPlugin provides two identical results (except for the field order, but
-    # that is hidden by the check).
     # MailPlugin does not add a result if there is already one for that user.
     And "exact users" sharees returned are
       | Sharee2 | 0 | Sharee2 | sharee2@system.com |
-      | Sharee2 | 0 | Sharee2 | sharee2@system.com |
     And "users" sharees returned is empty
     And "exact groups" sharees returned is empty
     And "groups" sharees returned is empty
@@ -546,11 +542,8 @@ Feature: sharees
       | shareTypes | 0 4 |
     Then the OCS status code should be "100"
     And the HTTP status code should be "200"
-    # UserPlugin provides two identical results (except for the field order, but
-    # that is hidden by the check)
     And "exact users" sharees returned are
       | Sharee2 | 0 | Sharee2 | sharee2@system.com |
-      | Sharee2 | 0 | Sharee2 | sharee2@system.com |
     And "users" sharees returned is empty
     And "exact groups" sharees returned is empty
     And "groups" sharees returned is empty
@@ -570,11 +563,8 @@ Feature: sharees
       | shareTypes | 0 4 |
     Then the OCS status code should be "100"
     And the HTTP status code should be "200"
-    # UserPlugin provides two identical results (except for the field order, but
-    # that is hidden by the check)
     And "exact users" sharees returned are
       | Sharee2 | 0 | Sharee2 | sharee2@system.com |
-      | Sharee2 | 0 | Sharee2 | sharee2@system.com |
     And "users" sharees returned is empty
     And "exact groups" sharees returned is empty
     And "groups" sharees returned is empty

build/integration/sharees_features/sharees_provisioningapiv2.feature

@@ -189,8 +189,7 @@ Feature: sharees_provisioningapiv2
       | itemType | file |
     Then the OCS status code should be "200"
     And the HTTP status code should be "200"
-    Then "exact users" sharees returned are
-      | Sharee1 | 0 | Sharee1 | Sharee1 |
+    Then "exact users" sharees returned is empty
     Then "users" sharees returned is empty
     Then "exact groups" sharees returned is empty
     Then "groups" sharees returned is empty