sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50939 from nextcloud/backport/50053/stable29 

[stable29] fix: Change UserAgent to *cloud
pull/50951/head
John Molakvoæ 2025-02-21 12:34:00 +07:00 committed by GitHub
parent e5f8140be3 a49366910b
commit be4cad2cdc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/workflowengine/tests/Check/RequestUserAgentTest.php
Unescape Escape View File

@ -61,45 +61,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],
];
}

2
lib/public/IRequest.php
Unescape Escape View File

@ -108,7 +108,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

2
tests/lib/AppFramework/Http/RequestTest.php
Unescape Escape View File

@ -1160,7 +1160,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',
],