Merge pull request #50941 from nextcloud/backport/50053/stable31

[stable31] fix: Change UserAgent to *cloud

Author: AndyScherzinger

apps/workflowengine/tests/Check/RequestUserAgentTest.php

@@ -42,45 +42,45 @@ public function dataExecuteCheck() {
 			['is', 'android', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', false],
 			['is', 'android', 'Mozilla/5.0 (Linux) mirall/2.2.0', false],
 			['is', 'android', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', false],
-			['is', 'android', 'Mozilla/5.0 (Linux) Nextcloud-Thunderbird v2.2.0', false],
+			['is', 'android', 'Filelink for *cloud/2.2.0', false],
 			['!is', 'android', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', false],
 			['!is', 'android', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', true],
 			['!is', 'android', 'Mozilla/5.0 (Linux) mirall/2.2.0', true],
 			['!is', 'android', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', true],
-			['!is', 'android', 'Mozilla/5.0 (Linux) Nextcloud-Thunderbird v2.2.0', true],
+			['!is', 'android', 'Filelink for *cloud/2.2.0', true],
 
 			['is', 'ios', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', false],
 			['is', 'ios', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', true],
 			['is', 'ios', 'Mozilla/5.0 (Linux) mirall/2.2.0', false],
 			['is', 'ios', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', false],
-			['is', 'ios', 'Mozilla/5.0 (Linux) Nextcloud-Thunderbird v2.2.0', false],
+			['is', 'ios', 'Filelink for *cloud/2.2.0', false],
 			['!is', 'ios', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', true],
 			['!is', 'ios', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', false],
 			['!is', 'ios', 'Mozilla/5.0 (Linux) mirall/2.2.0', true],
 			['!is', 'ios', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', true],
-			['!is', 'ios', 'Mozilla/5.0 (Linux) Nextcloud-Thunderbird v2.2.0', true],
+			['!is', 'ios', 'Filelink for *cloud/2.2.0', true],
 
 			['is', 'desktop', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', false],
 			['is', 'desktop', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', false],
 			['is', 'desktop', 'Mozilla/5.0 (Linux) mirall/2.2.0', true],
 			['is', 'desktop', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', false],
-			['is', 'desktop', 'Mozilla/5.0 (Linux) Nextcloud-Thunderbird v2.2.0', false],
+			['is', 'desktop', 'Filelink for *cloud/2.2.0', false],
 			['!is', 'desktop', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', true],
 			['!is', 'desktop', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', true],
 			['!is', 'desktop', 'Mozilla/5.0 (Linux) mirall/2.2.0', false],
 			['!is', 'desktop', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', true],
-			['!is', 'desktop', 'Mozilla/5.0 (Linux) Nextcloud-Thunderbird v2.2.0', true],
+			['!is', 'desktop', 'Filelink for *cloud/2.2.0', true],
 
 			['is', 'mail', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', false],
 			['is', 'mail', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', false],
 			['is', 'mail', 'Mozilla/5.0 (Linux) mirall/2.2.0', false],
 			['is', 'mail', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', true],
-			['is', 'mail', 'Mozilla/5.0 (Linux) Nextcloud-Thunderbird v2.2.0', true],
+			['is', 'mail', 'Filelink for *cloud/2.2.0', true],
 			['!is', 'mail', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', true],
 			['!is', 'mail', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', true],
 			['!is', 'mail', 'Mozilla/5.0 (Linux) mirall/2.2.0', true],
 			['!is', 'mail', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', false],
-			['!is', 'mail', 'Mozilla/5.0 (Linux) Nextcloud-Thunderbird v2.2.0', false],
+			['!is', 'mail', 'Filelink for *cloud/2.2.0', false],
 		];
 	}
 

lib/public/IRequest.php

@@ -84,7 +84,7 @@ interface IRequest {
 	 * @since 13.0.1
 	 * @since 28.0.0 The regex has a group matching the version number
 	 */
-	public const USER_AGENT_THUNDERBIRD_ADDON = '/^Mozilla\/5\.0 \([A-Za-z ]+\) Nextcloud\-Thunderbird v([^ ]*).*$/';
+	public const USER_AGENT_THUNDERBIRD_ADDON = '/^Filelink for \*cloud\/([1-9]\d*\.\d+\.\d+)$/';
 
 	/**
 	 * @since 26.0.0

tests/lib/AppFramework/Http/RequestTest.php

@@ -1155,7 +1155,7 @@ public function dataMatchClientVersion(): array {
 				'1.0.0',
 			],
 			[
-				'Mozilla/5.0 (Linux) Nextcloud-Thunderbird v1.0.0',
+				'Filelink for *cloud/1.0.0',
 				Request::USER_AGENT_THUNDERBIRD_ADDON,
 				'1.0.0',
 			],