Merge pull request #27473 from owncloud/kill-status.php

No longer show the version number in the public
owncloud · Apr 13, 2017 · 54150e7 · 54150e7
2 parents 52e46ab + 4abd357
commit 54150e7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/config/config.sample.php b/config/config.sample.php
@@ -79,6 +79,12 @@
  */
 'version' => '',
 
+/**
+ * While hardening an ownCloud instance hiding the version information in status.php
+ * can be a legitimate step. Please consult the documentation before enabling this.
+ */
+'version.hide' => false,
+
 /**
  * Identifies the database used with this installation. See also config option
  * ``supportedDatabases``

diff --git a/lib/private/OCS/CoreCapabilities.php b/lib/private/OCS/CoreCapabilities.php
@@ -24,6 +24,7 @@
 
 use OCP\Capabilities\ICapability;
 use OCP\IConfig;
+use OCP\Util;
 
 /**
  * Class Capabilities
@@ -52,6 +53,7 @@ public function getCapabilities() {
 			'core' => [
 				'pollinterval' => $this->config->getSystemValue('pollinterval', 60),
 				'webdav-root' => $this->config->getSystemValue('webdav-root', 'remote.php/webdav'),
+				'status' => Util::getStatusInfo(true),
 			]
 		];
 	}

diff --git a/lib/public/Util.php b/lib/public/Util.php
@@ -707,10 +707,11 @@ public static function needUpgrade() {
 	/**
 	 * Collects all status infos.
 	 *
-	 * @return array 
+	 * @param bool $includeVersion
+	 * @return array
 	 * @since 10.0
 	 */
-	public static function getStatusInfo() {
+	public static function getStatusInfo($includeVersion = false) {
 		$systemConfig = \OC::$server->getSystemConfig();
 
 		$installed = (bool) $systemConfig->getValue('installed', false);
@@ -722,10 +723,18 @@ public static function getStatusInfo() {
 			'installed'=> $installed ? 'true' : 'false',
 			'maintenance' => $maintenance ? 'true' : 'false',
 			'needsDbUpgrade' => self::needUpgrade() ? 'true' : 'false',
-			'version' => implode('.', self::getVersion()),
-			'versionstring' => \OC_Util::getVersionString(),
-			'edition' => \OC_Util::getEditionString(),
-			'productname' => $defaults->getName()];
+			'version' => '',
+			'versionstring' => '',
+			'edition' => '',
+			'productname' => ''];
+
+		if ($includeVersion || (bool) $systemConfig->getValue('version.hide', false) === false) {
+			$values['version'] = implode('.', self::getVersion());
+			$values['versionstring'] = \OC_Util::getVersionString();
+			$values['edition'] = \OC_Util::getEditionString();
+			$values['productname'] = $defaults->getName();
+		}
+
 		return $values;
 	}
 }