diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2016-02-26 17:51:20 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2016-02-29 16:50:34 +0100 |
| commit | 87e47afed85521439c351ae30e9849f0a74a399d (patch) | |
| tree | a644b7fe1d822deaeee9fb86fd9d10cc952ddf9d /apps/federation/lib | |
| parent | 7189c72c33a03d57473f7e3443193d07bece7c15 (diff) | |
| download | nextcloud-server-87e47afed85521439c351ae30e9849f0a74a399d.tar.gz nextcloud-server-87e47afed85521439c351ae30e9849f0a74a399d.zip | |
remove synced remote address book if the remote server revoked access to his system address book
Diffstat (limited to 'apps/federation/lib')
| -rw-r--r-- | apps/federation/lib/syncfederationaddressbooks.php | 4 | ||||
| -rw-r--r-- | apps/federation/lib/trustedservers.php | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/apps/federation/lib/syncfederationaddressbooks.php b/apps/federation/lib/syncfederationaddressbooks.php index 886f6505b20..f9cee9a7137 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; @@ -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 fed6b0944a8..3d515f24a7c 100644 --- a/apps/federation/lib/trustedservers.php +++ b/apps/federation/lib/trustedservers.php @@ -41,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; |