Merge branch 'stable2.2' into backport/8611/stable2.2

.github/workflows/test.yml

@@ -80,7 +80,7 @@ jobs:
       name: php${{ matrix.php-versions }}-${{ matrix.db }} integration tests
       services:
           mail-service:
-              image: christophwurst/imap-devel
+              image: ghcr.io/christophwurst/docker-imap-devel:latest
               env:
                   MAILNAME: mail.domain.tld
                   MAIL_ADDRESS: [email protected]

composer.json

@@ -45,7 +45,7 @@
 		"youthweb/urllinker": "^1.3"
 	},
 	"require-dev": {
-		"christophwurst/nextcloud": "^21.0.0",
+		"nextcloud/ocp": "^21.0.0",
 		"psalm/phar": "^4.6",
 		"roave/security-advisories": "dev-master"
 	},

lib/Controller/AutoConfigController.php

@@ -34,6 +34,7 @@
 use OCA\Mail\Validation\RemoteHostValidator;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\UserRateLimit;
 use OCP\IRequest;
 use function in_array;
 
@@ -60,9 +61,11 @@ public function __construct(IRequest $request,
 	 *
 	 * @NoAdminRequired
 	 * @TrapError
+	 * @UserRateThrottle(limit: 5, period: 60)
 	 *
 	 * @return JsonResponse
 	 */
+	#[UserRateLimit(limit: 5, period: 60)]
 	public function queryIspdb(string $email): JsonResponse {
 		$rfc822Address = new Horde_Mail_Rfc822_Address($email);
 		if (!$rfc822Address->valid || !$this->hostValidator->isValid($rfc822Address->host)) {
@@ -78,9 +81,11 @@ public function queryIspdb(string $email): JsonResponse {
 	 *
 	 * @NoAdminRequired
 	 * @TrapError
+	 * @UserRateThrottle(limit: 5, period: 60)
 	 *
 	 * @return JsonResponse
 	 */
+	#[UserRateLimit(limit: 5, period: 60)]
 	public function queryMx(string $email): JsonResponse {
 		$rfc822Address = new Horde_Mail_Rfc822_Address($email);
 		if (!$rfc822Address->valid || !$this->hostValidator->isValid($rfc822Address->host)) {
@@ -98,9 +103,11 @@ public function queryMx(string $email): JsonResponse {
 	 *
 	 * @NoAdminRequired
 	 * @TrapError
+	 * @UserRateThrottle(limit: 10, period: 60)
 	 *
 	 * @return JsonResponse
 	 */
+	#[UserRateLimit(limit: 10, period: 60)]
 	public function testConnectivity(string $host, int $port): JsonResponse {
 		if (!in_array($port, [143, 993, 465, 587])) {
 			return JsonResponse::fail('Port not allowed');

lib/Service/ContactsIntegration.php

@@ -72,7 +72,7 @@ public function getMatchingRecipient(string $userId, string $term): array {
 		$shareeEnumerationFullMatchUserId = $shareeEnumerationFullMatch && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes') === 'yes';
 		$shareeEnumerationFullMatchEmail = $shareeEnumerationFullMatch && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes') === 'yes';
 
-		$result = $this->contactsManager->search($term, ['UID', 'FN', 'EMAIL'], ['enumeration' => $shareeEnumeration]);
+		$result = $this->contactsManager->search($term, ['UID', 'FN', 'EMAIL'], ['enumeration' => $shareeEnumeration, 'fullmatch' => $shareeEnumerationFullMatch]);
 		if (empty($result)) {
 			return [];
 		}
@@ -118,18 +118,25 @@ public function getMatchingRecipient(string $userId, string $term): array {
 					continue;
 				}
 				$lowerTerm = strtolower($term);
-				if (!$isSystemUser || $isInSameGroup || ($lowerTerm !== '' && (
-					($shareeEnumerationFullMatch && !empty($fn) && $lowerTerm === strtolower($fn)) ||
-					($shareeEnumerationFullMatchUserId && $lowerTerm === strtolower($id)) ||
-					($shareeEnumerationFullMatchEmail && $lowerTerm === strtolower($e))))) {
-					$receivers[] = [
-						'id' => $id,
-						// Show full name if possible or fall back to email
-						'label' => (empty($fn) ? $e : "$fn ($e)"),
-						'email' => $e,
-						'photo' => $photo,
-					];
+
+				if ($isSystemUser && $shareeEnumerationInGroupOnly && !$isInSameGroup) {
+					// Check for full match. If full match is disabled, matching results already filtered out
+					if (!($lowerTerm !== '' && (
+						($shareeEnumerationFullMatch && !empty($fn) && $lowerTerm === strtolower($fn)) ||
+						($shareeEnumerationFullMatchUserId && $lowerTerm === strtolower($id)) ||
+						($shareeEnumerationFullMatchEmail && $lowerTerm === strtolower($e))))) {
+						// Not a full Match
+						continue;
+					}
 				}
+
+				$receivers[] = [
+					'id' => $id,
+					// Show full name if possible or fall back to email
+					'label' => (empty($fn) ? $e : "$fn ($e)"),
+					'email' => $e,
+					'photo' => $photo,
+				];
 			}
 		}
 

src/components/AccountForm.vue

@@ -612,6 +612,8 @@ export default {
 						this.feedback = t('mail', 'SMTP connection failed')
 					} else if (error.message === CONSENT_ABORTED) {
 						this.feedback = t('mail', 'Google authorization popup closed')
+					} else if (error.response?.status === 429) {
+						this.feedback = t('mail', 'Configuration discovery temporarily not available. Please try again later.')
 					} else {
 						this.feedback = t('mail', 'There was an error while setting up your account')
 					}

src/components/RecipientBubble.vue

@@ -25,9 +25,9 @@
 			:display-name="label"
 			:avatar-image="avatarUrlAbsolute"
 			@click="onClickOpenContactDialog">
-			<span class="user-bubble-email">{{ email }}</span>
 		</UserBubble>
 		<div class="contact-wrapper">
+			<p class="contact-popover__email">{{ email }}</p>
 			<ButtonVue v-if="contactsWithEmail && contactsWithEmail.length > 0" type="tertiary-no-background" class="contact-existing">
 				<template #icon>
 					<IconDetails :size="20" />
@@ -254,16 +254,17 @@ export default {
 .user-bubble__title {
 	max-width: 30vw;
 }
-.user-bubble-email {
-	margin: 10px;
-}
 
 .contact-menu {
 	display: flex;
 	flex-wrap: wrap;
 }
 .contact-popover {
 	display: inline-block;
+
+	&__email {
+		text-align: center;
+	}
 }
 .contact-wrapper {
 	padding:10px;