mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7467 from nextcloud/update-user-agent-regex-stable11 

allow 'Nextcloud' in the user agent string of Android
This commit is contained in:
Björn Schießle 2017-12-12 18:07:14 +01:00 committed by GitHub
parent f364660ad7 69d155b469
commit 1bdb2608a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/dav/tests/unit/Connector/Sabre/AuthTest.php
View File

@ -301,7 +301,7 @@ class AuthTest extends TestCase {
->method('isUserAgent')
->with([
'/^Mozilla\/5\.0 \([A-Za-z ]+\) (mirall|csyncoC)\/.*$/',
'/^Mozilla\/5\.0 \(Android\) ownCloud\-android.*$/',
'/^Mozilla\/5\.0 \(Android\) (ownCloud|Nextcloud)\-android.*$/',
'/^Mozilla\/5\.0 \(iOS\) (ownCloud|Nextcloud)\-iOS.*$/',
])
->willReturn(false);
@ -405,7 +405,7 @@ class AuthTest extends TestCase {
->method('isUserAgent')
->with([
'/^Mozilla\/5\.0 \([A-Za-z ]+\) (mirall|csyncoC)\/.*$/',
'/^Mozilla\/5\.0 \(Android\) ownCloud\-android.*$/',
'/^Mozilla\/5\.0 \(Android\) (ownCloud|Nextcloud)\-android.*$/',
'/^Mozilla\/5\.0 \(iOS\) (ownCloud|Nextcloud)\-iOS.*$/',
])
->willReturn(false);
@ -451,7 +451,7 @@ class AuthTest extends TestCase {
->method('isUserAgent')
->with([
'/^Mozilla\/5\.0 \([A-Za-z ]+\) (mirall|csyncoC)\/.*$/',
'/^Mozilla\/5\.0 \(Android\) ownCloud\-android.*$/',
'/^Mozilla\/5\.0 \(Android\) (ownCloud|Nextcloud)\-android.*$/',
'/^Mozilla\/5\.0 \(iOS\) (ownCloud|Nextcloud)\-iOS.*$/',
])
->willReturn(true);

2
lib/public/IRequest.php
View File

@ -66,7 +66,7 @@ interface IRequest {
/**
* @since 9.1.0
*/
const USER_AGENT_CLIENT_ANDROID = '/^Mozilla\/5\.0 \(Android\) ownCloud\-android.*$/';
const USER_AGENT_CLIENT_ANDROID = '/^Mozilla\/5\.0 \(Android\) (ownCloud|Nextcloud)\-android.*$/';
/**
* @since 9.1.0

14
tests/lib/AppFramework/Http/RequestTest.php
View File

@ -856,6 +856,20 @@ class RequestTest extends \Test\TestCase {
],
false,
],
[
'Mozilla/5.0 (Android) ownCloud-android/2.0.0',
[
Request::USER_AGENT_CLIENT_ANDROID
],
true,
],
[
'Mozilla/5.0 (Android) Nextcloud-android/2.0.0',
[
Request::USER_AGENT_CLIENT_ANDROID
],
true,
],
];
}