Check if open_basedir is set

The file:// protocol does not work with curl when an open_basedir is set.

This fixes https://github.com/owncloud/core/issues/12016

3 files changed, 5 insertions, 5 deletions

diff --git a/lib/base.php b/lib/base.php
index af2474c7d76..f2ff3bb4849 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -717,7 +717,7 @@ class OC {
 		// Check if ownCloud is installed or in maintenance (update) mode
 		if (!$systemConfig->getValue('installed', false)) {
 			\OC::$server->getSession()->clear();
-			$controller = new OC\Core\Setup\Controller(\OC::$server->getConfig());
+			$controller = new OC\Core\Setup\Controller(\OC::$server->getConfig(), \OC::$server->getIniWrapper(), \OC::$server->getL10N('core'), new \OC_Defaults());
 			$controller->run($_POST);
 			exit();
 		}
diff --git a/lib/private/largefilehelper.php b/lib/private/largefilehelper.php
index 750ba1d23de..b6a8c536e9b 100644
--- a/lib/private/largefilehelper.php
+++ b/lib/private/largefilehelper.php
@@ -100,7 +100,7 @@ class LargeFileHelper {
 	*                        null on failure.
 	*/
 	public function getFileSizeViaCurl($filename) {
-		if (function_exists('curl_init')) {
+		if (function_exists('curl_init') && \OC::$server->getIniWrapper()->getString('open_basedir') === '') {
 			$fencoded = rawurlencode($filename);
 			$ch = curl_init("file://$fencoded");
 			curl_setopt($ch, CURLOPT_NOBODY, true);
diff --git a/lib/private/server.php b/lib/private/server.php
index c0606fc4fe6..4107a0eeec8 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -286,7 +286,7 @@ class Server extends SimpleContainer implements IServerContainer {
 			return new \OC\Files\Config\MountProviderCollection($loader);
 		});
 		$this->registerService('IniWrapper', function ($c) {
-						return new IniGetWrapper();
+			return new IniGetWrapper();
 		});
 	}
 
@@ -730,9 +730,9 @@ class Server extends SimpleContainer implements IServerContainer {
 	/**
 	 * Get the IniWrapper
 	 *
-	 * @return \bantu\IniGetWrapper\IniGetWrapper
+	 * @return IniGetWrapper
 	 */
 	public function getIniWrapper() {
-			return $this->query('IniWrapper');
+		return $this->query('IniWrapper');
 	}
 }