886bda5f81
This changeset removes the static class `OC_Request` and moves the functions either into `IRequest` which is accessible via `\OC::$server::->getRequest()` or into a separated `TrustedDomainHelper` class for some helper methods which should not be publicly exposed. This changes only internal methods and nothing on the public API. Some public functions in `util.php` have been deprecated though in favour of the new non-static functions. Unfortunately some part of this code uses things like `__DIR__` and thus is not completely unit-testable. Where tests where possible they ahve been added though. Fixes https://github.com/owncloud/core/issues/13976 which was requested in https://github.com/owncloud/core/pull/13973#issuecomment-73492969
70 lines
2.2 KiB
PHP
70 lines
2.2 KiB
PHP
<?php
|
|
/**
|
|
* Copyright (c) 2015 Lukas Reschke <lukas@owncloud.com>
|
|
* This file is licensed under the Affero General Public License version 3 or
|
|
* later.
|
|
* See the COPYING-README file.
|
|
*/
|
|
|
|
use \OC\Security\TrustedDomainHelper;
|
|
use OCP\IConfig;
|
|
|
|
/**
|
|
* Class TrustedDomainHelperTest
|
|
*/
|
|
class TrustedDomainHelperTest extends \Test\TestCase {
|
|
/** @var IConfig */
|
|
protected $config;
|
|
|
|
protected function setUp() {
|
|
parent::setUp();
|
|
|
|
$this->config = $this->getMockBuilder('\OCP\IConfig')->getMock();
|
|
}
|
|
|
|
/**
|
|
* @dataProvider trustedDomainDataProvider
|
|
* @param string $trustedDomains
|
|
* @param string $testDomain
|
|
* @param bool $result
|
|
*/
|
|
public function testIsTrustedDomain($trustedDomains, $testDomain, $result) {
|
|
$this->config->expects($this->once())
|
|
->method('getSystemValue')
|
|
->with('trusted_domains')
|
|
->will($this->returnValue($trustedDomains));
|
|
|
|
$trustedDomainHelper = new TrustedDomainHelper($this->config);
|
|
$this->assertEquals($result, $trustedDomainHelper->isTrustedDomain($testDomain));
|
|
}
|
|
|
|
/**
|
|
* @return array
|
|
*/
|
|
public function trustedDomainDataProvider() {
|
|
$trustedHostTestList = ['host.one.test', 'host.two.test', '[1fff:0:a88:85a3::ac1f]'];
|
|
return [
|
|
// empty defaults to false with 8.1
|
|
[null, 'host.one.test:8080', false],
|
|
['', 'host.one.test:8080', false],
|
|
[[], 'host.one.test:8080', false],
|
|
// trust list when defined
|
|
[$trustedHostTestList, 'host.two.test:8080', true],
|
|
[$trustedHostTestList, 'host.two.test:9999', true],
|
|
[$trustedHostTestList, 'host.three.test:8080', false],
|
|
[$trustedHostTestList, 'host.two.test:8080:aa:222', false],
|
|
[$trustedHostTestList, '[1fff:0:a88:85a3::ac1f]', true],
|
|
[$trustedHostTestList, '[1fff:0:a88:85a3::ac1f]:801', true],
|
|
[$trustedHostTestList, '[1fff:0:a88:85a3::ac1f]:801:34', false],
|
|
// trust localhost regardless of trust list
|
|
[$trustedHostTestList, 'localhost', true],
|
|
[$trustedHostTestList, 'localhost:8080', true],
|
|
[$trustedHostTestList, '127.0.0.1', true],
|
|
[$trustedHostTestList, '127.0.0.1:8080', true],
|
|
// do not trust invalid localhosts
|
|
[$trustedHostTestList, 'localhost:1:2', false],
|
|
[$trustedHostTestList, 'localhost: evil.host', false],
|
|
];
|
|
}
|
|
|
|
}
|