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

Merge pull request #17431 from johkoenig/bugfix/17377/trusted_domain_helper_case_insensitive 

make TrustedDomainHelper case insensitive
This commit is contained in:
Roeland Jago Douma 2019-10-08 08:51:11 +02:00 committed by GitHub
parent f2d44b87bb 2df8d646c1
commit 075a0b24d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Security/TrustedDomainHelper.php
View File

@ -90,7 +90,7 @@ class TrustedDomainHelper {
if (gettype($trusted) !== 'string') {
break;
}
$regex = '/^' . implode('[-\.a-zA-Z0-9]*', array_map(function($v) { return preg_quote($v, '/'); }, explode('*', $trusted))) . '$/';
$regex = '/^' . implode('[-\.a-zA-Z0-9]*', array_map(function($v) { return preg_quote($v, '/'); }, explode('*', $trusted))) . '$/i';
if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
return true;
}

5
tests/lib/Security/TrustedDomainHelperTest.php
View File

@ -54,6 +54,8 @@ class TrustedDomainHelperTest extends \Test\TestCase {
'cen*ter',
'*.leadingwith.port:123',
'trailingwith.port*:456',
'UPPERCASE.DOMAIN',
'lowercase.domain',
];
return [
// empty defaults to false with 8.1
@ -106,6 +108,9 @@ class TrustedDomainHelperTest extends \Test\TestCase {
[$trustedHostTestList, '-bad', false],
[$trustedHostTestList, '-bad.leading.host', false],
[$trustedHostTestList, 'bad..der.leading.host', false],
// case sensitivity
[$trustedHostTestList, 'uppercase.domain', true],
[$trustedHostTestList, 'LOWERCASE.DOMAIN', true],
];
}
}