remove synced remote address book if the remote server revoked access to his system address book
This commit is contained in:
parent
7189c72c33
commit
87e47afed8
|
@ -69,7 +69,8 @@ class Application extends App {
|
||||||
/** @var IAppContainer $c */
|
/** @var IAppContainer $c */
|
||||||
return new SyncService(
|
return new SyncService(
|
||||||
$c->query('CardDavBackend'),
|
$c->query('CardDavBackend'),
|
||||||
$c->getServer()->getUserManager()
|
$c->getServer()->getUserManager(),
|
||||||
|
$c->getServer()->getLogger()
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -21,11 +21,14 @@
|
||||||
|
|
||||||
namespace OCA\DAV\CardDAV;
|
namespace OCA\DAV\CardDAV;
|
||||||
|
|
||||||
|
use OCP\AppFramework\Http;
|
||||||
|
use OCP\ILogger;
|
||||||
use OCP\IUser;
|
use OCP\IUser;
|
||||||
use OCP\IUserManager;
|
use OCP\IUserManager;
|
||||||
use Sabre\DAV\Client;
|
use Sabre\DAV\Client;
|
||||||
use Sabre\DAV\Xml\Response\MultiStatus;
|
use Sabre\DAV\Xml\Response\MultiStatus;
|
||||||
use Sabre\DAV\Xml\Service;
|
use Sabre\DAV\Xml\Service;
|
||||||
|
use Sabre\HTTP\ClientHttpException;
|
||||||
use Sabre\VObject\Reader;
|
use Sabre\VObject\Reader;
|
||||||
|
|
||||||
class SyncService {
|
class SyncService {
|
||||||
|
@ -36,12 +39,16 @@ class SyncService {
|
||||||
/** @var IUserManager */
|
/** @var IUserManager */
|
||||||
private $userManager;
|
private $userManager;
|
||||||
|
|
||||||
|
/** @var ILogger */
|
||||||
|
private $logger;
|
||||||
|
|
||||||
/** @var array */
|
/** @var array */
|
||||||
private $localSystemAddressBook;
|
private $localSystemAddressBook;
|
||||||
|
|
||||||
public function __construct(CardDavBackend $backend, IUserManager $userManager) {
|
public function __construct(CardDavBackend $backend, IUserManager $userManager, ILogger $logger) {
|
||||||
$this->backend = $backend;
|
$this->backend = $backend;
|
||||||
$this->userManager = $userManager;
|
$this->userManager = $userManager;
|
||||||
|
$this->logger = $logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -53,6 +60,7 @@ class SyncService {
|
||||||
* @param string $targetPrincipal
|
* @param string $targetPrincipal
|
||||||
* @param array $targetProperties
|
* @param array $targetProperties
|
||||||
* @return string
|
* @return string
|
||||||
|
* @throws \Exception
|
||||||
*/
|
*/
|
||||||
public function syncRemoteAddressBook($url, $userName, $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetProperties) {
|
public function syncRemoteAddressBook($url, $userName, $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetProperties) {
|
||||||
// 1. create addressbook
|
// 1. create addressbook
|
||||||
|
@ -60,7 +68,16 @@ class SyncService {
|
||||||
$addressBookId = $book['id'];
|
$addressBookId = $book['id'];
|
||||||
|
|
||||||
// 2. query changes
|
// 2. query changes
|
||||||
|
try {
|
||||||
$response = $this->requestSyncReport($url, $userName, $sharedSecret, $syncToken);
|
$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
|
// 3. apply changes
|
||||||
// TODO: use multi-get for download
|
// TODO: use multi-get for download
|
||||||
|
|
|
@ -68,13 +68,15 @@ class SyncServiceTest extends TestCase {
|
||||||
|
|
||||||
/** @var IUserManager $userManager */
|
/** @var IUserManager $userManager */
|
||||||
$userManager = $this->getMockBuilder('OCP\IUserManager')->disableOriginalConstructor()->getMock();
|
$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', []);
|
$book = $ss->ensureSystemAddressBookExists('principals/users/adam', 'contacts', []);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testUpdateAndDeleteUser() {
|
public function testUpdateAndDeleteUser() {
|
||||||
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $backend */
|
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $backend */
|
||||||
$backend = $this->getMockBuilder('OCA\DAV\CardDAV\CardDAVBackend')->disableOriginalConstructor()->getMock();
|
$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('createCard');
|
||||||
$backend->expects($this->once())->method('updateCard');
|
$backend->expects($this->once())->method('updateCard');
|
||||||
|
@ -92,7 +94,7 @@ class SyncServiceTest extends TestCase {
|
||||||
$user->method('getBackendClassName')->willReturn('unittest');
|
$user->method('getBackendClassName')->willReturn('unittest');
|
||||||
$user->method('getUID')->willReturn('test-user');
|
$user->method('getUID')->willReturn('test-user');
|
||||||
|
|
||||||
$ss = new SyncService($backend, $userManager);
|
$ss = new SyncService($backend, $userManager, $logger);
|
||||||
$ss->updateUser($user);
|
$ss->updateUser($user);
|
||||||
|
|
||||||
$user->method('getDisplayName')->willReturn('A test user for unit testing');
|
$user->method('getDisplayName')->willReturn('A test user for unit testing');
|
||||||
|
@ -123,8 +125,9 @@ class SyncServiceTest extends TestCase {
|
||||||
*/
|
*/
|
||||||
private function getSyncServiceMock($backend, $response) {
|
private function getSyncServiceMock($backend, $response) {
|
||||||
$userManager = $this->getMockBuilder('OCP\IUserManager')->disableOriginalConstructor()->getMock();
|
$userManager = $this->getMockBuilder('OCP\IUserManager')->disableOriginalConstructor()->getMock();
|
||||||
|
$logger = $this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock();
|
||||||
/** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $ss */
|
/** @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('requestSyncReport')->withAnyParameters()->willReturn(['response' => $response, 'token' => 'sync-token-1']);
|
||||||
$ss->method('ensureSystemAddressBookExists')->willReturn(['id' => 1]);
|
$ss->method('ensureSystemAddressBookExists')->willReturn(['id' => 1]);
|
||||||
$ss->method('download')->willReturn([
|
$ss->method('download')->willReturn([
|
||||||
|
|
|
@ -40,6 +40,7 @@ class SyncFederationAddressBooks extends Command {
|
||||||
$this->syncService->syncThemAll(function($url, $ex) use ($progress, $output) {
|
$this->syncService->syncThemAll(function($url, $ex) use ($progress, $output) {
|
||||||
if ($ex instanceof \Exception) {
|
if ($ex instanceof \Exception) {
|
||||||
$output->writeln("Error while syncing $url : " . $ex->getMessage());
|
$output->writeln("Error while syncing $url : " . $ex->getMessage());
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$progress->advance();
|
$progress->advance();
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
namespace OCA\Federation;
|
namespace OCA\Federation;
|
||||||
|
|
||||||
use OCA\DAV\CardDAV\SyncService;
|
use OCA\DAV\CardDAV\SyncService;
|
||||||
|
use OCP\AppFramework\Http;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Helper\ProgressBar;
|
use Symfony\Component\Console\Helper\ProgressBar;
|
||||||
use Symfony\Component\Console\Input\InputInterface;
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
@ -51,6 +52,9 @@ class SyncFederationAddressBooks {
|
||||||
$this->dbHandler->setServerStatus($url, TrustedServers::STATUS_OK, $newToken);
|
$this->dbHandler->setServerStatus($url, TrustedServers::STATUS_OK, $newToken);
|
||||||
}
|
}
|
||||||
} catch (\Exception $ex) {
|
} catch (\Exception $ex) {
|
||||||
|
if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
|
||||||
|
$this->dbHandler->setServerStatus($url, TrustedServers::STATUS_ACCESS_REVOKED);
|
||||||
|
}
|
||||||
$callback($url, $ex);
|
$callback($url, $ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,6 +41,8 @@ class TrustedServers {
|
||||||
const STATUS_PENDING = 2;
|
const STATUS_PENDING = 2;
|
||||||
/** something went wrong, misconfigured server, software bug,... user interaction needed */
|
/** something went wrong, misconfigured server, software bug,... user interaction needed */
|
||||||
const STATUS_FAILURE = 3;
|
const STATUS_FAILURE = 3;
|
||||||
|
/** remote server revoked access */
|
||||||
|
const STATUS_ACCESS_REVOKED = 4;
|
||||||
|
|
||||||
/** @var dbHandler */
|
/** @var dbHandler */
|
||||||
private $dbHandler;
|
private $dbHandler;
|
||||||
|
|
|
@ -26,7 +26,11 @@ style('federation', 'settings-admin')
|
||||||
<li id="<?php p($trustedServer['id']); ?>" class="icon-delete">
|
<li id="<?php p($trustedServer['id']); ?>" class="icon-delete">
|
||||||
<?php if((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
|
<?php if((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
|
||||||
<span class="status success"></span>
|
<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>
|
<span class="status indeterminate"></span>
|
||||||
<?php } else {?>
|
<?php } else {?>
|
||||||
<span class="status error"></span>
|
<span class="status error"></span>
|
||||||
|
|
Loading…
Reference in New Issue