add tests for discovery service

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
Bjoern Schiessle 2017-03-09 16:32:13 +01:00 committed by Roeland Jago Douma
parent 821e287805
commit 0dea31d48b
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 102 additions and 3 deletions

View File

@ -94,7 +94,7 @@ class DiscoveryService implements IDiscoveryService {
* @param $service
* @return array
*/
private function getEndpoints($decodedServices, $service) {
protected function getEndpoints($decodedServices, $service) {
$discoveredServices = [];
@ -118,8 +118,8 @@ class DiscoveryService implements IDiscoveryService {
* @param string $url
* @return bool
*/
private function isSafeUrl($url) {
return (bool)preg_match('/^[\/\.A-Za-z0-9]+$/', $url);
protected function isSafeUrl($url) {
return (bool)preg_match('/^[\/\.\-A-Za-z0-9]+$/', $url);
}
}

View File

@ -0,0 +1,99 @@
<?php
/**
* @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace Test\OCS;
use OC\OCS\DiscoveryService;
use OCP\Http\Client\IClientService;
use OCP\ICacheFactory;
use OCP\OCS\IDiscoveryService;
use Test\TestCase;
class DiscoveryServiceTest extends TestCase {
/** @var \PHPUnit_Framework_MockObject_MockObject | ICacheFactory */
private $cacheFactory;
/** @var \PHPUnit_Framework_MockObject_MockObject | IClientService */
private $clientService;
/** @var IDiscoveryService */
private $discoveryService;
public function setUp() {
parent::setUp();
$this->cacheFactory = $this->getMockBuilder(ICacheFactory::class)->getMock();
$this->clientService = $this->getMockBuilder(IClientService::class)->getMock();
$this->discoveryService = new DiscoveryService(
$this->cacheFactory,
$this->clientService
);
}
/**
* @dataProvider dataTestIsSafeUrl
*
* @param string $url
* @param bool $expected
*/
public function testIsSafeUrl($url, $expected) {
$result = $this->invokePrivate($this->discoveryService, 'isSafeUrl', [$url]);
$this->assertSame($expected, $result);
}
public function dataTestIsSafeUrl() {
return [
['api/ocs/v1.php/foo', true],
['/api/ocs/v1.php/foo', true],
['api/ocs/v1.php/foo/', true],
['api/ocs/v1.php/foo-bar/', true],
['api/ocs/v1:php/foo', false],
['api/ocs/<v1.php/foo', false],
['api/ocs/v1.php>/foo', false],
];
}
/**
* @dataProvider dataTestGetEndpoints
*
* @param array $decodedServices
* @param string $service
* @param array $expected
*/
public function testGetEndpoints($decodedServices, $service, $expected) {
$result = $this->invokePrivate($this->discoveryService, 'getEndpoints', [$decodedServices, $service]);
$this->assertSame($expected, $result);
}
public function dataTestGetEndpoints() {
return [
[['services' => ['myService' => ['endpoints' => []]]], 'myService', []],
[['services' => ['myService' => ['endpoints' => ['foo' => '/bar']]]], 'myService', ['foo' => '/bar']],
[['services' => ['myService' => ['endpoints' => ['foo' => '/bar']]]], 'anotherService', []],
[['services' => ['myService' => ['endpoints' => ['foo' => '/bar</foo']]]], 'myService', []],
];
}
}