WIP: sync share on globalscale when adding new instance

appinfo/routes.php

@@ -107,6 +107,7 @@
 		['name' => 'Remote#test', 'url' => '/test', 'verb' => 'GET'],
 		['name' => 'Remote#event', 'url' => '/event/', 'verb' => 'POST'],
 		['name' => 'Remote#incoming', 'url' => '/incoming/', 'verb' => 'POST'],
+		['name' => 'Remote#forward', 'url' => '/forward/', 'verb' => 'POST'],
 		['name' => 'Remote#circles', 'url' => '/circles/', 'verb' => 'GET'],
 		['name' => 'Remote#circle', 'url' => '/circle/{circleId}/', 'verb' => 'GET'],
 		['name' => 'Remote#members', 'url' => '/members/{circleId}/', 'verb' => 'GET'],

lib/Command/CirclesCheck.php

@@ -392,8 +392,10 @@ private function saveLoopback(InputInterface $input, OutputInterface $output, st
 		[$scheme, $cloudId, $path] = $this->parseAddress($loopback);
 
 		$question = new ConfirmationQuestion(
-			'- Do you want to save <info>' . $loopback
-			. '</info> as your <info>loopback</info> address ? (y/N) ', false, '/^(y|Y)/i'
+																		'- Do you want to save <info>'
+																		. $loopback
+																		. '</info> as your <info>loopback</info> address ? (y/N) ',
+																		false, '/^(y|Y)/i'
 		);
 
 		$helper = $this->getHelper('question');
@@ -463,7 +465,8 @@ private function checkInternal(InputInterface $input, OutputInterface $output, s
 			$fullInternal = rtrim($scheme . '://' . $cloudId . $path, '/');
 
 			$question = new ConfirmationQuestion(
-				'<comment>Do you want to check the validity of this internal address?</comment> (Y/n) ', true,
+				'<comment>Do you want to run a series of test to confirm the validity of this internal address?</comment> (Y/n) ',
+				true,
 				'/^(y|Y)/i'
 			);
 
@@ -573,8 +576,10 @@ private function saveInternal(InputInterface $input, OutputInterface $output, st
 
 		$output->writeln('');
 		$question = new ConfirmationQuestion(
-			'- Do you want to save <info>' . $internal
-			. '</info> as your <info>internal</info> address ? (y/N) ', false, '/^(y|Y)/i'
+																		'- Do you want to save <info>'
+																		. $internal
+																		. '</info> as your <info>internal</info> address ? (y/N) ',
+																		false, '/^(y|Y)/i'
 		);
 
 		$helper = $this->getHelper('question');

lib/Command/CirclesMaintenance.php

@@ -34,8 +34,11 @@
 use OC\Core\Command\Base;
 use OCA\Circles\Db\CoreRequestBuilder;
 use OCA\Circles\Exceptions\MaintenanceException;
+use OCA\Circles\Service\CircleService;
+use OCA\Circles\Service\FederatedUserService;
 use OCA\Circles\Service\MaintenanceService;
 use OCA\Circles\Service\OutputService;
+use OCA\Circles\Service\ShareService;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -104,6 +107,21 @@ protected function configure() {
 	 * @return int
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output): int {
+
+
+		/** @var ShareService $shareService */
+		$shareService = \OC::$server->get(ShareService::class);
+		/** @var CircleService $circleService */
+		$circleService = \OC::$server->get(CircleService::class);
+		/** @var FederatedUserService $federatedUserService */
+		$federatedUserService = \OC::$server->get(FederatedUserService::class);
+		$federatedUserService->setLocalCurrentUserId('test3A');
+
+		$circle = $circleService->getCircle('T3yPBiOeEn7Tv1KJ1BOkroECmaWEeuu');
+		$shareService->syncRemoteShares($circle);
+
+
+		return 0;
 		$reset = $input->getOption('reset');
 		$uninstall = $input->getOption('uninstall');
 		$level = (int)$input->getOption('level');

lib/Controller/RemoteController.php

@@ -228,6 +228,32 @@ public function incoming(): DataResponse {
 	}
 
 
+	/**
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 *
+	 * @return DataResponse
+	 */
+	public function forward(): DataResponse {
+		try {
+			$event = $this->extractEventFromRequest();
+		} catch (Exception $e) {
+			$this->e($e);
+
+			return $this->exceptionResponse($e, Http::STATUS_UNAUTHORIZED);
+		}
+
+		try {
+			$this->remoteDownstreamService->forwardedEvent($event);
+
+			return new DataResponse($this->serialize($event->getResult()));
+		} catch (Exception $e) {
+			return $this->exceptionResponse($e);
+		}
+	}
+
+
+
 	/**
 	 * @PublicPage
 	 * @NoCSRFRequired

lib/Cron/GlobalSync.php

@@ -50,7 +50,7 @@ class GlobalSync extends TimedJob {
 	 * Cache constructor.
 	 */
 	public function __construct() {
-		$this->setInterval(10);
+		$this->setInterval(900);
 	}
 
 

lib/Cron/Maintenance.php

@@ -68,7 +68,7 @@ public function __construct(
 		MaintenanceService $maintenanceService,
 		ConfigService $configService
 	) {
-		$this->setInterval(10);
+		$this->setInterval(900);
 
 		$this->maintenanceService = $maintenanceService;
 		$this->configService = $configService;

lib/FederatedItems/SharedItemsSync.php → lib/FederatedItems/SharedFilesSync.php

@@ -10,7 +10,7 @@
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2021
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -32,30 +32,39 @@
 namespace OCA\Circles\FederatedItems;
 
 use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore;
+use OCA\Circles\Exceptions\RequestBuilderException;
 use OCA\Circles\IFederatedItem;
+use OCA\Circles\IFederatedItemForwardResult;
+use OCA\Circles\IFederatedItemHighSeverity;
 use OCA\Circles\IFederatedItemLimitedToInstanceWithMembership;
 use OCA\Circles\Model\Federated\FederatedEvent;
-use OCA\Circles\Service\CircleEventService;
+use OCA\Circles\Service\GlobalEventService;
+use OCA\Circles\Service\ShareWrapperService;
+
 
 /**
- * Class SharesSync
  *
- * @package OCA\Circles\FederatedItems
  */
-class SharedItemsSync implements
+class SharedFilesSync implements
 	IFederatedItem,
+	IFederatedItemForwardResult,
+	IFederatedItemHighSeverity,
 	IFederatedItemLimitedToInstanceWithMembership {
 
 
-	// TODO: testing that IFederatedItemLimitedToInstanceWithMembership is working (since multi-instance)
-	// TODO: implements IFederatedItemInstanceMember to the check procedure
+	/** @var ShareWrapperService */
+	private $shareWrapperService;
 
-	/** @var CircleEventService */
-	private $circleEventService;
+	/** @var GlobalEventService */
+	private $globalEventService;
 
 
-	public function __construct(CircleEventService $circleEventService) {
-		$this->circleEventService = $circleEventService;
+	public function __construct(
+		ShareWrapperService $shareWrapperService,
+		GlobalEventService $globalEventService
+	) {
+		$this->shareWrapperService = $shareWrapperService;
+		$this->globalEventService = $globalEventService;
 	}
 
 
@@ -68,11 +77,16 @@ public function verify(FederatedEvent $event): void {
 
 	/**
 	 * @param FederatedEvent $event
+	 *
+	 * @throws RequestBuilderException
 	 */
 	public function manage(FederatedEvent $event): void {
-		$this->circleEventService->onSharedItemsSyncRequested($event);
+		\OC::$server->getLogger()->log(3, '### MANAGE');
+		$this->globalEventService->onSharedItemsSyncRequested($event);
+		$circle = $event->getCircle();
 
-		$event->setResult(new SimpleDataStore(['shares' => 'ok']));
+		$wrappedShares = $this->shareWrapperService->getSharesToCircle($circle->getSingleId());
+		$event->setResult(new SimpleDataStore(['shares' => $wrappedShares]));
 	}
 
 
@@ -81,5 +95,6 @@ public function manage(FederatedEvent $event): void {
 	 * @param array $results
 	 */
 	public function result(FederatedEvent $event, array $results): void {
+		\OC::$server->getLogger()->log(3, '### RESULT: ' . json_encode($results));
 	}
 }

lib/IFederatedItemForwardResult.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+
+/**
+ * Circles - Bring cloud-users closer together.
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2021
+ * @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 OCA\Circles;
+
+/**
+ * Interface IFederatedItemForwardResult
+ *
+ * @package OCA\Circles
+ */
+interface IFederatedItemForwardResult {
+}

lib/IFederatedItemLimitedToInstanceWithMembership.php

@@ -32,7 +32,7 @@
 namespace OCA\Circles;
 
 /**
- * Interface IFederatedItemInstanceMember
+ * Interface IFederatedItemLimitedToInstanceWithMembership
  *
  * @package OCA\Circles
  */

lib/Model/Federated/FederatedEvent.php

@@ -101,6 +101,9 @@ class FederatedEvent implements JsonSerializable {
 	/** @var bool */
 	private $dataRequestOnly = false;
 
+	/** @var bool */
+	private $forwardResult = false;
+
 	/** @var string */
 	private $sender = '';
 
@@ -222,6 +225,25 @@ public function setDataRequestOnly(bool $dataRequestOnly): self {
 	}
 
 
+	/**
+	 * @param bool $forwardResult
+	 *
+	 * @return FederatedEvent
+	 */
+	public function setForwardResult(bool $forwardResult): self {
+		$this->forwardResult = $forwardResult;
+
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isForwardResult(): bool {
+		return $this->forwardResult;
+	}
+
+
 	/**
 	 *
 	 * Origin of the request

lib/Model/Federated/RemoteInstance.php

@@ -64,6 +64,7 @@ class RemoteInstance extends NC22Signatory implements INC22QueryRow, JsonSeriali
 	public const TEST = 'test';
 	public const ALIASES = 'aliases';
 	public const INCOMING = 'incoming';
+	public const FORWARD = 'forward';
 	public const EVENT = 'event';
 	public const CIRCLES = 'circles';
 	public const CIRCLE = 'circle';
@@ -92,6 +93,9 @@ class RemoteInstance extends NC22Signatory implements INC22QueryRow, JsonSeriali
 	/** @var string */
 	private $incoming = '';
 
+	/** @var string */
+	private $forward = '';
+
 	/** @var string */
 	private $root = '';
 
@@ -221,6 +225,25 @@ public function setIncoming(string $incoming): self {
 	}
 
 
+	/**
+	 * @param string $forward
+	 *
+	 * @return RemoteInstance
+	 */
+	public function setForward(string $forward): self {
+		$this->forward = $forward;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getForward(): string {
+		return $this->forward;
+	}
+
+
 	/**
 	 * @return string
 	 */
@@ -486,6 +509,7 @@ public function import(array $data): NC22Signatory {
 			 ->setEvent($this->get(self::EVENT, $data))
 			 ->setRoot($this->get(self::ROOT, $data))
 			 ->setIncoming($this->get(self::INCOMING, $data))
+			 ->setForward($this->get(self::FORWARD, $data))
 			 ->setCircles($this->get(self::CIRCLES, $data))
 			 ->setCircle($this->get(self::CIRCLE, $data))
 			 ->setMembers($this->get(self::MEMBERS, $data))
@@ -516,6 +540,7 @@ public function jsonSerialize(): array {
 			self::ROOT => $this->getRoot(),
 			self::EVENT => $this->getEvent(),
 			self::INCOMING => $this->getIncoming(),
+			self::FORWARD => $this->getForward(),
 			self::TEST => $this->getTest(),
 			self::CIRCLES => $this->getCircles(),
 			self::CIRCLE => $this->getCircle(),

lib/Search/LocalUsers.php

@@ -60,7 +60,7 @@ public function __construct(ICollaboratorSearch $search, ConfigService $configSe
 	/**
 	 * {@inheritdoc}
 	 */
-	public function search($search) {
+	public function search($search): array {
 		$result = [];
 		$userManager = \OC::$server->getUserManager();
 
@@ -86,7 +86,8 @@ public function search($search) {
 	 * @return array
 	 */
 	private function searchFromCollaborator($search): array {
-		[$temp, $hasMore] = $this->search->search($search, [IShare::TYPE_USER, IShare::TYPE_EMAIL], false, 50, 0);
+		[$temp, $hasMore] =
+			$this->search->search($search, [IShare::TYPE_USER, IShare::TYPE_EMAIL], false, 50, 0);
 
 		$result = array_merge($temp['exact']['users'], $temp['users']);
 		$parsed = [];