Merge pull request #5084 from nextcloud/useful-gs-settings

add new config switched for the global scale architecture

4 files changed, 130 insertions, 1 deletions

diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index d24836228cc..86d14a2f330 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -53,6 +53,7 @@ use OCP\AppFramework\IAppContainer;
 use OCP\AppFramework\QueryException;
 use OCP\Files\Folder;
 use OCP\Files\IAppData;
+use OCP\GlobalScale\IConfig;
 use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IServerContainer;
@@ -159,6 +160,10 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 			return $this->getServer()->getEncryptionManager();
 		});
 
+		$this->registerService(IConfig::class, function ($c) {
+			return $c->query(OC\GlobalScale\Config::class);
+		});
+
 		$this->registerService(IValidator::class, function($c) {
 			return $c->query(Validator::class);
 		});
diff --git a/lib/private/GlobalScale/Config.php b/lib/private/GlobalScale/Config.php
new file mode 100644
index 00000000000..3d718e5d04b
--- /dev/null
+++ b/lib/private/GlobalScale/Config.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
+ *
+ * @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 OC\GlobalScale;
+
+
+use OCP\IConfig;
+
+class Config implements \OCP\GlobalScale\IConfig {
+
+	/** @var IConfig */
+	private $config;
+
+	/**
+	 * Config constructor.
+	 *
+	 * @param IConfig $config
+	 */
+	public function __construct(IConfig $config) {
+		$this->config = $config;
+	}
+
+	/**
+	 * check if global scale is enabled
+	 *
+	 * @since 12.0.1
+	 * @return bool
+	 */
+	public function isGlobalScaleEnabled() {
+		$enabled = $this->config->getSystemValue('gs.enabled', false);
+		return $enabled !== false;
+	}
+
+	/**
+	 * check if federation should only be used internally in a global scale setup
+	 *
+	 * @since 12.0.1
+	 * @return bool
+	 */
+	public function onlyInternalFederation() {
+		// if global scale is disabled federation works always globally
+		$gsEnabled = $this->isGlobalScaleEnabled();
+		if ($gsEnabled === false) {
+			return false;
+		}
+
+		$enabled = $this->config->getSystemValue('gs.federation', 'internal');
+
+		return $enabled === 'internal';
+	}
+
+}
diff --git a/lib/private/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php
index 609fd87cd19..ddd8177250b 100644
--- a/lib/private/Share20/ProviderFactory.php
+++ b/lib/private/Share20/ProviderFactory.php
@@ -24,6 +24,7 @@
 namespace OC\Share20;
 
 use OC\CapabilitiesManager;
+use OC\GlobalScale\Config;
 use OCA\FederatedFileSharing\AddressHandler;
 use OCA\FederatedFileSharing\FederatedShareProvider;
 use OCA\FederatedFileSharing\Notifications;
@@ -125,7 +126,8 @@ class ProviderFactory implements IProviderFactory {
 				$this->serverContainer->getLazyRootFolder(),
 				$this->serverContainer->getConfig(),
 				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getCloudIdManager()
+				$this->serverContainer->getCloudIdManager(),
+				$this->serverContainer->query(Config::class)
 			);
 		}
 
diff --git a/lib/public/GlobalScale/IConfig.php b/lib/public/GlobalScale/IConfig.php
new file mode 100644
index 00000000000..92c19be3af5
--- /dev/null
+++ b/lib/public/GlobalScale/IConfig.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
+ *
+ * @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 OCP\GlobalScale;
+
+/**
+ * Interface IConfig
+ *
+ * Configuration of the global scale architecture
+ *
+ * @package OCP\GlobalScale
+ * @since 12.0.1
+ */
+interface IConfig {
+
+	/**
+	 * check if global scale is enabled
+	 *
+	 * @since 12.0.1
+	 * @return bool
+	 */
+	public function isGlobalScaleEnabled();
+
+	/**
+	 * check if federation should only be used internally in a global scale setup
+	 *
+	 * @since 12.0.1
+	 * @return bool
+	 */
+	public function onlyInternalFederation();
+
+}