move federated sharing settings to the federatedfilesharing app

apps/dav/appinfo/v1/publicwebdav.php

@@ -55,7 +55,9 @@
 
 $server = $serverFactory->createServer($baseuri, $requestUri, $authBackend, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin) {
 	$isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
-	if (OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
+	$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application('federatedfilesharing');
+	$federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
+	if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
 		// this is what is thrown when trying to access a non-existing share
 		throw new \Sabre\DAV\Exception\NotAuthenticated();
 	}

apps/federatedfilesharing/appinfo/app.php

@@ -21,7 +21,5 @@
 
 namespace OCA\FederatedFileSharing\AppInfo;
 
-use OCP\AppFramework\App;
-
-new App('federatedfilesharing');
-
+$app = new Application('federatedfilesharing');
+$app->registerSettings();

apps/federatedfilesharing/appinfo/application.php

@@ -0,0 +1,88 @@
+<?php
+/**
+ * @author Björn Schießle <[email protected]>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace OCA\FederatedFileSharing\AppInfo;
+
+
+use OCA\FederatedFileSharing\FederatedShareProvider;
+use OCP\AppFramework\App;
+
+class Application extends App {
+
+	/** @var FederatedShareProvider */
+	protected $federatedShareProvider;
+
+	/**
+	 * register personal and admin settings page
+	 */
+	public function registerSettings() {
+		\OCP\App::registerAdmin('federatedfilesharing', 'settings-admin');
+		\OCP\App::registerPersonal('federatedfilesharing', 'settings-personal');
+	}
+
+	/**
+	 * get instance of federated share provider
+	 *
+	 * @return FederatedShareProvider
+	 */
+	public function getFederatedShareProvider() {
+		if ($this->federatedShareProvider === null) {
+			$this->initFederatedShareProvider();
+		}
+		return $this->federatedShareProvider;
+	}
+
+	/**
+	 * initialize federated share provider
+	 */
+	protected function initFederatedShareProvider() {
+		$addressHandler = new \OCA\FederatedFileSharing\AddressHandler(
+			\OC::$server->getURLGenerator(),
+			\OC::$server->getL10N('federatedfilesharing')
+		);
+		$discoveryManager = new \OCA\FederatedFileSharing\DiscoveryManager(
+			\OC::$server->getMemCacheFactory(),
+			\OC::$server->getHTTPClientService()
+		);
+		$notifications = new \OCA\FederatedFileSharing\Notifications(
+			$addressHandler,
+			\OC::$server->getHTTPClientService(),
+			$discoveryManager,
+			\OC::$server->getJobList()
+		);
+		$tokenHandler = new \OCA\FederatedFileSharing\TokenHandler(
+			\OC::$server->getSecureRandom()
+		);
+
+		$this->federatedShareProvider = new \OCA\FederatedFileSharing\FederatedShareProvider(
+			\OC::$server->getDatabaseConnection(),
+			$addressHandler,
+			$notifications,
+			$tokenHandler,
+			\OC::$server->getL10N('federatedfilesharing'),
+			\OC::$server->getLogger(),
+			\OC::$server->getLazyRootFolder(),
+			\OC::$server->getConfig()
+		);
+	}
+
+}

apps/federatedfilesharing/lib/federatedshareprovider.php

@@ -25,6 +25,8 @@
 
 use OC\Share20\Share;
 use OCP\Files\IRootFolder;
+use OCP\IAppConfig;
+use OCP\IConfig;
 use OCP\IL10N;
 use OCP\ILogger;
 use OCP\Share\IShare;
@@ -65,6 +67,9 @@ class FederatedShareProvider implements IShareProvider {
 	/** @var IRootFolder */
 	private $rootFolder;
 
+	/** @var IConfig */
+	private $config;
+
 	/**
 	 * DefaultShareProvider constructor.
 	 *
@@ -75,6 +80,7 @@ class FederatedShareProvider implements IShareProvider {
 	 * @param IL10N $l10n
 	 * @param ILogger $logger
 	 * @param IRootFolder $rootFolder
+	 * @param IConfig $config
 	 */
 	public function __construct(
 			IDBConnection $connection,
@@ -83,7 +89,8 @@ public function __construct(
 			TokenHandler $tokenHandler,
 			IL10N $l10n,
 			ILogger $logger,
-			IRootFolder $rootFolder
+			IRootFolder $rootFolder,
+			IConfig $config
 	) {
 		$this->dbConnection = $connection;
 		$this->addressHandler = $addressHandler;
@@ -92,6 +99,7 @@ public function __construct(
 		$this->l = $l10n;
 		$this->logger = $logger;
 		$this->rootFolder = $rootFolder;
+		$this->config = $config;
 	}
 
 	/**
@@ -601,4 +609,24 @@ public function userDeletedFromGroup($uid, $gid) {
 		// We don't handle groups here
 		return;
 	}
+
+	/**
+	 * check if users from other ownCloud instances are allowed to mount public links share by this instance
+	 *
+	 * @return bool
+	 */
+	public function isOutgoingServer2serverShareEnabled() {
+		$result = $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes');
+		return ($result === 'yes') ? true : false;
+	}
+
+	/**
+	 * check if users are allowed to mount public links from other ownClouds
+	 *
+	 * @return bool
+	 */
+	public function isIncomingServer2serverShareEnabled() {
+		$result = $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes');
+		return ($result === 'yes') ? true : false;
+	}
 }

apps/files_sharing/settings-admin.php → apps/federatedfilesharing/settings-admin.php

@@ -20,12 +20,15 @@
  *
  */
 
+use OCA\FederatedFileSharing\AppInfo\Application;
+
 \OC_Util::checkAdminUser();
 
-\OCP\Util::addScript('files_sharing', 'settings-admin');
+$app = new Application('federatedfilesharing');
+$federatedShareProvider = $app->getFederatedShareProvider();
 
-$tmpl = new OCP\Template('files_sharing', 'settings-admin');
-$tmpl->assign('outgoingServer2serverShareEnabled', OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled());
-$tmpl->assign('incomingServer2serverShareEnabled', OCA\Files_Sharing\Helper::isIncomingServer2serverShareEnabled());
+$tmpl = new OCP\Template('federatedfilesharing', 'settings-admin');
+$tmpl->assign('outgoingServer2serverShareEnabled', $federatedShareProvider->isOutgoingServer2serverShareEnabled());
+$tmpl->assign('incomingServer2serverShareEnabled', $federatedShareProvider->isIncomingServer2serverShareEnabled());
 
 return $tmpl->fetchPage();

apps/files_sharing/settings-personal.php → apps/federatedfilesharing/settings-personal.php

@@ -21,9 +21,14 @@
  *
  */
 
+use OCA\FederatedFileSharing\AppInfo\Application;
+
 \OC_Util::checkLoggedIn();
 
-$l = \OC::$server->getL10N('files_sharing');
+$l = \OC::$server->getL10N('federatedfilesharing');
+
+$app = new Application('federatedfilesharing');
+$federatedShareProvider = $app->getFederatedShareProvider();
 
 $isIE8 = false;
 preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
@@ -35,8 +40,8 @@
 $url = 'https://owncloud.org/federation#' . $cloudID;
 $ownCloudLogoPath = \OC::$server->getURLGenerator()->imagePath('core', 'logo-icon.svg');
 
-$tmpl = new OCP\Template('files_sharing', 'settings-personal');
-$tmpl->assign('outgoingServer2serverShareEnabled', \OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled());
+$tmpl = new OCP\Template('federatedfilesharing', 'settings-personal');
+$tmpl->assign('outgoingServer2serverShareEnabled', $federatedShareProvider->isOutgoingServer2serverShareEnabled());
 $tmpl->assign('message_with_URL', $l->t('Share with me through my #ownCloud Federated Cloud ID, see %s', [$url]));
 $tmpl->assign('message_without_URL', $l->t('Share with me through my #ownCloud Federated Cloud ID', [$cloudID]));
 $tmpl->assign('owncloud_logo_path', $ownCloudLogoPath);

apps/files_sharing/templates/settings-admin.php → apps/federatedfilesharing/templates/settings-admin.php

@@ -1,7 +1,9 @@
 <?php
 /** @var OC_L10N $l */
 /** @var array $_ */
+script('federatedfilesharing', 'settings-admin');
 ?>
+
 <div id="fileSharingSettings">
 	<h3><?php p($l->t('Federated Cloud Sharing'));?></h3>
 	<a target="_blank" rel="noreferrer" class="icon-info svg"

apps/files_sharing/templates/settings-personal.php → apps/federatedfilesharing/templates/settings-personal.php

@@ -1,11 +1,11 @@
 <?php
 /** @var OC_L10N $l */
 /** @var array $_ */
-script('files_sharing', 'settings-personal');
-style('files_sharing', 'settings-personal');
+script('federatedfilesharing', 'settings-personal');
+style('federatedfilesharing', 'settings-personal');
 if ($_['showShareIT']) {
-	script('files_sharing', '3rdparty/gs-share/gs-share');
-	style('files_sharing', '3rdparty/gs-share/style');
+	script('federatedfilesharing', '3rdparty/gs-share/gs-share');
+	style('federatedfilesharing', '3rdparty/gs-share/style');
 }
 ?>
 

apps/federatedfilesharing/tests/federatedshareprovidertest.php

@@ -26,6 +26,7 @@
 use OCA\FederatedFileSharing\Notifications;
 use OCA\FederatedFileSharing\TokenHandler;
 use OCP\Files\IRootFolder;
+use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\IL10N;
 use OCP\ILogger;
@@ -54,6 +55,8 @@ class FederatedShareProviderTest extends TestCase {
 	protected $logger;
 	/** @var IRootFolder | \PHPUnit_Framework_MockObject_MockObject */
 	protected $rootFolder;
+	/** @var  IConfig | \PHPUnit_Framework_MockObject_MockObject */
+	protected $config;
 
 	/** @var IManager */
 	protected $shareManager;
@@ -78,6 +81,7 @@ public function setUp() {
 			}));
 		$this->logger = $this->getMock('OCP\ILogger');
 		$this->rootFolder = $this->getMock('OCP\Files\IRootFolder');
+		$this->config = $this->getMock('OCP\IConfig');
 		$this->addressHandler = new AddressHandler(\OC::$server->getURLGenerator(), $this->l);
 
 		$this->provider = new FederatedShareProvider(
@@ -87,7 +91,8 @@ public function setUp() {
 			$this->tokenHandler,
 			$this->l,
 			$this->logger,
-			$this->rootFolder
+			$this->rootFolder,
+			$this->config
 		);
 
 		$this->shareManager = \OC::$server->getShareManager();
@@ -510,4 +515,43 @@ public function testDeleteUser($owner, $initiator, $recipient, $deletedUser, $ro
 
 		$this->assertCount($rowDeleted ? 0 : 1, $data);
 	}
+
+	/**
+	 * @dataProvider dataTestFederatedSharingSettings
+	 *
+	 * @param string $isEnabled
+	 * @param bool $expected
+	 */
+	public function testIsOutgoingServer2serverShareEnabled($isEnabled, $expected) {
+		$this->config->expects($this->once())->method('getAppValue')
+			->with('files_sharing', 'outgoing_server2server_share_enabled', 'yes')
+			->willReturn($isEnabled);
+
+		$this->assertSame($expected,
+			$this->provider->isOutgoingServer2serverShareEnabled()
+		);
+	}
+
+	/**
+	 * @dataProvider dataTestFederatedSharingSettings
+	 *
+	 * @param string $isEnabled
+	 * @param bool $expected
+	 */
+	public function testIsIncomingServer2serverShareEnabled($isEnabled, $expected) {
+		$this->config->expects($this->once())->method('getAppValue')
+			->with('files_sharing', 'incoming_server2server_share_enabled', 'yes')
+			->willReturn($isEnabled);
+
+		$this->assertSame($expected,
+			$this->provider->isIncomingServer2serverShareEnabled()
+		);
+	}
+
+	public function dataTestFederatedSharingSettings() {
+		return [
+			['yes', true],
+			['no', false]
+		];
+	}
 }

apps/files_sharing/ajax/external.php

@@ -31,8 +31,11 @@
 
 $l = \OC::$server->getL10N('files_sharing');
 
+$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application('federatedfilesharing');
+$federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
+
 // check if server admin allows to mount public links from other servers
-if (OCA\Files_Sharing\Helper::isIncomingServer2serverShareEnabled() === false) {
+if ($federatedShareProvider->isIncomingServer2serverShareEnabled() === false) {
 	\OCP\JSON::error(array('data' => array('message' => $l->t('Server to server sharing is not enabled on this server'))));
 	exit();
 }

apps/files_sharing/ajax/shareinfo.php

@@ -29,7 +29,10 @@
 	exit;
 }
 
-if (OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled() === false) {
+$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application('federatedfilesharing');
+$federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
+
+if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false) {
 	\OC_Response::setStatus(404); // 404 not found
 	exit;
 }

apps/files_sharing/api/server2server.php

@@ -26,11 +26,25 @@
 namespace OCA\Files_Sharing\API;
 
 use OCA\FederatedFileSharing\DiscoveryManager;
+use OCA\FederatedFileSharing\FederatedShareProvider;
 use OCA\Files_Sharing\Activity;
 use OCP\Files\NotFoundException;
 
 class Server2Server {
 
+	/** @var FederatedShareProvider */
+	private $federatedShareProvider;
+
+
+	/**
+	 * Server2Server constructor.
+	 *
+	 * @param FederatedShareProvider $federatedShareProvider
+	 */
+	public function __construct(FederatedShareProvider $federatedShareProvider) {
+		$this->federatedShareProvider = $federatedShareProvider;
+	}
+
 	/**
 	 * create a new share
 	 *
@@ -300,9 +314,9 @@ private function isS2SEnabled($incoming = false) {
 		$result = \OCP\App::isEnabled('files_sharing');
 
 		if ($incoming) {
-			$result = $result && \OCA\Files_Sharing\Helper::isIncomingServer2serverShareEnabled();
+			$result = $result && $this->federatedShareProvider->isIncomingServer2serverShareEnabled();
 		} else {
-			$result = $result && \OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled();
+			$result = $result && $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
 		}
 
 		return $result;