nextcloud / server

apps/files_sharing/lib/ShareBackend/Folder.php

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
 		while (!empty($parents)) {
 			$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 
-			$parents = array_map(function ($parent) use ($qb) {
+			$parents = array_map(function($parent) use ($qb) {
 				return $qb->createNamedParameter($parent);
 			}, $parents);
 

Indentation +91 added lines, -91 removed lines

@@ -30,108 +30,108 @@
 
 class Folder extends File implements \OCP\Share_Backend_Collection {
 
-	/**
-	 * get shared parents
-	 *
-	 * @param int $itemSource item source ID
-	 * @param string $shareWith with whom should the item be shared
-	 * @param string $owner owner of the item
-	 * @return array with shares
-	 */
-	public function getParents($itemSource, $shareWith = null, $owner = null) {
-		$result = [];
-		$parent = $this->getParentId($itemSource);
+    /**
+     * get shared parents
+     *
+     * @param int $itemSource item source ID
+     * @param string $shareWith with whom should the item be shared
+     * @param string $owner owner of the item
+     * @return array with shares
+     */
+    public function getParents($itemSource, $shareWith = null, $owner = null) {
+        $result = [];
+        $parent = $this->getParentId($itemSource);
 
-		$userManager = \OC::$server->getUserManager();
+        $userManager = \OC::$server->getUserManager();
 
-		while ($parent) {
-			$shares = \OCP\Share::getItemSharedWithUser('folder', $parent, $shareWith, $owner);
-			if ($shares) {
-				foreach ($shares as $share) {
-					$name = basename($share['path']);
-					$share['collection']['path'] = $name;
-					$share['collection']['item_type'] = 'folder';
-					$share['file_path'] = $name;
+        while ($parent) {
+            $shares = \OCP\Share::getItemSharedWithUser('folder', $parent, $shareWith, $owner);
+            if ($shares) {
+                foreach ($shares as $share) {
+                    $name = basename($share['path']);
+                    $share['collection']['path'] = $name;
+                    $share['collection']['item_type'] = 'folder';
+                    $share['file_path'] = $name;
 
-					$ownerUser = $userManager->get($share['uid_owner']);
-					$displayNameOwner = $ownerUser === null ? $share['uid_owner'] : $ownerUser->getDisplayName();
-					$shareWithUser = $userManager->get($share['share_with']);
-					$displayNameShareWith = $shareWithUser === null ? $share['share_with'] : $shareWithUser->getDisplayName();
-					$share['displayname_owner'] = $displayNameOwner ? $displayNameOwner : $share['uid_owner'];
-					$share['share_with_displayname'] = $displayNameShareWith ? $displayNameShareWith : $share['uid_owner'];
+                    $ownerUser = $userManager->get($share['uid_owner']);
+                    $displayNameOwner = $ownerUser === null ? $share['uid_owner'] : $ownerUser->getDisplayName();
+                    $shareWithUser = $userManager->get($share['share_with']);
+                    $displayNameShareWith = $shareWithUser === null ? $share['share_with'] : $shareWithUser->getDisplayName();
+                    $share['displayname_owner'] = $displayNameOwner ? $displayNameOwner : $share['uid_owner'];
+                    $share['share_with_displayname'] = $displayNameShareWith ? $displayNameShareWith : $share['uid_owner'];
 
-					$result[] = $share;
-				}
-			}
-			$parent = $this->getParentId($parent);
-		}
+                    $result[] = $share;
+                }
+            }
+            $parent = $this->getParentId($parent);
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * get file cache ID of parent
-	 *
-	 * @param int $child file cache ID of child
-	 * @return mixed parent ID or null
-	 */
-	private function getParentId($child) {
-		$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-		$qb->select('parent')
-			->from('filecache')
-			->where(
-				$qb->expr()->eq('fileid', $qb->createNamedParameter($child))
-			);
-		$result = $qb->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-		return $row ? $row['parent'] : null;
-	}
+    /**
+     * get file cache ID of parent
+     *
+     * @param int $child file cache ID of child
+     * @return mixed parent ID or null
+     */
+    private function getParentId($child) {
+        $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+        $qb->select('parent')
+            ->from('filecache')
+            ->where(
+                $qb->expr()->eq('fileid', $qb->createNamedParameter($child))
+            );
+        $result = $qb->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+        return $row ? $row['parent'] : null;
+    }
 
-	public function getChildren($itemSource) {
-		$children = [];
-		$parents = [$itemSource];
+    public function getChildren($itemSource) {
+        $children = [];
+        $parents = [$itemSource];
 
-		$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-		$qb->select('id')
-			->from('mimetypes')
-			->where(
-				$qb->expr()->eq('mimetype', $qb->createNamedParameter('httpd/unix-directory'))
-			);
-		$result = $qb->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
+        $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+        $qb->select('id')
+            ->from('mimetypes')
+            ->where(
+                $qb->expr()->eq('mimetype', $qb->createNamedParameter('httpd/unix-directory'))
+            );
+        $result = $qb->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
 
-		if ($row = $result->fetchRow()) {
-			$mimetype = (int) $row['id'];
-		} else {
-			$mimetype = -1;
-		}
-		while (!empty($parents)) {
-			$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+        if ($row = $result->fetchRow()) {
+            $mimetype = (int) $row['id'];
+        } else {
+            $mimetype = -1;
+        }
+        while (!empty($parents)) {
+            $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 
-			$parents = array_map(function ($parent) use ($qb) {
-				return $qb->createNamedParameter($parent);
-			}, $parents);
+            $parents = array_map(function ($parent) use ($qb) {
+                return $qb->createNamedParameter($parent);
+            }, $parents);
 
-			$qb->select('`fileid', 'name', '`mimetype')
-				->from('filecache')
-				->where(
-					$qb->expr()->in('parent', $parents)
-				);
+            $qb->select('`fileid', 'name', '`mimetype')
+                ->from('filecache')
+                ->where(
+                    $qb->expr()->in('parent', $parents)
+                );
 
-			$result = $qb->execute();
+            $result = $qb->execute();
 
-			$parents = [];
-			while ($file = $result->fetch()) {
-				$children[] = ['source' => $file['fileid'], 'file_path' => $file['name']];
-				// If a child folder is found look inside it
-				if ((int) $file['mimetype'] === $mimetype) {
-					$parents[] = $file['fileid'];
-				}
-			}
-			$result->closeCursor();
-		}
-		return $children;
-	}
+            $parents = [];
+            while ($file = $result->fetch()) {
+                $children[] = ['source' => $file['fileid'], 'file_path' => $file['name']];
+                // If a child folder is found look inside it
+                if ((int) $file['mimetype'] === $mimetype) {
+                    $parents[] = $file['fileid'];
+                }
+            }
+            $result->closeCursor();
+        }
+        return $children;
+    }
 }

apps/files_sharing/lib/Collaboration/ShareRecipientSorter.php

Spacing +5 added lines, -5 removed lines

@@ -60,7 +60,7 @@ 
 		}
 		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
 		/** @var Node[] $nodes */
-		$nodes = $userFolder->getById((int)$context['itemId']);
+		$nodes = $userFolder->getById((int) $context['itemId']);
 		if (count($nodes) === 0) {
 			return;
 		}
@@ -74,11 +74,11 @@ 
 			// at least on PHP 5.6 usort turned out to be not stable. So we add
 			// the current index to the value and compare it on a draw
 			$i = 0;
-			$workArray = array_map(function ($element) use (&$i) {
+			$workArray = array_map(function($element) use (&$i) {
 				return [$i++, $element];
 			}, $byType);
 
-			usort($workArray, function ($a, $b) use ($al, $type) {
+			usort($workArray, function($a, $b) use ($al, $type) {
 				$result = $this->compare($a[1], $b[1], $al[$type]);
 				if ($result === 0) {
 					$result = $a[0] - $b[0];
@@ -101,8 +101,8 @@ 
 		$a = $a['value']['shareWith'];
 		$b = $b['value']['shareWith'];
 
-		$valueA = (int)in_array($a, $al, true);
-		$valueB = (int)in_array($b, $al, true);
+		$valueA = (int) in_array($a, $al, true);
+		$valueB = (int) in_array($b, $al, true);
 
 		return $valueB - $valueA;
 	}

Indentation +61 added lines, -61 removed lines

@@ -32,75 +32,75 @@
 
 class ShareRecipientSorter implements ISorter {
 
-	private IManager $shareManager;
-	private IRootFolder $rootFolder;
-	private IUserSession $userSession;
+    private IManager $shareManager;
+    private IRootFolder $rootFolder;
+    private IUserSession $userSession;
 
-	public function __construct(IManager $shareManager, IRootFolder $rootFolder, IUserSession $userSession) {
-		$this->shareManager = $shareManager;
-		$this->rootFolder = $rootFolder;
-		$this->userSession = $userSession;
-	}
+    public function __construct(IManager $shareManager, IRootFolder $rootFolder, IUserSession $userSession) {
+        $this->shareManager = $shareManager;
+        $this->rootFolder = $rootFolder;
+        $this->userSession = $userSession;
+    }
 
-	public function getId(): string {
-		return 'share-recipients';
-	}
+    public function getId(): string {
+        return 'share-recipients';
+    }
 
-	public function sort(array &$sortArray, array $context) {
-		// let's be tolerant. Comments  uses "files" by default, other usages are often singular
-		if ($context['itemType'] !== 'files' && $context['itemType'] !== 'file') {
-			return;
-		}
-		$user = $this->userSession->getUser();
-		if ($user === null) {
-			return;
-		}
-		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-		/** @var Node[] $nodes */
-		$nodes = $userFolder->getById((int)$context['itemId']);
-		if (count($nodes) === 0) {
-			return;
-		}
-		$al = $this->shareManager->getAccessList($nodes[0]);
+    public function sort(array &$sortArray, array $context) {
+        // let's be tolerant. Comments  uses "files" by default, other usages are often singular
+        if ($context['itemType'] !== 'files' && $context['itemType'] !== 'file') {
+            return;
+        }
+        $user = $this->userSession->getUser();
+        if ($user === null) {
+            return;
+        }
+        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+        /** @var Node[] $nodes */
+        $nodes = $userFolder->getById((int)$context['itemId']);
+        if (count($nodes) === 0) {
+            return;
+        }
+        $al = $this->shareManager->getAccessList($nodes[0]);
 
-		foreach ($sortArray as $type => &$byType) {
-			if (!isset($al[$type]) || !is_array($al[$type])) {
-				continue;
-			}
+        foreach ($sortArray as $type => &$byType) {
+            if (!isset($al[$type]) || !is_array($al[$type])) {
+                continue;
+            }
 
-			// at least on PHP 5.6 usort turned out to be not stable. So we add
-			// the current index to the value and compare it on a draw
-			$i = 0;
-			$workArray = array_map(function ($element) use (&$i) {
-				return [$i++, $element];
-			}, $byType);
+            // at least on PHP 5.6 usort turned out to be not stable. So we add
+            // the current index to the value and compare it on a draw
+            $i = 0;
+            $workArray = array_map(function ($element) use (&$i) {
+                return [$i++, $element];
+            }, $byType);
 
-			usort($workArray, function ($a, $b) use ($al, $type) {
-				$result = $this->compare($a[1], $b[1], $al[$type]);
-				if ($result === 0) {
-					$result = $a[0] - $b[0];
-				}
-				return $result;
-			});
+            usort($workArray, function ($a, $b) use ($al, $type) {
+                $result = $this->compare($a[1], $b[1], $al[$type]);
+                if ($result === 0) {
+                    $result = $a[0] - $b[0];
+                }
+                return $result;
+            });
 
-			// and remove the index values again
-			$byType = array_column($workArray, 1);
-		}
-	}
+            // and remove the index values again
+            $byType = array_column($workArray, 1);
+        }
+    }
 
-	/**
-	 * @param array $a
-	 * @param array $b
-	 * @param array $al
-	 * @return int
-	 */
-	protected function compare(array $a, array $b, array $al) {
-		$a = $a['value']['shareWith'];
-		$b = $b['value']['shareWith'];
+    /**
+     * @param array $a
+     * @param array $b
+     * @param array $al
+     * @return int
+     */
+    protected function compare(array $a, array $b, array $al) {
+        $a = $a['value']['shareWith'];
+        $b = $b['value']['shareWith'];
 
-		$valueA = (int)in_array($a, $al, true);
-		$valueB = (int)in_array($b, $al, true);
+        $valueA = (int)in_array($a, $al, true);
+        $valueB = (int)in_array($b, $al, true);
 
-		return $valueB - $valueA;
-	}
+        return $valueB - $valueA;
+    }
 }

apps/files_sharing/lib/Listener/UserShareAcceptanceListener.php

Indentation +36 added lines, -36 removed lines

@@ -38,47 +38,47 @@
 
 class UserShareAcceptanceListener implements IEventListener {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IManager */
-	private $shareManager;
-	/** @var IGroupManager */
-	private $groupManager;
+    /** @var IConfig */
+    private $config;
+    /** @var IManager */
+    private $shareManager;
+    /** @var IGroupManager */
+    private $groupManager;
 
-	public function __construct(IConfig $config, IManager $shareManager, IGroupManager $groupManager) {
-		$this->config = $config;
-		$this->shareManager = $shareManager;
-		$this->groupManager = $groupManager;
-	}
+    public function __construct(IConfig $config, IManager $shareManager, IGroupManager $groupManager) {
+        $this->config = $config;
+        $this->shareManager = $shareManager;
+        $this->groupManager = $groupManager;
+    }
 
-	public function handle(Event $event): void {
-		if (!($event instanceof ShareCreatedEvent)) {
-			return;
-		}
+    public function handle(Event $event): void {
+        if (!($event instanceof ShareCreatedEvent)) {
+            return;
+        }
 
-		$share = $event->getShare();
+        $share = $event->getShare();
 
-		if ($share->getShareType() === IShare::TYPE_USER) {
-			$this->handleAutoAccept($share, $share->getSharedWith());
-		} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
-			$group = $this->groupManager->get($share->getSharedWith());
+        if ($share->getShareType() === IShare::TYPE_USER) {
+            $this->handleAutoAccept($share, $share->getSharedWith());
+        } elseif ($share->getShareType() === IShare::TYPE_GROUP) {
+            $group = $this->groupManager->get($share->getSharedWith());
 
-			if ($group === null) {
-				return;
-			}
+            if ($group === null) {
+                return;
+            }
 
-			$users = $group->getUsers();
-			foreach ($users as $user) {
-				$this->handleAutoAccept($share, $user->getUID());
-			}
-		}
-	}
+            $users = $group->getUsers();
+            foreach ($users as $user) {
+                $this->handleAutoAccept($share, $user->getUID());
+            }
+        }
+    }
 
-	private function handleAutoAccept(IShare $share, string $userId) {
-		$defaultAcceptSystemConfig = $this->config->getSystemValueBool('sharing.enable_share_accept', false) ? 'no' : 'yes';
-		$acceptDefault = $this->config->getUserValue($userId, Application::APP_ID, 'default_accept', $defaultAcceptSystemConfig) === 'yes';
-		if (!$this->config->getSystemValueBool('sharing.force_share_accept', false) && $acceptDefault) {
-			$this->shareManager->acceptShare($share, $userId);
-		}
-	}
+    private function handleAutoAccept(IShare $share, string $userId) {
+        $defaultAcceptSystemConfig = $this->config->getSystemValueBool('sharing.enable_share_accept', false) ? 'no' : 'yes';
+        $acceptDefault = $this->config->getUserValue($userId, Application::APP_ID, 'default_accept', $defaultAcceptSystemConfig) === 'yes';
+        if (!$this->config->getSystemValueBool('sharing.force_share_accept', false) && $acceptDefault) {
+            $this->shareManager->acceptShare($share, $userId);
+        }
+    }
 }

apps/federation/lib/TrustedServers.php

Spacing +2 added lines, -2 removed lines

@@ -231,7 +231,7 @@ 
 		$client = $this->httpClientService->newClient();
 		try {
 			$result = $client->get(
-				$url . '/status.php',
+				$url.'/status.php',
 				[
 					'timeout' => 3,
 					'connect_timeout' => 3,
@@ -284,6 +284,6 @@ 
 			return $url;
 		}
 
-		return 'https://' . $url;
+		return 'https://'.$url;
 	}
 }

Indentation +172 added lines, -172 removed lines

@@ -42,176 +42,176 @@
 
 class TrustedServers {
 
-	/** after a user list was exchanged at least once successfully */
-	public const STATUS_OK = 1;
-	/** waiting for shared secret or initial user list exchange */
-	public const STATUS_PENDING = 2;
-	/** something went wrong, misconfigured server, software bug,... user interaction needed */
-	public const STATUS_FAILURE = 3;
-	/** remote server revoked access */
-	public const STATUS_ACCESS_REVOKED = 4;
-
-	private DbHandler $dbHandler;
-	private IClientService $httpClientService;
-	private LoggerInterface $logger;
-	private IJobList $jobList;
-	private ISecureRandom $secureRandom;
-	private IConfig $config;
-	private IEventDispatcher $dispatcher;
-	private ITimeFactory $timeFactory;
-
-	public function __construct(
-		DbHandler $dbHandler,
-		IClientService $httpClientService,
-		LoggerInterface $logger,
-		IJobList $jobList,
-		ISecureRandom $secureRandom,
-		IConfig $config,
-		IEventDispatcher $dispatcher,
-		ITimeFactory $timeFactory
-	) {
-		$this->dbHandler = $dbHandler;
-		$this->httpClientService = $httpClientService;
-		$this->logger = $logger;
-		$this->jobList = $jobList;
-		$this->secureRandom = $secureRandom;
-		$this->config = $config;
-		$this->dispatcher = $dispatcher;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * Add server to the list of trusted servers
-	 */
-	public function addServer(string $url): int {
-		$url = $this->updateProtocol($url);
-		$result = $this->dbHandler->addServer($url);
-		if ($result) {
-			$token = $this->secureRandom->generate(16);
-			$this->dbHandler->addToken($url, $token);
-			$this->jobList->add(
-				RequestSharedSecret::class,
-				[
-					'url' => $url,
-					'token' => $token,
-					'created' => $this->timeFactory->getTime()
-				]
-			);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Get shared secret for the given server
-	 */
-	public function getSharedSecret(string $url): string {
-		return $this->dbHandler->getSharedSecret($url);
-	}
-
-	/**
-	 * Add shared secret for the given server
-	 */
-	public function addSharedSecret(string $url, string $sharedSecret): void {
-		$this->dbHandler->addSharedSecret($url, $sharedSecret);
-	}
-
-	/**
-	 * Remove server from the list of trusted servers
-	 */
-	public function removeServer(int $id): void {
-		$server = $this->dbHandler->getServerById($id);
-		$this->dbHandler->removeServer($id);
-		$this->dispatcher->dispatchTyped(new TrustedServerRemovedEvent($server['url_hash']));
-	}
-
-	/**
-	 * Get all trusted servers
-	 * @return list<array{id: int, url: string, url_hash: string, shared_secret: string, status: int, sync_token: string}>
-	 */
-	public function getServers() {
-		return $this->dbHandler->getAllServer();
-	}
-
-	/**
-	 * Check if given server is a trusted Nextcloud server
-	 */
-	public function isTrustedServer(string $url): bool {
-		return $this->dbHandler->serverExists($url);
-	}
-
-	/**
-	 * Set server status
-	 */
-	public function setServerStatus(string $url, int $status): void {
-		$this->dbHandler->setServerStatus($url, $status);
-	}
-
-	/**
-	 * Get server status
-	 */
-	public function getServerStatus(string $url): int {
-		return $this->dbHandler->getServerStatus($url);
-	}
-
-	/**
-	 * Check if URL point to a ownCloud/Nextcloud server
-	 */
-	public function isNextcloudServer(string $url): bool {
-		$isValidNextcloud = false;
-		$client = $this->httpClientService->newClient();
-		try {
-			$result = $client->get(
-				$url . '/status.php',
-				[
-					'timeout' => 3,
-					'connect_timeout' => 3,
-				]
-			);
-			if ($result->getStatusCode() === Http::STATUS_OK) {
-				$body = $result->getBody();
-				if (is_resource($body)) {
-					$body = stream_get_contents($body) ?: '';
-				}
-				$isValidNextcloud = $this->checkNextcloudVersion($body);
-			}
-		} catch (\Exception $e) {
-			$this->logger->error('No Nextcloud server.', [
-				'app' => 'federation',
-				'exception' => $e,
-			]);
-			return false;
-		}
-
-		return $isValidNextcloud;
-	}
-
-	/**
-	 * Check if ownCloud/Nextcloud version is >= 9.0
-	 * @throws HintException
-	 */
-	protected function checkNextcloudVersion(string $status): bool {
-		$decoded = json_decode($status, true);
-		if (!empty($decoded) && isset($decoded['version'])) {
-			if (!version_compare($decoded['version'], '9.0.0', '>=')) {
-				throw new HintException('Remote server version is too low. 9.0 is required.');
-			}
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Check if the URL contain a protocol, if not add https
-	 */
-	protected function updateProtocol(string $url): string {
-		if (
-			strpos($url, 'https://') === 0
-			|| strpos($url, 'http://') === 0
-		) {
-			return $url;
-		}
-
-		return 'https://' . $url;
-	}
+    /** after a user list was exchanged at least once successfully */
+    public const STATUS_OK = 1;
+    /** waiting for shared secret or initial user list exchange */
+    public const STATUS_PENDING = 2;
+    /** something went wrong, misconfigured server, software bug,... user interaction needed */
+    public const STATUS_FAILURE = 3;
+    /** remote server revoked access */
+    public const STATUS_ACCESS_REVOKED = 4;
+
+    private DbHandler $dbHandler;
+    private IClientService $httpClientService;
+    private LoggerInterface $logger;
+    private IJobList $jobList;
+    private ISecureRandom $secureRandom;
+    private IConfig $config;
+    private IEventDispatcher $dispatcher;
+    private ITimeFactory $timeFactory;
+
+    public function __construct(
+        DbHandler $dbHandler,
+        IClientService $httpClientService,
+        LoggerInterface $logger,
+        IJobList $jobList,
+        ISecureRandom $secureRandom,
+        IConfig $config,
+        IEventDispatcher $dispatcher,
+        ITimeFactory $timeFactory
+    ) {
+        $this->dbHandler = $dbHandler;
+        $this->httpClientService = $httpClientService;
+        $this->logger = $logger;
+        $this->jobList = $jobList;
+        $this->secureRandom = $secureRandom;
+        $this->config = $config;
+        $this->dispatcher = $dispatcher;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * Add server to the list of trusted servers
+     */
+    public function addServer(string $url): int {
+        $url = $this->updateProtocol($url);
+        $result = $this->dbHandler->addServer($url);
+        if ($result) {
+            $token = $this->secureRandom->generate(16);
+            $this->dbHandler->addToken($url, $token);
+            $this->jobList->add(
+                RequestSharedSecret::class,
+                [
+                    'url' => $url,
+                    'token' => $token,
+                    'created' => $this->timeFactory->getTime()
+                ]
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get shared secret for the given server
+     */
+    public function getSharedSecret(string $url): string {
+        return $this->dbHandler->getSharedSecret($url);
+    }
+
+    /**
+     * Add shared secret for the given server
+     */
+    public function addSharedSecret(string $url, string $sharedSecret): void {
+        $this->dbHandler->addSharedSecret($url, $sharedSecret);
+    }
+
+    /**
+     * Remove server from the list of trusted servers
+     */
+    public function removeServer(int $id): void {
+        $server = $this->dbHandler->getServerById($id);
+        $this->dbHandler->removeServer($id);
+        $this->dispatcher->dispatchTyped(new TrustedServerRemovedEvent($server['url_hash']));
+    }
+
+    /**
+     * Get all trusted servers
+     * @return list<array{id: int, url: string, url_hash: string, shared_secret: string, status: int, sync_token: string}>
+     */
+    public function getServers() {
+        return $this->dbHandler->getAllServer();
+    }
+
+    /**
+     * Check if given server is a trusted Nextcloud server
+     */
+    public function isTrustedServer(string $url): bool {
+        return $this->dbHandler->serverExists($url);
+    }
+
+    /**
+     * Set server status
+     */
+    public function setServerStatus(string $url, int $status): void {
+        $this->dbHandler->setServerStatus($url, $status);
+    }
+
+    /**
+     * Get server status
+     */
+    public function getServerStatus(string $url): int {
+        return $this->dbHandler->getServerStatus($url);
+    }
+
+    /**
+     * Check if URL point to a ownCloud/Nextcloud server
+     */
+    public function isNextcloudServer(string $url): bool {
+        $isValidNextcloud = false;
+        $client = $this->httpClientService->newClient();
+        try {
+            $result = $client->get(
+                $url . '/status.php',
+                [
+                    'timeout' => 3,
+                    'connect_timeout' => 3,
+                ]
+            );
+            if ($result->getStatusCode() === Http::STATUS_OK) {
+                $body = $result->getBody();
+                if (is_resource($body)) {
+                    $body = stream_get_contents($body) ?: '';
+                }
+                $isValidNextcloud = $this->checkNextcloudVersion($body);
+            }
+        } catch (\Exception $e) {
+            $this->logger->error('No Nextcloud server.', [
+                'app' => 'federation',
+                'exception' => $e,
+            ]);
+            return false;
+        }
+
+        return $isValidNextcloud;
+    }
+
+    /**
+     * Check if ownCloud/Nextcloud version is >= 9.0
+     * @throws HintException
+     */
+    protected function checkNextcloudVersion(string $status): bool {
+        $decoded = json_decode($status, true);
+        if (!empty($decoded) && isset($decoded['version'])) {
+            if (!version_compare($decoded['version'], '9.0.0', '>=')) {
+                throw new HintException('Remote server version is too low. 9.0 is required.');
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Check if the URL contain a protocol, if not add https
+     */
+    protected function updateProtocol(string $url): string {
+        if (
+            strpos($url, 'https://') === 0
+            || strpos($url, 'http://') === 0
+        ) {
+            return $url;
+        }
+
+        return 'https://' . $url;
+    }
 }

apps/federation/templates/settings-admin.php

Spacing +3 added lines, -3 removed lines

@@ -20,12 +20,12 @@
 	<ul id="listOfTrustedServers">
 		<?php foreach ($_['trustedServers'] as $trustedServer) { ?>
 			<li id="<?php p($trustedServer['id']); ?>">
-				<?php if ((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
+				<?php if ((int) $trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
 					<span class="status success"></span>
 				<?php
 				} elseif (
-					(int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
-					(int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
+					(int) $trustedServer['status'] === TrustedServers::STATUS_PENDING ||
+					(int) $trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
 				) { ?>
 					<span class="status indeterminate"></span>
 				<?php } else {?>

Indentation +4 added lines, -4 removed lines

@@ -16,10 +16,10 @@
 				<?php if ((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
 					<span class="status success"></span>
 				<?php
-				} elseif (
-					(int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
-					(int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
-				) { ?>
+                } 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>

apps/files_external/lib/Lib/Auth/OAuth1/OAuth1.php

Indentation +19 added lines, -19 removed lines

@@ -32,23 +32,23 @@
  * OAuth1 authentication
  */
 class OAuth1 extends AuthMechanism {
-	public function __construct(IL10N $l) {
-		$this
-			->setIdentifier('oauth1::oauth1')
-			->setScheme(self::SCHEME_OAUTH1)
-			->setText($l->t('OAuth1'))
-			->addParameters([
-				(new DefinitionParameter('configured', 'configured'))
-					->setType(DefinitionParameter::VALUE_HIDDEN),
-				new DefinitionParameter('app_key', $l->t('App key')),
-				(new DefinitionParameter('app_secret', $l->t('App secret')))
-					->setType(DefinitionParameter::VALUE_PASSWORD),
-				(new DefinitionParameter('token', 'token'))
-					->setType(DefinitionParameter::VALUE_HIDDEN),
-				(new DefinitionParameter('token_secret', 'token_secret'))
-					->setType(DefinitionParameter::VALUE_HIDDEN),
-			])
-			->addCustomJs('oauth1')
-		;
-	}
+    public function __construct(IL10N $l) {
+        $this
+            ->setIdentifier('oauth1::oauth1')
+            ->setScheme(self::SCHEME_OAUTH1)
+            ->setText($l->t('OAuth1'))
+            ->addParameters([
+                (new DefinitionParameter('configured', 'configured'))
+                    ->setType(DefinitionParameter::VALUE_HIDDEN),
+                new DefinitionParameter('app_key', $l->t('App key')),
+                (new DefinitionParameter('app_secret', $l->t('App secret')))
+                    ->setType(DefinitionParameter::VALUE_PASSWORD),
+                (new DefinitionParameter('token', 'token'))
+                    ->setType(DefinitionParameter::VALUE_HIDDEN),
+                (new DefinitionParameter('token_secret', 'token_secret'))
+                    ->setType(DefinitionParameter::VALUE_HIDDEN),
+            ])
+            ->addCustomJs('oauth1')
+        ;
+    }
 }

apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php

Indentation +14 added lines, -14 removed lines

@@ -33,18 +33,18 @@
  * OpenStack Keystone authentication
  */
 class OpenStackV2 extends AuthMechanism {
-	public function __construct(IL10N $l) {
-		$this
-			->setIdentifier('openstack::openstack')
-			->setScheme(self::SCHEME_OPENSTACK)
-			->setText($l->t('OpenStack v2'))
-			->addParameters([
-				new DefinitionParameter('user', $l->t('Username')),
-				(new DefinitionParameter('password', $l->t('Password')))
-					->setType(DefinitionParameter::VALUE_PASSWORD),
-				new DefinitionParameter('tenant', $l->t('Tenant name')),
-				new DefinitionParameter('url', $l->t('Identity endpoint URL')),
-			])
-		;
-	}
+    public function __construct(IL10N $l) {
+        $this
+            ->setIdentifier('openstack::openstack')
+            ->setScheme(self::SCHEME_OPENSTACK)
+            ->setText($l->t('OpenStack v2'))
+            ->addParameters([
+                new DefinitionParameter('user', $l->t('Username')),
+                (new DefinitionParameter('password', $l->t('Password')))
+                    ->setType(DefinitionParameter::VALUE_PASSWORD),
+                new DefinitionParameter('tenant', $l->t('Tenant name')),
+                new DefinitionParameter('url', $l->t('Identity endpoint URL')),
+            ])
+        ;
+    }
 }

apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php

Indentation +12 added lines, -12 removed lines

@@ -32,16 +32,16 @@
  * Rackspace authentication
  */
 class Rackspace extends AuthMechanism {
-	public function __construct(IL10N $l) {
-		$this
-			->setIdentifier('openstack::rackspace')
-			->setScheme(self::SCHEME_OPENSTACK)
-			->setText($l->t('Rackspace'))
-			->addParameters([
-				new DefinitionParameter('user', $l->t('Username')),
-				(new DefinitionParameter('key', $l->t('API key')))
-					->setType(DefinitionParameter::VALUE_PASSWORD),
-			])
-		;
-	}
+    public function __construct(IL10N $l) {
+        $this
+            ->setIdentifier('openstack::rackspace')
+            ->setScheme(self::SCHEME_OPENSTACK)
+            ->setText($l->t('Rackspace'))
+            ->addParameters([
+                new DefinitionParameter('user', $l->t('Username')),
+                (new DefinitionParameter('key', $l->t('API key')))
+                    ->setType(DefinitionParameter::VALUE_PASSWORD),
+            ])
+        ;
+    }
 }

apps/files_external/lib/Lib/Auth/Password/Password.php

Indentation +11 added lines, -11 removed lines

@@ -32,15 +32,15 @@
  * Basic password authentication mechanism
  */
 class Password extends AuthMechanism {
-	public function __construct(IL10N $l) {
-		$this
-			->setIdentifier('password::password')
-			->setScheme(self::SCHEME_PASSWORD)
-			->setText($l->t('Username and password'))
-			->addParameters([
-				new DefinitionParameter('user', $l->t('Username')),
-				(new DefinitionParameter('password', $l->t('Password')))
-					->setType(DefinitionParameter::VALUE_PASSWORD),
-			]);
-	}
+    public function __construct(IL10N $l) {
+        $this
+            ->setIdentifier('password::password')
+            ->setScheme(self::SCHEME_PASSWORD)
+            ->setText($l->t('Username and password'))
+            ->addParameters([
+                new DefinitionParameter('user', $l->t('Username')),
+                (new DefinitionParameter('password', $l->t('Password')))
+                    ->setType(DefinitionParameter::VALUE_PASSWORD),
+            ]);
+    }
 }