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

Merge pull request #23156 from owncloud/add-port-support-to-trusteddomain-stable9 

Explicitly check for port
This commit is contained in:
Thomas Müller 2016-03-14 12:30:58 +01:00
parent dac69225d2 9bc99bb297
commit 5c38c1c845
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/security/trusteddomainhelper.php
View File

@ -78,6 +78,12 @@ class TrustedDomainHelper {
if (preg_match(Request::REGEX_LOCALHOST, $domain) === 1) {
return true;
}
// Compare with port appended
if(in_array($domainWithPort, $trustedList, true)) {
return true;
}
return in_array($domain, $trustedList, true);
}

10
tests/lib/security/trusteddomainhelper.php
View File

@ -42,7 +42,12 @@ class TrustedDomainHelperTest extends \Test\TestCase {
* @return array
*/
public function trustedDomainDataProvider() {
$trustedHostTestList = ['host.one.test', 'host.two.test', '[1fff:0:a88:85a3::ac1f]'];
$trustedHostTestList = [
'host.one.test',
'host.two.test',
'[1fff:0:a88:85a3::ac1f]',
'host.three.test:443',
];
return [
// empty defaults to false with 8.1
[null, 'host.one.test:8080', false],
@ -56,6 +61,9 @@ class TrustedDomainHelperTest extends \Test\TestCase {
[$trustedHostTestList, '[1fff:0:a88:85a3::ac1f]', true],
[$trustedHostTestList, '[1fff:0:a88:85a3::ac1f]:801', true],
[$trustedHostTestList, '[1fff:0:a88:85a3::ac1f]:801:34', false],
[$trustedHostTestList, 'host.three.test:443', true],
[$trustedHostTestList, 'host.three.test:80', false],
[$trustedHostTestList, 'host.three.test', false],
// trust localhost regardless of trust list
[$trustedHostTestList, 'localhost', true],
[$trustedHostTestList, 'localhost:8080', true],