Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-08-11 02:11:21 +02:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

Trusted domain wildcard checking made shorter, supporting multiple *

Browse Source 
Added test cases
This commit is contained in:
Johannes Ernst 2016-07-06 23:38:30 +00:00
parent 3516b58be6
commit 2b4ceae620
2 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ class TrustedDomainHelper {
// Read trusted domains from config
$trustedList = $this->config->getSystemValue('trusted_domains', []);
if(!is_array($trustedList)) {
if (!is_array($trustedList)) {
return false;
}
@ -79,39 +79,15 @@ class TrustedDomainHelper {
return true;
}
// Compare with port appended
if(in_array($domainWithPort, $trustedList, true)) {
return true;
}
if(in_array($domain, $trustedList, true)) {
return true;
}
// If a value contains a *, apply glob-style matching. Any second * is ignored.
foreach ($trustedList as $trusted) {
if($trusted === '*') {
// match, allowing for * wildcards
foreach ($trustedList as $trusted) {
if (gettype($trusted) !== 'string') {
break;
}
$regex = '/^' . join('.*', array_map(function($v) { return preg_quote($v, '/'); }, explode('*', $trusted))) . '$/';
if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
return true;
}
$star = strpos($trusted, '*');
if($star === false) {
break;
}
if($star === 0) {
if(strrpos($domain, substr($trusted, 1)) !== false) {
return true;
}
} elseif($star === strlen($trusted)-1) {
if(strpos($domain, substr($trusted, 0, strlen($trusted)-1 )) !== false) {
return true;
}
} else {
if(strpos($domain, substr($trusted, 0, $star)) !== false
&& strrpos($domain, substr($trusted, $star+1 ), -strlen($trusted-$star-1)) !== false )
{
return true;
}
}
}
return false;
}

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

@ -49,6 +49,11 @@ class TrustedDomainHelperTest extends \Test\TestCase {
'host.two.test',
'[1fff:0:a88:85a3::ac1f]',
'host.three.test:443',
'*.leading.host',
'trailing.host*',
'cen*ter',
'*.leadingwith.port:123',
'trailingwith.port*:456',
];
return [
// empty defaults to false with 8.1
@ -76,7 +81,27 @@ class TrustedDomainHelperTest extends \Test\TestCase {
[$trustedHostTestList, 'localhost: evil.host', false],
// do not trust casting
[[1], '1', false],
// leading *
[$trustedHostTestList, 'abc.leading.host', true],
[$trustedHostTestList, 'abc.def.leading.host', true],
[$trustedHostTestList, 'abc.def.leading.host.another', false],
[$trustedHostTestList, 'abc.def.leading.host:123', true],
[$trustedHostTestList, 'leading.host', false],
// trailing *
[$trustedHostTestList, 'trailing.host', true],
[$trustedHostTestList, 'trailing.host.abc', true],
[$trustedHostTestList, 'trailing.host.abc.def', true],
[$trustedHostTestList, 'trailing.host.abc:123', true],
[$trustedHostTestList, 'another.trailing.host', false],
// center *
[$trustedHostTestList, 'center', true],
[$trustedHostTestList, 'cenxxxter', true],
[$trustedHostTestList, 'cen.x.y.ter', true],
// with port
[$trustedHostTestList, 'abc.leadingwith.port:123', true],
[$trustedHostTestList, 'abc.leadingwith.port:1234', false],
[$trustedHostTestList, 'trailingwith.port.abc:456', true],
[$trustedHostTestList, 'trailingwith.port.abc:123', false],
];
}
}