diff --git a/apps/dav/appinfo/app.php b/apps/dav/appinfo/app.php
index d33545222b0b61dc0fd43ab0c07147a44438fd39..5202e3d38b8697d0443170b34d9bf611bf5f82f0 100644
--- a/apps/dav/appinfo/app.php
+++ b/apps/dav/appinfo/app.php
@@ -20,6 +20,7 @@
*/
use OCA\Dav\AppInfo\Application;
+use Symfony\Component\EventDispatcher\GenericEvent;
$app = new Application();
$app->registerHooks();
@@ -28,6 +29,20 @@ $app->registerHooks();
return $app->getSyncService();
});
+$eventDispatcher = \OC::$server->getEventDispatcher();
+
+$eventDispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
+ function(GenericEvent $event) use ($app) {
+ /** @var \OCA\DAV\CardDAV\CardDavBackend $cardDavBackend */
+ $cardDavBackend = $app->getContainer()->query('CardDavBackend');
+ $addressBookUri = $event->getSubject();
+ $addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
+ if (!is_null($addressBook)) {
+ $cardDavBackend->deleteAddressBook($addressBook['id']);
+ }
+ }
+);
+
$cm = \OC::$server->getContactsManager();
$cm->register(function() use ($cm, $app) {
$userId = \OC::$server->getUserSession()->getUser()->getUID();
diff --git a/apps/dav/appinfo/application.php b/apps/dav/appinfo/application.php
index 7a201e1dd78d2bf530bc437016d445d36dc9cf9a..ea9e1ad8f7cc6e9a1a8873fcaa6b0232a6dcacc7 100644
--- a/apps/dav/appinfo/application.php
+++ b/apps/dav/appinfo/application.php
@@ -69,7 +69,8 @@ class Application extends App {
/** @var IAppContainer $c */
return new SyncService(
$c->query('CardDavBackend'),
- $c->getServer()->getUserManager()
+ $c->getServer()->getUserManager(),
+ $c->getServer()->getLogger()
);
});
diff --git a/apps/dav/lib/carddav/syncservice.php b/apps/dav/lib/carddav/syncservice.php
index 4b5907620e695aee88b1eee2e9a886c90c7ee7e2..2e7397fc70b5a52ba3bb35971bbdf8a23862cf85 100644
--- a/apps/dav/lib/carddav/syncservice.php
+++ b/apps/dav/lib/carddav/syncservice.php
@@ -21,11 +21,14 @@
namespace OCA\DAV\CardDAV;
+use OCP\AppFramework\Http;
+use OCP\ILogger;
use OCP\IUser;
use OCP\IUserManager;
use Sabre\DAV\Client;
use Sabre\DAV\Xml\Response\MultiStatus;
use Sabre\DAV\Xml\Service;
+use Sabre\HTTP\ClientHttpException;
use Sabre\VObject\Reader;
class SyncService {
@@ -36,12 +39,16 @@ class SyncService {
/** @var IUserManager */
private $userManager;
+ /** @var ILogger */
+ private $logger;
+
/** @var array */
private $localSystemAddressBook;
- public function __construct(CardDavBackend $backend, IUserManager $userManager) {
+ public function __construct(CardDavBackend $backend, IUserManager $userManager, ILogger $logger) {
$this->backend = $backend;
$this->userManager = $userManager;
+ $this->logger = $logger;
}
/**
@@ -53,6 +60,7 @@ class SyncService {
* @param string $targetPrincipal
* @param array $targetProperties
* @return string
+ * @throws \Exception
*/
public function syncRemoteAddressBook($url, $userName, $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetProperties) {
// 1. create addressbook
@@ -60,7 +68,16 @@ class SyncService {
$addressBookId = $book['id'];
// 2. query changes
- $response = $this->requestSyncReport($url, $userName, $sharedSecret, $syncToken);
+ try {
+ $response = $this->requestSyncReport($url, $userName, $sharedSecret, $syncToken);
+ } catch (ClientHttpException $ex) {
+ if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
+ // remote server revoked access to the address book, remove it
+ $this->backend->deleteAddressBook($addressBookId);
+ $this->logger->info('Authorization failed, remove address book: ' . $url, ['app' => 'dav']);
+ throw $ex;
+ }
+ }
// 3. apply changes
// TODO: use multi-get for download
diff --git a/apps/dav/tests/unit/carddav/syncservicetest.php b/apps/dav/tests/unit/carddav/syncservicetest.php
index a6af98f7e8c9cae811f5dbc10654ff83125e2c51..7652afdc2259a025e1f13a45c75666b63e5a6fc1 100644
--- a/apps/dav/tests/unit/carddav/syncservicetest.php
+++ b/apps/dav/tests/unit/carddav/syncservicetest.php
@@ -68,13 +68,15 @@ class SyncServiceTest extends TestCase {
/** @var IUserManager $userManager */
$userManager = $this->getMockBuilder('OCP\IUserManager')->disableOriginalConstructor()->getMock();
- $ss = new SyncService($backend, $userManager);
+ $logger = $this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock();
+ $ss = new SyncService($backend, $userManager, $logger);
$book = $ss->ensureSystemAddressBookExists('principals/users/adam', 'contacts', []);
}
public function testUpdateAndDeleteUser() {
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $backend */
$backend = $this->getMockBuilder('OCA\DAV\CardDAV\CardDAVBackend')->disableOriginalConstructor()->getMock();
+ $logger = $this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock();
$backend->expects($this->once())->method('createCard');
$backend->expects($this->once())->method('updateCard');
@@ -92,7 +94,7 @@ class SyncServiceTest extends TestCase {
$user->method('getBackendClassName')->willReturn('unittest');
$user->method('getUID')->willReturn('test-user');
- $ss = new SyncService($backend, $userManager);
+ $ss = new SyncService($backend, $userManager, $logger);
$ss->updateUser($user);
$user->method('getDisplayName')->willReturn('A test user for unit testing');
@@ -123,8 +125,9 @@ class SyncServiceTest extends TestCase {
*/
private function getSyncServiceMock($backend, $response) {
$userManager = $this->getMockBuilder('OCP\IUserManager')->disableOriginalConstructor()->getMock();
+ $logger = $this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock();
/** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $ss */
- $ss = $this->getMock('OCA\DAV\CardDAV\SyncService', ['ensureSystemAddressBookExists', 'requestSyncReport', 'download'], [$backend, $userManager]);
+ $ss = $this->getMock('OCA\DAV\CardDAV\SyncService', ['ensureSystemAddressBookExists', 'requestSyncReport', 'download'], [$backend, $userManager, $logger]);
$ss->method('requestSyncReport')->withAnyParameters()->willReturn(['response' => $response, 'token' => 'sync-token-1']);
$ss->method('ensureSystemAddressBookExists')->willReturn(['id' => 1]);
$ss->method('download')->willReturn([
diff --git a/apps/federation/appinfo/application.php b/apps/federation/appinfo/application.php
index 0d033f449820f017af43318fcfb6445c00bcc947..93897d211c34b382565b341680de20a25281e7a3 100644
--- a/apps/federation/appinfo/application.php
+++ b/apps/federation/appinfo/application.php
@@ -75,13 +75,15 @@ class Application extends \OCP\AppFramework\App {
});
$container->registerService('TrustedServers', function(IAppContainer $c) {
+ $server = $c->getServer();
return new TrustedServers(
$c->query('DbHandler'),
- \OC::$server->getHTTPClientService(),
- \OC::$server->getLogger(),
- \OC::$server->getJobList(),
- \OC::$server->getSecureRandom(),
- \OC::$server->getConfig()
+ $server->getHTTPClientService(),
+ $server->getLogger(),
+ $server->getJobList(),
+ $server->getSecureRandom(),
+ $server->getConfig(),
+ $server->getEventDispatcher()
);
});
@@ -94,6 +96,7 @@ class Application extends \OCP\AppFramework\App {
$c->query('TrustedServers')
);
});
+
}
private function registerMiddleware() {
diff --git a/apps/federation/appinfo/database.xml b/apps/federation/appinfo/database.xml
index 05b7fb12b4946388a6defda9c1629d4c43a8151b..61c3b8ac6d8d8d1c2c6d70fbb078ccd484563e11 100644
--- a/apps/federation/appinfo/database.xml
+++ b/apps/federation/appinfo/database.xml
@@ -27,8 +27,7 @@
<type>text</type>
<default></default>
<notnull>true</notnull>
- <length>32</length>
- <comments>md5 hash of the url without the protocol</comments>
+ <comments>sha1 hash of the url without the protocol</comments>
</field>
<field>
<name>token</name>
diff --git a/apps/federation/appinfo/info.xml b/apps/federation/appinfo/info.xml
index 7786deef38e180709da30070effeb26d6f7422af..be591b5b6934c05d47b48c1854dd3de63ceca65c 100644
--- a/apps/federation/appinfo/info.xml
+++ b/apps/federation/appinfo/info.xml
@@ -5,7 +5,7 @@
<description>ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description>
<licence>AGPL</licence>
<author>Bjoern Schiessle</author>
- <version>0.0.3</version>
+ <version>0.0.4</version>
<namespace>Federation</namespace>
<category>other</category>
<dependencies>
diff --git a/apps/federation/backgroundjob/getsharedsecret.php b/apps/federation/backgroundjob/getsharedsecret.php
index ebc106ba94e9001786a2c4e0a43a47146a72f21b..f896076139d7ab1ca827bb71795313265ba0523e 100644
--- a/apps/federation/backgroundjob/getsharedsecret.php
+++ b/apps/federation/backgroundjob/getsharedsecret.php
@@ -91,12 +91,13 @@ class GetSharedSecret extends QueuedJob{
$this->trustedServers = $trustedServers;
} else {
$this->trustedServers = new TrustedServers(
- $this->dbHandler,
- \OC::$server->getHTTPClientService(),
- $this->logger,
- $this->jobList,
- \OC::$server->getSecureRandom(),
- \OC::$server->getConfig()
+ $this->dbHandler,
+ \OC::$server->getHTTPClientService(),
+ $this->logger,
+ $this->jobList,
+ \OC::$server->getSecureRandom(),
+ \OC::$server->getConfig(),
+ \OC::$server->getEventDispatcher()
);
}
}
diff --git a/apps/federation/backgroundjob/requestsharedsecret.php b/apps/federation/backgroundjob/requestsharedsecret.php
index 302711af27fba104fe4ee96a1219a4cccddae6ab..79b55fe4ee485b21d7f8558357c81ef1450e87d9 100644
--- a/apps/federation/backgroundjob/requestsharedsecret.php
+++ b/apps/federation/backgroundjob/requestsharedsecret.php
@@ -95,7 +95,8 @@ class RequestSharedSecret extends QueuedJob {
$this->logger,
$this->jobList,
\OC::$server->getSecureRandom(),
- \OC::$server->getConfig()
+ \OC::$server->getConfig(),
+ \OC::$server->getEventDispatcher()
);
}
}
diff --git a/apps/federation/command/syncfederationaddressbooks.php b/apps/federation/command/syncfederationaddressbooks.php
index 61703d9d4e4657ff2efbaed01265e8233c00bdc7..72d12e59b2215345ab5597ecf2bf6fcc9b21984e 100644
--- a/apps/federation/command/syncfederationaddressbooks.php
+++ b/apps/federation/command/syncfederationaddressbooks.php
@@ -40,6 +40,7 @@ class SyncFederationAddressBooks extends Command {
$this->syncService->syncThemAll(function($url, $ex) use ($progress, $output) {
if ($ex instanceof \Exception) {
$output->writeln("Error while syncing $url : " . $ex->getMessage());
+
} else {
$progress->advance();
}
diff --git a/apps/federation/lib/dbhandler.php b/apps/federation/lib/dbhandler.php
index 3ea84baa3eb9b74de0bbf592a4984a163a1e5126..8720560efc6c69e69842f39d2e84c0c6302fc911 100644
--- a/apps/federation/lib/dbhandler.php
+++ b/apps/federation/lib/dbhandler.php
@@ -105,6 +105,28 @@ class DbHandler {
$query->execute();
}
+ /**
+ * get trusted server with given ID
+ *
+ * @param int $id
+ * @return array
+ * @throws \Exception
+ */
+ public function getServerById($id) {
+ $query = $this->connection->getQueryBuilder();
+ $query->select('*')->from($this->dbTable)
+ ->where($query->expr()->eq('id', $query->createParameter('id')))
+ ->setParameter('id', $id);
+ $query->execute();
+ $result = $query->execute()->fetchAll();
+
+ if (empty($result)) {
+ throw new \Exception('No Server found with ID: ' . $id);
+ }
+
+ return $result[0];
+ }
+
/**
* get all trusted servers
*
@@ -112,7 +134,7 @@ class DbHandler {
*/
public function getAllServer() {
$query = $this->connection->getQueryBuilder();
- $query->select(['url', 'id', 'status', 'shared_secret', 'sync_token'])->from($this->dbTable);
+ $query->select(['url', 'url_hash', 'id', 'status', 'shared_secret', 'sync_token'])->from($this->dbTable);
$result = $query->execute()->fetchAll();
return $result;
}
@@ -252,11 +274,11 @@ class DbHandler {
*/
protected function hash($url) {
$normalized = $this->normalizeUrl($url);
- return md5($normalized);
+ return sha1($normalized);
}
/**
- * normalize URL, used to create the md5 hash
+ * normalize URL, used to create the sha1 hash
*
* @param string $url
* @return string
diff --git a/apps/federation/lib/syncfederationaddressbooks.php b/apps/federation/lib/syncfederationaddressbooks.php
index 6419fdddf8e39ba5ad2bd8c7354c5b72d87c335d..f9cee9a7137b9c009c77ab9dee1ff5992311f065 100644
--- a/apps/federation/lib/syncfederationaddressbooks.php
+++ b/apps/federation/lib/syncfederationaddressbooks.php
@@ -3,6 +3,7 @@
namespace OCA\Federation;
use OCA\DAV\CardDAV\SyncService;
+use OCP\AppFramework\Http;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\ProgressBar;
use Symfony\Component\Console\Input\InputInterface;
@@ -40,7 +41,7 @@ class SyncFederationAddressBooks {
if (is_null($sharedSecret)) {
continue;
}
- $targetBookId = sha1($url);
+ $targetBookId = $trustedServer['url_hash'];
$targetPrincipal = "principals/system/system";
$targetBookProperties = [
'{DAV:}displayname' => $url
@@ -51,6 +52,9 @@ class SyncFederationAddressBooks {
$this->dbHandler->setServerStatus($url, TrustedServers::STATUS_OK, $newToken);
}
} catch (\Exception $ex) {
+ if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
+ $this->dbHandler->setServerStatus($url, TrustedServers::STATUS_ACCESS_REVOKED);
+ }
$callback($url, $ex);
}
}
diff --git a/apps/federation/lib/trustedservers.php b/apps/federation/lib/trustedservers.php
index 340accfdbdfb27f88c76af7a7cd8a96dd275e362..6f99a3c6a8cdf04c8f7252ff88e277002a7b103b 100644
--- a/apps/federation/lib/trustedservers.php
+++ b/apps/federation/lib/trustedservers.php
@@ -30,6 +30,8 @@ use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\ILogger;
use OCP\Security\ISecureRandom;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\GenericEvent;
class TrustedServers {
@@ -39,6 +41,8 @@ class TrustedServers {
const STATUS_PENDING = 2;
/** something went wrong, misconfigured server, software bug,... user interaction needed */
const STATUS_FAILURE = 3;
+ /** remote server revoked access */
+ const STATUS_ACCESS_REVOKED = 4;
/** @var dbHandler */
private $dbHandler;
@@ -58,6 +62,9 @@ class TrustedServers {
/** @var IConfig */
private $config;
+ /** @var EventDispatcherInterface */
+ private $dispatcher;
+
/**
* @param DbHandler $dbHandler
* @param IClientService $httpClientService
@@ -65,6 +72,7 @@ class TrustedServers {
* @param IJobList $jobList
* @param ISecureRandom $secureRandom
* @param IConfig $config
+ * @param EventDispatcherInterface $dispatcher
*/
public function __construct(
DbHandler $dbHandler,
@@ -72,7 +80,8 @@ class TrustedServers {
ILogger $logger,
IJobList $jobList,
ISecureRandom $secureRandom,
- IConfig $config
+ IConfig $config,
+ EventDispatcherInterface $dispatcher
) {
$this->dbHandler = $dbHandler;
$this->httpClientService = $httpClientService;
@@ -80,6 +89,7 @@ class TrustedServers {
$this->jobList = $jobList;
$this->secureRandom = $secureRandom;
$this->config = $config;
+ $this->dispatcher = $dispatcher;
}
/**
@@ -154,7 +164,10 @@ class TrustedServers {
* @param int $id
*/
public function removeServer($id) {
+ $server = $this->dbHandler->getServerById($id);
$this->dbHandler->removeServer($id);
+ $event = new GenericEvent($server['url_hash']);
+ $this->dispatcher->dispatch('OCP\Federation\TrustedServerEvent::remove', $event);
}
/**
@@ -222,6 +235,7 @@ class TrustedServers {
*
* @param $status
* @return bool
+ * @throws HintException
*/
protected function checkOwnCloudVersion($status) {
$decoded = json_decode($status, true);
diff --git a/apps/federation/settings/settings-admin.php b/apps/federation/settings/settings-admin.php
index 8c6bfe6bbbbac20b0a112759077b7f7c0aa44e07..a41d815feb80bd04210de9962c2b3feb8c6649bc 100644
--- a/apps/federation/settings/settings-admin.php
+++ b/apps/federation/settings/settings-admin.php
@@ -34,7 +34,8 @@ $trustedServers = new \OCA\Federation\TrustedServers(
\OC::$server->getLogger(),
\OC::$server->getJobList(),
\OC::$server->getSecureRandom(),
- \OC::$server->getConfig()
+ \OC::$server->getConfig(),
+ \OC::$server->getEventDispatcher()
);
$template->assign('trustedServers', $trustedServers->getServers());
diff --git a/apps/federation/templates/settings-admin.php b/apps/federation/templates/settings-admin.php
index 854bb74417937a43e9aa63e419288e1a45c16a25..77c552ee789785b0c5ad67ee653c97e8236d3c88 100644
--- a/apps/federation/templates/settings-admin.php
+++ b/apps/federation/templates/settings-admin.php
@@ -26,7 +26,11 @@ style('federation', 'settings-admin')
<li id="<?php p($trustedServer['id']); ?>" class="icon-delete">
<?php if((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
<span class="status success"></span>
- <?php } elseif((int)$trustedServer['status'] === TrustedServers::STATUS_PENDING) { ?>
+ <?php
+ } elseif(
+ (int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
+ (int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
+ ) { ?>
<span class="status indeterminate"></span>
<?php } else {?>
<span class="status error"></span>
diff --git a/apps/federation/tests/lib/dbhandlertest.php b/apps/federation/tests/lib/dbhandlertest.php
index 6fe5d9ea8efc1a8cfdba50ae631a2857f5f3e4d3..28f76dbb22ec3fbd3a395419e717c013403cb34b 100644
--- a/apps/federation/tests/lib/dbhandlertest.php
+++ b/apps/federation/tests/lib/dbhandlertest.php
@@ -89,9 +89,9 @@ class DbHandlerTest extends TestCase {
public function dataTestAddServer() {
return [
- ['http://owncloud.org', 'http://owncloud.org', md5('owncloud.org')],
- ['https://owncloud.org', 'https://owncloud.org', md5('owncloud.org')],
- ['http://owncloud.org/', 'http://owncloud.org', md5('owncloud.org')],
+ ['http://owncloud.org', 'http://owncloud.org', sha1('owncloud.org')],
+ ['https://owncloud.org', 'https://owncloud.org', sha1('owncloud.org')],
+ ['http://owncloud.org/', 'http://owncloud.org', sha1('owncloud.org')],
];
}
@@ -115,6 +115,15 @@ class DbHandlerTest extends TestCase {
$this->assertSame($id1, (int)$result[0]['id']);
}
+
+ public function testGetServerById() {
+ $this->dbHandler->addServer('server1');
+ $id = $this->dbHandler->addServer('server2');
+
+ $result = $this->dbHandler->getServerById($id);
+ $this->assertSame('server2', $result['url']);
+ }
+
public function testGetAll() {
$id1 = $this->dbHandler->addServer('server1');
$id2 = $this->dbHandler->addServer('server2');
@@ -233,10 +242,10 @@ class DbHandlerTest extends TestCase {
public function dataTestHash() {
return [
- ['server1', md5('server1')],
- ['http://server1', md5('server1')],
- ['https://server1', md5('server1')],
- ['http://server1/', md5('server1')],
+ ['server1', sha1('server1')],
+ ['http://server1', sha1('server1')],
+ ['https://server1', sha1('server1')],
+ ['http://server1/', sha1('server1')],
];
}
diff --git a/apps/federation/tests/lib/syncfederationaddressbookstest.php b/apps/federation/tests/lib/syncfederationaddressbookstest.php
index 770896535faa61b526d2bd7b07bad75e79dd876d..9290bad8bd67aa861f8e8c8562c7104a5b55e982 100644
--- a/apps/federation/tests/lib/syncfederationaddressbookstest.php
+++ b/apps/federation/tests/lib/syncfederationaddressbookstest.php
@@ -19,6 +19,7 @@ class SyncFederationAddressbooksTest extends \Test\TestCase {
willReturn([
[
'url' => 'https://cloud.drop.box',
+ 'url_hash' => 'sha1',
'shared_secret' => 'iloveowncloud',
'sync_token' => '0'
]
@@ -47,6 +48,7 @@ class SyncFederationAddressbooksTest extends \Test\TestCase {
willReturn([
[
'url' => 'https://cloud.drop.box',
+ 'url_hash' => 'sha1',
'shared_secret' => 'iloveowncloud',
'sync_token' => '0'
]
diff --git a/apps/federation/tests/lib/trustedserverstest.php b/apps/federation/tests/lib/trustedserverstest.php
index 130a0e3bb22e40b5b5771757e49dc3ab64e521ea..80f7843d818ea2a9ab0428890a406cf2bd33061a 100644
--- a/apps/federation/tests/lib/trustedserverstest.php
+++ b/apps/federation/tests/lib/trustedserverstest.php
@@ -23,7 +23,6 @@
namespace OCA\Federation\Tests\lib;
-use OC\HintException;
use OCA\Federation\DbHandler;
use OCA\Federation\TrustedServers;
use OCP\BackgroundJob\IJobList;
@@ -33,6 +32,7 @@ use OCP\Http\Client\IResponse;
use OCP\IConfig;
use OCP\ILogger;
use OCP\Security\ISecureRandom;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Test\TestCase;
class TrustedServersTest extends TestCase {
@@ -64,11 +64,16 @@ class TrustedServersTest extends TestCase {
/** @var \PHPUnit_Framework_MockObject_MockObject | IConfig */
private $config;
+ /** @var \PHPUnit_Framework_MockObject_MockObject | EventDispatcherInterface */
+ private $dispatcher;
+
public function setUp() {
parent::setUp();
$this->dbHandler = $this->getMockBuilder('\OCA\Federation\DbHandler')
->disableOriginalConstructor()->getMock();
+ $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')
+ ->disableOriginalConstructor()->getMock();
$this->httpClientService = $this->getMock('OCP\Http\Client\IClientService');
$this->httpClient = $this->getMock('OCP\Http\Client\IClient');
$this->response = $this->getMock('OCP\Http\Client\IResponse');
@@ -83,7 +88,8 @@ class TrustedServersTest extends TestCase {
$this->logger,
$this->jobList,
$this->secureRandom,
- $this->config
+ $this->config,
+ $this->dispatcher
);
}
@@ -103,7 +109,8 @@ class TrustedServersTest extends TestCase {
$this->logger,
$this->jobList,
$this->secureRandom,
- $this->config
+ $this->config,
+ $this->dispatcher
]
)
->setMethods(['normalizeUrl', 'updateProtocol'])
@@ -191,7 +198,18 @@ class TrustedServersTest extends TestCase {
public function testRemoveServer() {
$id = 42;
+ $server = ['url_hash' => 'url_hash'];
$this->dbHandler->expects($this->once())->method('removeServer')->with($id);
+ $this->dbHandler->expects($this->once())->method('getServerById')->with($id)
+ ->willReturn($server);
+ $this->dispatcher->expects($this->once())->method('dispatch')
+ ->willReturnCallback(
+ function($eventId, $event) {
+ $this->assertSame($eventId, 'OCP\Federation\TrustedServerEvent::remove');
+ $this->assertInstanceOf('Symfony\Component\EventDispatcher\GenericEvent', $event);
+ $this->assertSame('url_hash', $event->getSubject());
+ }
+ );
$this->trustedServers->removeServer($id);
}
@@ -247,7 +265,8 @@ class TrustedServersTest extends TestCase {
$this->logger,
$this->jobList,
$this->secureRandom,
- $this->config
+ $this->config,
+ $this->dispatcher
]
)
->setMethods(['checkOwnCloudVersion'])