aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Endres <je@johannes-endres.de>2025-01-01 19:44:49 +0100
committerAndy Scherzinger <info@andy-scherzinger.de>2025-02-19 18:51:08 +0100
commitae2cc23658dd3882a4831f292303a911530fb1b3 (patch)
tree30deef2955ff9152c1229d265512f61343ff0a63
parentbdc043dd041f3e9db40fdf66dc7d05400971f1a5 (diff)
downloadnextcloud-server-ae2cc23658dd3882a4831f292303a911530fb1b3.tar.gz
nextcloud-server-ae2cc23658dd3882a4831f292303a911530fb1b3.zip
fix: Change UserAgent to *cloudfix/noid/thudnerbird-addon-useragent
Co-authored-by: Daniel Kesselberg <mail@danielkesselberg.de> Signed-off-by: Johannes Endres <je@johannes-endres.de>
-rw-r--r--apps/workflowengine/tests/Check/RequestUserAgentTest.php16
-rw-r--r--lib/public/IRequest.php2
-rw-r--r--tests/lib/AppFramework/Http/RequestTest.php2
3 files changed, 10 insertions, 10 deletions
diff --git a/apps/workflowengine/tests/Check/RequestUserAgentTest.php b/apps/workflowengine/tests/Check/RequestUserAgentTest.php
index cc5cf3209b3..30e389c8236 100644
--- a/apps/workflowengine/tests/Check/RequestUserAgentTest.php
+++ b/apps/workflowengine/tests/Check/RequestUserAgentTest.php
@@ -42,45 +42,45 @@ class RequestUserAgentTest extends TestCase {
['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],
];
}
diff --git a/lib/public/IRequest.php b/lib/public/IRequest.php
index dedff769f77..2639a234ad5 100644
--- a/lib/public/IRequest.php
+++ b/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
diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php
index 1c7f07580cc..fe3614ab88e 100644
--- a/tests/lib/AppFramework/Http/RequestTest.php
+++ b/tests/lib/AppFramework/Http/RequestTest.php
@@ -1155,7 +1155,7 @@ class RequestTest extends \Test\TestCase {
'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',
],