Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints

Discover federatedsharing endpoints

5 files changed, 85 insertions, 13 deletions

diff --git a/apps/federation/lib/AppInfo/Application.php b/apps/federation/lib/AppInfo/Application.php
index e5acab52857..3166316b108 100644
--- a/apps/federation/lib/AppInfo/Application.php
+++ b/apps/federation/lib/AppInfo/Application.php
@@ -135,7 +135,8 @@ class Application extends \OCP\AppFramework\App {
 	public function getSyncService() {
 		$syncService = \OC::$server->query('CardDAVSyncService');
 		$dbHandler = $this->getContainer()->query('DbHandler');
-		return new SyncFederationAddressBooks($dbHandler, $syncService);
+		$discoveryService = \OC::$server->query(\OCP\OCS\IDiscoveryService::class);
+		return new SyncFederationAddressBooks($dbHandler, $syncService, $discoveryService);
 	}
 
 }
diff --git a/apps/federation/lib/BackgroundJob/GetSharedSecret.php b/apps/federation/lib/BackgroundJob/GetSharedSecret.php
index c0a4b43db64..4a6e720ae2c 100644
--- a/apps/federation/lib/BackgroundJob/GetSharedSecret.php
+++ b/apps/federation/lib/BackgroundJob/GetSharedSecret.php
@@ -37,6 +37,7 @@ use OCP\Http\Client\IClient;
 use OCP\Http\Client\IResponse;
 use OCP\ILogger;
 use OCP\IURLGenerator;
+use OCP\OCS\IDiscoveryService;
 
 /**
  * Class GetSharedSecret
@@ -62,13 +63,18 @@ class GetSharedSecret extends Job{
 	/** @var DbHandler */
 	private $dbHandler;
 
+	/** @var IDiscoveryService  */
+	private $ocsDiscoveryService;
+
 	/** @var ILogger */
 	private $logger;
 
 	/** @var bool */
 	protected $retainJob = false;
 
-	private $endPoint = '/ocs/v2.php/apps/federation/api/v1/shared-secret?format=json';
+	private $format = '?format=json';
+
+	private $defaultEndPoint = '/ocs/v2.php/apps/federation/api/v1/shared-secret';
 
 	/**
 	 * RequestSharedSecret constructor.
@@ -79,6 +85,7 @@ class GetSharedSecret extends Job{
 	 * @param TrustedServers $trustedServers
 	 * @param ILogger $logger
 	 * @param DbHandler $dbHandler
+	 * @param IDiscoveryService $ocsDiscoveryService
 	 */
 	public function __construct(
 		IClient $httpClient = null,
@@ -86,13 +93,15 @@ class GetSharedSecret extends Job{
 		IJobList $jobList = null,
 		TrustedServers $trustedServers = null,
 		ILogger $logger = null,
-		DbHandler $dbHandler = null
+		DbHandler $dbHandler = null,
+		IDiscoveryService $ocsDiscoveryService = null
 	) {
 		$this->logger = $logger ? $logger : \OC::$server->getLogger();
 		$this->httpClient = $httpClient ? $httpClient : \OC::$server->getHTTPClientService()->newClient();
 		$this->jobList = $jobList ? $jobList : \OC::$server->getJobList();
 		$this->urlGenerator = $urlGenerator ? $urlGenerator : \OC::$server->getURLGenerator();
 		$this->dbHandler = $dbHandler ? $dbHandler : new DbHandler(\OC::$server->getDatabaseConnection(), \OC::$server->getL10N('federation'));
+		$this->ocsDiscoveryService = $ocsDiscoveryService ? $ocsDiscoveryService : \OC::$server->query(\OCP\OCS\IDiscoveryService::class);
 		if ($trustedServers) {
 			$this->trustedServers = $trustedServers;
 		} else {
@@ -142,10 +151,16 @@ class GetSharedSecret extends Job{
 		$source = rtrim($source, '/');
 		$token = $argument['token'];
 
+		$endPoints = $this->ocsDiscoveryService->discover($target, 'FEDERATED_SHARING');
+		$endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint;
+
+		// make sure that we have a well formated url
+		$url = rtrim($target, '/') . '/' . trim($endPoint, '/') . $this->format;
+
 		$result = null;
 		try {
 			$result = $this->httpClient->get(
-				$target . $this->endPoint,
+				$url,
 				[
 					'query' =>
 						[
diff --git a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php
index 352995572c9..60b22cd6283 100644
--- a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php
+++ b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php
@@ -37,6 +37,7 @@ use OCP\BackgroundJob\IJobList;
 use OCP\Http\Client\IClient;
 use OCP\ILogger;
 use OCP\IURLGenerator;
+use OCP\OCS\IDiscoveryService;
 
 /**
  * Class RequestSharedSecret
@@ -62,7 +63,8 @@ class RequestSharedSecret extends Job {
 	/** @var TrustedServers */
 	private $trustedServers;
 
-	private $endPoint = '/ocs/v2.php/apps/federation/api/v1/request-shared-secret?format=json';
+	/** @var IDiscoveryService  */
+	private $ocsDiscoveryService;
 
 	/** @var ILogger */
 	private $logger;
@@ -70,6 +72,10 @@ class RequestSharedSecret extends Job {
 	/** @var bool */
 	protected $retainJob = false;
 
+	private $format = '?format=json';
+
+	private $defaultEndPoint = '/ocs/v2.php/apps/federation/api/v1/request-shared-secret';
+
 	/**
 	 * RequestSharedSecret constructor.
 	 *
@@ -78,19 +84,22 @@ class RequestSharedSecret extends Job {
 	 * @param IJobList $jobList
 	 * @param TrustedServers $trustedServers
 	 * @param DbHandler $dbHandler
+	 * @param IDiscoveryService $ocsDiscoveryService
 	 */
 	public function __construct(
 		IClient $httpClient = null,
 		IURLGenerator $urlGenerator = null,
 		IJobList $jobList = null,
 		TrustedServers $trustedServers = null,
-		DbHandler $dbHandler = null
+		DbHandler $dbHandler = null,
+		IDiscoveryService $ocsDiscoveryService = null
 	) {
 		$this->httpClient = $httpClient ? $httpClient : \OC::$server->getHTTPClientService()->newClient();
 		$this->jobList = $jobList ? $jobList : \OC::$server->getJobList();
 		$this->urlGenerator = $urlGenerator ? $urlGenerator : \OC::$server->getURLGenerator();
 		$this->dbHandler = $dbHandler ? $dbHandler : new DbHandler(\OC::$server->getDatabaseConnection(), \OC::$server->getL10N('federation'));
 		$this->logger = \OC::$server->getLogger();
+		$this->ocsDiscoveryService = $ocsDiscoveryService ? $ocsDiscoveryService : \OC::$server->query(\OCP\OCS\IDiscoveryService::class);
 		if ($trustedServers) {
 			$this->trustedServers = $trustedServers;
 		} else {
@@ -142,9 +151,15 @@ class RequestSharedSecret extends Job {
 		$source = rtrim($source, '/');
 		$token = $argument['token'];
 
+		$endPoints = $this->ocsDiscoveryService->discover($target, 'FEDERATED_SHARING');
+		$endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint;
+
+		// make sure that we have a well formated url
+		$url = rtrim($target, '/') . '/' . trim($endPoint, '/') . $this->format;
+
 		try {
 			$result = $this->httpClient->post(
-				$target . $this->endPoint,
+				$url,
 				[
 					'body' => [
 						'url' => $source,
diff --git a/apps/federation/lib/Controller/OCSAuthAPIController.php b/apps/federation/lib/Controller/OCSAuthAPIController.php
index fdca601da63..594299a2d02 100644
--- a/apps/federation/lib/Controller/OCSAuthAPIController.php
+++ b/apps/federation/lib/Controller/OCSAuthAPIController.php
@@ -94,6 +94,37 @@ class OCSAuthAPIController extends OCSController{
 	 * @NoCSRFRequired
 	 * @PublicPage
 	 *
+	 * request received to ask remote server for a shared secret, for legacy end-points
+	 *
+	 * @param string $url
+	 * @param string $token
+	 * @return Http\DataResponse
+	 * @throws OCSForbiddenException
+	 */
+	public function requestSharedSecretLegacy($url, $token) {
+		return $this->requestSharedSecret($url, $token);
+	}
+
+
+	/**
+	 * @NoCSRFRequired
+	 * @PublicPage
+	 *
+	 * create shared secret and return it, for legacy end-points
+	 *
+	 * @param string $url
+	 * @param string $token
+	 * @return Http\DataResponse
+	 * @throws OCSForbiddenException
+	 */
+	public function getSharedSecretLegacy($url, $token) {
+		return $this->getSharedSecret($url, $token);
+	}
+
+	/**
+	 * @NoCSRFRequired
+	 * @PublicPage
+	 *
 	 * request received to ask remote server for a shared secret
 	 *
 	 * @param string $url
diff --git a/apps/federation/lib/SyncFederationAddressBooks.php b/apps/federation/lib/SyncFederationAddressBooks.php
index 759b59183aa..87419a5ba54 100644
--- a/apps/federation/lib/SyncFederationAddressBooks.php
+++ b/apps/federation/lib/SyncFederationAddressBooks.php
@@ -23,12 +23,10 @@
  */
 namespace OCA\Federation;
 
+use OC\OCS\DiscoveryService;
 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;
-use Symfony\Component\Console\Output\OutputInterface;
+use OCP\OCS\IDiscoveryService;
 
 class SyncFederationAddressBooks {
 
@@ -38,13 +36,21 @@ class SyncFederationAddressBooks {
 	/** @var SyncService */
 	private $syncService;
 
+	/** @var  DiscoveryService */
+	private $ocsDiscoveryService;
+
 	/**
 	 * @param DbHandler $dbHandler
 	 * @param SyncService $syncService
+	 * @param IDiscoveryService $ocsDiscoveryService
 	 */
-	function __construct(DbHandler $dbHandler, SyncService $syncService) {
+	public function __construct(DbHandler $dbHandler,
+								SyncService $syncService,
+								IDiscoveryService $ocsDiscoveryService
+	) {
 		$this->syncService = $syncService;
 		$this->dbHandler = $dbHandler;
+		$this->ocsDiscoveryService = $ocsDiscoveryService;
 	}
 
 	/**
@@ -59,6 +65,10 @@ class SyncFederationAddressBooks {
 			$sharedSecret = $trustedServer['shared_secret'];
 			$syncToken = $trustedServer['sync_token'];
 
+			$endPoints = $this->ocsDiscoveryService->discover($url, 'FEDERATED_SHARING');
+			$cardDavUser = isset($endPoints['carddav-user']) ? $endPoints['carddav-user'] : 'system';
+			$addressBookUrl = isset($endPoints['system-address-book']) ? trim($endPoints['system-address-book'], '/') : 'remote.php/dav/addressbooks/system/system/system';
+
 			if (is_null($sharedSecret)) {
 				continue;
 			}
@@ -68,7 +78,7 @@ class SyncFederationAddressBooks {
 					'{DAV:}displayname' => $url
 			];
 			try {
-				$newToken = $this->syncService->syncRemoteAddressBook($url, 'system', $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetBookProperties);
+				$newToken = $this->syncService->syncRemoteAddressBook($url, $cardDavUser, $addressBookUrl, $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetBookProperties);
 				if ($newToken !== $syncToken) {
 					$this->dbHandler->setServerStatus($url, TrustedServers::STATUS_OK, $newToken);
 				}