nextcloud / server

core/Application.php

Indentation +25 added lines, -25 removed lines

@@ -42,36 +42,36 @@
  */
 class Application extends App {
 
-	public function __construct() {
-		parent::__construct('core');
+    public function __construct() {
+        parent::__construct('core');
 
-		$container = $this->getContainer();
+        $container = $this->getContainer();
 
-		$container->registerService('defaultMailAddress', function () {
-			return Util::getDefaultEmailAddress('lostpassword-noreply');
-		});
+        $container->registerService('defaultMailAddress', function () {
+            return Util::getDefaultEmailAddress('lostpassword-noreply');
+        });
 
-		$server = $container->getServer();
-		$eventDispatcher = $server->getEventDispatcher();
+        $server = $container->getServer();
+        $eventDispatcher = $server->getEventDispatcher();
 
-		$eventDispatcher->addListener(IDBConnection::CHECK_MISSING_INDEXES_EVENT,
-			function(GenericEvent $event) use ($container) {
-				/** @var MissingIndexInformation $subject */
-				$subject = $event->getSubject();
+        $eventDispatcher->addListener(IDBConnection::CHECK_MISSING_INDEXES_EVENT,
+            function(GenericEvent $event) use ($container) {
+                /** @var MissingIndexInformation $subject */
+                $subject = $event->getSubject();
 
-				$schema = new SchemaWrapper($container->query(IDBConnection::class));
+                $schema = new SchemaWrapper($container->query(IDBConnection::class));
 
-				if ($schema->hasTable('share')) {
-					$table = $schema->getTable('share');
+                if ($schema->hasTable('share')) {
+                    $table = $schema->getTable('share');
 
-					if (!$table->hasIndex('share_with_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'share_with_index');
-					}
-					if (!$table->hasIndex('parent_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'parent_index');
-					}
-				}
-			}
-		);
-	}
+                    if (!$table->hasIndex('share_with_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'share_with_index');
+                    }
+                    if (!$table->hasIndex('parent_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'parent_index');
+                    }
+                }
+            }
+        );
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 
 		$container = $this->getContainer();
 
-		$container->registerService('defaultMailAddress', function () {
+		$container->registerService('defaultMailAddress', function() {
 			return Util::getDefaultEmailAddress('lostpassword-noreply');
 		});
 

settings/Controller/CheckSetupController.php

Indentation +390 added lines, -390 removed lines

@@ -53,277 +53,277 @@ 
  * @package OC\Settings\Controller
  */
 class CheckSetupController extends Controller {
-	/** @var IConfig */
-	private $config;
-	/** @var IClientService */
-	private $clientService;
-	/** @var \OC_Util */
-	private $util;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IL10N */
-	private $l10n;
-	/** @var Checker */
-	private $checker;
-	/** @var ILogger */
-	private $logger;
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-
-	public function __construct($AppName,
-								IRequest $request,
-								IConfig $config,
-								IClientService $clientService,
-								IURLGenerator $urlGenerator,
-								\OC_Util $util,
-								IL10N $l10n,
-								Checker $checker,
-								ILogger $logger,
-								EventDispatcherInterface $dispatcher) {
-		parent::__construct($AppName, $request);
-		$this->config = $config;
-		$this->clientService = $clientService;
-		$this->util = $util;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-		$this->checker = $checker;
-		$this->logger = $logger;
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * Checks if the server can connect to the internet using HTTPS and HTTP
-	 * @return bool
-	 */
-	private function isInternetConnectionWorking() {
-		if ($this->config->getSystemValue('has_internet_connection', true) === false) {
-			return false;
-		}
-
-		$siteArray = ['www.nextcloud.com',
-						'www.startpage.com',
-						'www.eff.org',
-						'www.edri.org',
-			];
-
-		foreach($siteArray as $site) {
-			if ($this->isSiteReachable($site)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Checks if the Nextcloud server can connect to a specific URL using both HTTPS and HTTP
-	* @return bool
-	*/
-	private function isSiteReachable($sitename) {
-		$httpSiteName = 'http://' . $sitename . '/';
-		$httpsSiteName = 'https://' . $sitename . '/';
-
-		try {
-			$client = $this->clientService->newClient();
-			$client->get($httpSiteName);
-			$client->get($httpsSiteName);
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'internet_connection_check']);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Checks whether a local memcache is installed or not
-	 * @return bool
-	 */
-	private function isMemcacheConfigured() {
-		return $this->config->getSystemValue('memcache.local', null) !== null;
-	}
-
-	/**
-	 * Whether /dev/urandom is available to the PHP controller
-	 *
-	 * @return bool
-	 */
-	private function isUrandomAvailable() {
-		if(@file_exists('/dev/urandom')) {
-			$file = fopen('/dev/urandom', 'rb');
-			if($file) {
-				fclose($file);
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Public for the sake of unit-testing
-	 *
-	 * @return array
-	 */
-	protected function getCurlVersion() {
-		return curl_version();
-	}
-
-	/**
-	 * Check if the used  SSL lib is outdated. Older OpenSSL and NSS versions do
-	 * have multiple bugs which likely lead to problems in combination with
-	 * functionality required by ownCloud such as SNI.
-	 *
-	 * @link https://github.com/owncloud/core/issues/17446#issuecomment-122877546
-	 * @link https://bugzilla.redhat.com/show_bug.cgi?id=1241172
-	 * @return string
-	 */
-	private function isUsedTlsLibOutdated() {
-		// Don't run check when:
-		// 1. Server has `has_internet_connection` set to false
-		// 2. AppStore AND S2S is disabled
-		if(!$this->config->getSystemValue('has_internet_connection', true)) {
-			return '';
-		}
-		if(!$this->config->getSystemValue('appstoreenabled', true)
-			&& $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'no'
-			&& $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'no') {
-			return '';
-		}
-
-		$versionString = $this->getCurlVersion();
-		if(isset($versionString['ssl_version'])) {
-			$versionString = $versionString['ssl_version'];
-		} else {
-			return '';
-		}
-
-		$features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
-		if(!$this->config->getSystemValue('appstoreenabled', true)) {
-			$features = (string)$this->l10n->t('Federated Cloud Sharing');
-		}
-
-		// Check if at least OpenSSL after 1.01d or 1.0.2b
-		if(strpos($versionString, 'OpenSSL/') === 0) {
-			$majorVersion = substr($versionString, 8, 5);
-			$patchRelease = substr($versionString, 13, 6);
-
-			if(($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) ||
-				($majorVersion === '1.0.2' && ord($patchRelease) < ord('b'))) {
-				return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['OpenSSL', $versionString, $features]);
-			}
-		}
-
-		// Check if NSS and perform heuristic check
-		if(strpos($versionString, 'NSS/') === 0) {
-			try {
-				$firstClient = $this->clientService->newClient();
-				$firstClient->get('https://nextcloud.com/');
-
-				$secondClient = $this->clientService->newClient();
-				$secondClient->get('https://nextcloud.com/');
-			} catch (ClientException $e) {
-				if($e->getResponse()->getStatusCode() === 400) {
-					return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['NSS', $versionString, $features]);
-				}
-			}
-		}
-
-		return '';
-	}
-
-	/**
-	 * Whether the version is outdated
-	 *
-	 * @return bool
-	 */
-	protected function isPhpOutdated() {
-		if (version_compare(PHP_VERSION, '7.0.0', '<')) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Whether the php version is still supported (at time of release)
-	 * according to: https://secure.php.net/supported-versions.php
-	 *
-	 * @return array
-	 */
-	private function isPhpSupported() {
-		return ['eol' => $this->isPhpOutdated(), 'version' => PHP_VERSION];
-	}
-
-	/**
-	 * Check if the reverse proxy configuration is working as expected
-	 *
-	 * @return bool
-	 */
-	private function forwardedForHeadersWorking() {
-		$trustedProxies = $this->config->getSystemValue('trusted_proxies', []);
-		$remoteAddress = $this->request->getRemoteAddress();
-
-		if (is_array($trustedProxies) && in_array($remoteAddress, $trustedProxies)) {
-			return false;
-		}
-
-		// either not enabled or working correctly
-		return true;
-	}
-
-	/**
-	 * Checks if the correct memcache module for PHP is installed. Only
-	 * fails if memcached is configured and the working module is not installed.
-	 *
-	 * @return bool
-	 */
-	private function isCorrectMemcachedPHPModuleInstalled() {
-		if ($this->config->getSystemValue('memcache.distributed', null) !== '\OC\Memcache\Memcached') {
-			return true;
-		}
-
-		// there are two different memcached modules for PHP
-		// we only support memcached and not memcache
-		// https://code.google.com/p/memcached/wiki/PHPClientComparison
-		return !(!extension_loaded('memcached') && extension_loaded('memcache'));
-	}
-
-	/**
-	 * Checks if set_time_limit is not disabled.
-	 *
-	 * @return bool
-	 */
-	private function isSettimelimitAvailable() {
-		if (function_exists('set_time_limit')
-			&& strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @return RedirectResponse
-	 */
-	public function rescanFailedIntegrityCheck() {
-		$this->checker->runInstanceVerification();
-		return new RedirectResponse(
-			$this->urlGenerator->linkToRoute('settings.AdminSettings.index')
-		);
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @return DataResponse
-	 */
-	public function getFailedIntegrityCheckFiles() {
-		if(!$this->checker->isCodeCheckEnforced()) {
-			return new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.');
-		}
-
-		$completeResults = $this->checker->getResults();
-
-		if(!empty($completeResults)) {
-			$formattedTextResponse = 'Technical information
+    /** @var IConfig */
+    private $config;
+    /** @var IClientService */
+    private $clientService;
+    /** @var \OC_Util */
+    private $util;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IL10N */
+    private $l10n;
+    /** @var Checker */
+    private $checker;
+    /** @var ILogger */
+    private $logger;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+
+    public function __construct($AppName,
+                                IRequest $request,
+                                IConfig $config,
+                                IClientService $clientService,
+                                IURLGenerator $urlGenerator,
+                                \OC_Util $util,
+                                IL10N $l10n,
+                                Checker $checker,
+                                ILogger $logger,
+                                EventDispatcherInterface $dispatcher) {
+        parent::__construct($AppName, $request);
+        $this->config = $config;
+        $this->clientService = $clientService;
+        $this->util = $util;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+        $this->checker = $checker;
+        $this->logger = $logger;
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * Checks if the server can connect to the internet using HTTPS and HTTP
+     * @return bool
+     */
+    private function isInternetConnectionWorking() {
+        if ($this->config->getSystemValue('has_internet_connection', true) === false) {
+            return false;
+        }
+
+        $siteArray = ['www.nextcloud.com',
+                        'www.startpage.com',
+                        'www.eff.org',
+                        'www.edri.org',
+            ];
+
+        foreach($siteArray as $site) {
+            if ($this->isSiteReachable($site)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Checks if the Nextcloud server can connect to a specific URL using both HTTPS and HTTP
+     * @return bool
+     */
+    private function isSiteReachable($sitename) {
+        $httpSiteName = 'http://' . $sitename . '/';
+        $httpsSiteName = 'https://' . $sitename . '/';
+
+        try {
+            $client = $this->clientService->newClient();
+            $client->get($httpSiteName);
+            $client->get($httpsSiteName);
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'internet_connection_check']);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Checks whether a local memcache is installed or not
+     * @return bool
+     */
+    private function isMemcacheConfigured() {
+        return $this->config->getSystemValue('memcache.local', null) !== null;
+    }
+
+    /**
+     * Whether /dev/urandom is available to the PHP controller
+     *
+     * @return bool
+     */
+    private function isUrandomAvailable() {
+        if(@file_exists('/dev/urandom')) {
+            $file = fopen('/dev/urandom', 'rb');
+            if($file) {
+                fclose($file);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Public for the sake of unit-testing
+     *
+     * @return array
+     */
+    protected function getCurlVersion() {
+        return curl_version();
+    }
+
+    /**
+     * Check if the used  SSL lib is outdated. Older OpenSSL and NSS versions do
+     * have multiple bugs which likely lead to problems in combination with
+     * functionality required by ownCloud such as SNI.
+     *
+     * @link https://github.com/owncloud/core/issues/17446#issuecomment-122877546
+     * @link https://bugzilla.redhat.com/show_bug.cgi?id=1241172
+     * @return string
+     */
+    private function isUsedTlsLibOutdated() {
+        // Don't run check when:
+        // 1. Server has `has_internet_connection` set to false
+        // 2. AppStore AND S2S is disabled
+        if(!$this->config->getSystemValue('has_internet_connection', true)) {
+            return '';
+        }
+        if(!$this->config->getSystemValue('appstoreenabled', true)
+            && $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'no'
+            && $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'no') {
+            return '';
+        }
+
+        $versionString = $this->getCurlVersion();
+        if(isset($versionString['ssl_version'])) {
+            $versionString = $versionString['ssl_version'];
+        } else {
+            return '';
+        }
+
+        $features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
+        if(!$this->config->getSystemValue('appstoreenabled', true)) {
+            $features = (string)$this->l10n->t('Federated Cloud Sharing');
+        }
+
+        // Check if at least OpenSSL after 1.01d or 1.0.2b
+        if(strpos($versionString, 'OpenSSL/') === 0) {
+            $majorVersion = substr($versionString, 8, 5);
+            $patchRelease = substr($versionString, 13, 6);
+
+            if(($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) ||
+                ($majorVersion === '1.0.2' && ord($patchRelease) < ord('b'))) {
+                return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['OpenSSL', $versionString, $features]);
+            }
+        }
+
+        // Check if NSS and perform heuristic check
+        if(strpos($versionString, 'NSS/') === 0) {
+            try {
+                $firstClient = $this->clientService->newClient();
+                $firstClient->get('https://nextcloud.com/');
+
+                $secondClient = $this->clientService->newClient();
+                $secondClient->get('https://nextcloud.com/');
+            } catch (ClientException $e) {
+                if($e->getResponse()->getStatusCode() === 400) {
+                    return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['NSS', $versionString, $features]);
+                }
+            }
+        }
+
+        return '';
+    }
+
+    /**
+     * Whether the version is outdated
+     *
+     * @return bool
+     */
+    protected function isPhpOutdated() {
+        if (version_compare(PHP_VERSION, '7.0.0', '<')) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Whether the php version is still supported (at time of release)
+     * according to: https://secure.php.net/supported-versions.php
+     *
+     * @return array
+     */
+    private function isPhpSupported() {
+        return ['eol' => $this->isPhpOutdated(), 'version' => PHP_VERSION];
+    }
+
+    /**
+     * Check if the reverse proxy configuration is working as expected
+     *
+     * @return bool
+     */
+    private function forwardedForHeadersWorking() {
+        $trustedProxies = $this->config->getSystemValue('trusted_proxies', []);
+        $remoteAddress = $this->request->getRemoteAddress();
+
+        if (is_array($trustedProxies) && in_array($remoteAddress, $trustedProxies)) {
+            return false;
+        }
+
+        // either not enabled or working correctly
+        return true;
+    }
+
+    /**
+     * Checks if the correct memcache module for PHP is installed. Only
+     * fails if memcached is configured and the working module is not installed.
+     *
+     * @return bool
+     */
+    private function isCorrectMemcachedPHPModuleInstalled() {
+        if ($this->config->getSystemValue('memcache.distributed', null) !== '\OC\Memcache\Memcached') {
+            return true;
+        }
+
+        // there are two different memcached modules for PHP
+        // we only support memcached and not memcache
+        // https://code.google.com/p/memcached/wiki/PHPClientComparison
+        return !(!extension_loaded('memcached') && extension_loaded('memcache'));
+    }
+
+    /**
+     * Checks if set_time_limit is not disabled.
+     *
+     * @return bool
+     */
+    private function isSettimelimitAvailable() {
+        if (function_exists('set_time_limit')
+            && strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return RedirectResponse
+     */
+    public function rescanFailedIntegrityCheck() {
+        $this->checker->runInstanceVerification();
+        return new RedirectResponse(
+            $this->urlGenerator->linkToRoute('settings.AdminSettings.index')
+        );
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @return DataResponse
+     */
+    public function getFailedIntegrityCheckFiles() {
+        if(!$this->checker->isCodeCheckEnforced()) {
+            return new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.');
+        }
+
+        $completeResults = $this->checker->getResults();
+
+        if(!empty($completeResults)) {
+            $formattedTextResponse = 'Technical information
 =====================
 The following list covers which files have failed the integrity check. Please read
 the previous linked documentation to learn more about the errors and how to fix
@@ -332,126 +332,126 @@ 
 Results
 =======
 ';
-			foreach($completeResults as $context => $contextResult) {
-				$formattedTextResponse .= "- $context\n";
-
-				foreach($contextResult as $category => $result) {
-					$formattedTextResponse .= "\t- $category\n";
-					if($category !== 'EXCEPTION') {
-						foreach ($result as $key => $results) {
-							$formattedTextResponse .= "\t\t- $key\n";
-						}
-					} else {
-						foreach ($result as $key => $results) {
-							$formattedTextResponse .= "\t\t- $results\n";
-						}
-					}
-
-				}
-			}
-
-			$formattedTextResponse .= '
+            foreach($completeResults as $context => $contextResult) {
+                $formattedTextResponse .= "- $context\n";
+
+                foreach($contextResult as $category => $result) {
+                    $formattedTextResponse .= "\t- $category\n";
+                    if($category !== 'EXCEPTION') {
+                        foreach ($result as $key => $results) {
+                            $formattedTextResponse .= "\t\t- $key\n";
+                        }
+                    } else {
+                        foreach ($result as $key => $results) {
+                            $formattedTextResponse .= "\t\t- $results\n";
+                        }
+                    }
+
+                }
+            }
+
+            $formattedTextResponse .= '
 Raw output
 ==========
 ';
-			$formattedTextResponse .= print_r($completeResults, true);
-		} else {
-			$formattedTextResponse = 'No errors have been found.';
-		}
-
-
-		$response = new DataDisplayResponse(
-			$formattedTextResponse,
-			Http::STATUS_OK,
-			[
-				'Content-Type' => 'text/plain',
-			]
-		);
-
-		return $response;
-	}
-
-	/**
-	 * Checks whether a PHP opcache is properly set up
-	 * @return bool
-	 */
-	protected function isOpcacheProperlySetup() {
-		$iniWrapper = new IniGetWrapper();
-
-		$isOpcacheProperlySetUp = true;
-
-		if(!$iniWrapper->getBool('opcache.enable')) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		if(!$iniWrapper->getBool('opcache.save_comments')) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		if(!$iniWrapper->getBool('opcache.enable_cli')) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		if($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		if($iniWrapper->getNumeric('opcache.memory_consumption') < 128) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		if($iniWrapper->getNumeric('opcache.interned_strings_buffer') < 8) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		return $isOpcacheProperlySetUp;
-	}
-
-	/**
-	 * Check if the required FreeType functions are present
-	 * @return bool
-	 */
-	protected function hasFreeTypeSupport() {
-		return function_exists('imagettfbbox') && function_exists('imagettftext');
-	}
-
-	/**
-	 * Check if the required FreeType functions are present
-	 * @return bool
-	 */
-	protected function hasMissingIndexes() {
-		$indexInfo = new MissingIndexInformation();
-		// Dispatch event so apps can also hint for pending index updates if needed
-		$event = new GenericEvent($indexInfo);
-		$this->dispatcher->dispatch(IDBConnection::CHECK_MISSING_INDEXES_EVENT, $event);
-
-		return $indexInfo->getListOfMissingIndexes();
-	}
-
-	/**
-	 * @return DataResponse
-	 */
-	public function check() {
-		return new DataResponse(
-			[
-				'serverHasInternetConnection' => $this->isInternetConnectionWorking(),
-				'isMemcacheConfigured' => $this->isMemcacheConfigured(),
-				'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'),
-				'isUrandomAvailable' => $this->isUrandomAvailable(),
-				'securityDocs' => $this->urlGenerator->linkToDocs('admin-security'),
-				'isUsedTlsLibOutdated' => $this->isUsedTlsLibOutdated(),
-				'phpSupported' => $this->isPhpSupported(),
-				'forwardedForHeadersWorking' => $this->forwardedForHeadersWorking(),
-				'reverseProxyDocs' => $this->urlGenerator->linkToDocs('admin-reverse-proxy'),
-				'isCorrectMemcachedPHPModuleInstalled' => $this->isCorrectMemcachedPHPModuleInstalled(),
-				'hasPassedCodeIntegrityCheck' => $this->checker->hasPassedCheck(),
-				'codeIntegrityCheckerDocumentation' => $this->urlGenerator->linkToDocs('admin-code-integrity'),
-				'isOpcacheProperlySetup' => $this->isOpcacheProperlySetup(),
-				'phpOpcacheDocumentation' => $this->urlGenerator->linkToDocs('admin-php-opcache'),
-				'isSettimelimitAvailable' => $this->isSettimelimitAvailable(),
-				'hasFreeTypeSupport' => $this->hasFreeTypeSupport(),
-				'hasMissingIndexes' => $this->hasMissingIndexes(),
-			]
-		);
-	}
+            $formattedTextResponse .= print_r($completeResults, true);
+        } else {
+            $formattedTextResponse = 'No errors have been found.';
+        }
+
+
+        $response = new DataDisplayResponse(
+            $formattedTextResponse,
+            Http::STATUS_OK,
+            [
+                'Content-Type' => 'text/plain',
+            ]
+        );
+
+        return $response;
+    }
+
+    /**
+     * Checks whether a PHP opcache is properly set up
+     * @return bool
+     */
+    protected function isOpcacheProperlySetup() {
+        $iniWrapper = new IniGetWrapper();
+
+        $isOpcacheProperlySetUp = true;
+
+        if(!$iniWrapper->getBool('opcache.enable')) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        if(!$iniWrapper->getBool('opcache.save_comments')) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        if(!$iniWrapper->getBool('opcache.enable_cli')) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        if($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        if($iniWrapper->getNumeric('opcache.memory_consumption') < 128) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        if($iniWrapper->getNumeric('opcache.interned_strings_buffer') < 8) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        return $isOpcacheProperlySetUp;
+    }
+
+    /**
+     * Check if the required FreeType functions are present
+     * @return bool
+     */
+    protected function hasFreeTypeSupport() {
+        return function_exists('imagettfbbox') && function_exists('imagettftext');
+    }
+
+    /**
+     * Check if the required FreeType functions are present
+     * @return bool
+     */
+    protected function hasMissingIndexes() {
+        $indexInfo = new MissingIndexInformation();
+        // Dispatch event so apps can also hint for pending index updates if needed
+        $event = new GenericEvent($indexInfo);
+        $this->dispatcher->dispatch(IDBConnection::CHECK_MISSING_INDEXES_EVENT, $event);
+
+        return $indexInfo->getListOfMissingIndexes();
+    }
+
+    /**
+     * @return DataResponse
+     */
+    public function check() {
+        return new DataResponse(
+            [
+                'serverHasInternetConnection' => $this->isInternetConnectionWorking(),
+                'isMemcacheConfigured' => $this->isMemcacheConfigured(),
+                'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'),
+                'isUrandomAvailable' => $this->isUrandomAvailable(),
+                'securityDocs' => $this->urlGenerator->linkToDocs('admin-security'),
+                'isUsedTlsLibOutdated' => $this->isUsedTlsLibOutdated(),
+                'phpSupported' => $this->isPhpSupported(),
+                'forwardedForHeadersWorking' => $this->forwardedForHeadersWorking(),
+                'reverseProxyDocs' => $this->urlGenerator->linkToDocs('admin-reverse-proxy'),
+                'isCorrectMemcachedPHPModuleInstalled' => $this->isCorrectMemcachedPHPModuleInstalled(),
+                'hasPassedCodeIntegrityCheck' => $this->checker->hasPassedCheck(),
+                'codeIntegrityCheckerDocumentation' => $this->urlGenerator->linkToDocs('admin-code-integrity'),
+                'isOpcacheProperlySetup' => $this->isOpcacheProperlySetup(),
+                'phpOpcacheDocumentation' => $this->urlGenerator->linkToDocs('admin-php-opcache'),
+                'isSettimelimitAvailable' => $this->isSettimelimitAvailable(),
+                'hasFreeTypeSupport' => $this->hasFreeTypeSupport(),
+                'hasMissingIndexes' => $this->hasMissingIndexes(),
+            ]
+        );
+    }
 }

lib/private/DB/MissingIndexInformation.php

Indentation +10 added lines, -10 removed lines

@@ -24,16 +24,16 @@
 
 class MissingIndexInformation {
 
-	private $listOfMissingIndexes = [];
+    private $listOfMissingIndexes = [];
 
-	public function addHintForMissingSubject($tableName, $indexName) {
-		$this->listOfMissingIndexes[] = [
-			'tableName' => $tableName,
-			'indexName' => $indexName
-		];
-	}
+    public function addHintForMissingSubject($tableName, $indexName) {
+        $this->listOfMissingIndexes[] = [
+            'tableName' => $tableName,
+            'indexName' => $indexName
+        ];
+    }
 
-	public function getListOfMissingIndexes() {
-		return $this->listOfMissingIndexes;
-	}
+    public function getListOfMissingIndexes() {
+        return $this->listOfMissingIndexes;
+    }
 }
\ No newline at end of file

lib/public/IDBConnection.php

Indentation +209 added lines, -209 removed lines

@@ -46,239 +46,239 @@
  */
 interface IDBConnection {
 
-	const ADD_MISSING_INDEXES_EVENT = self::class . '::ADD_MISSING_INDEXES';
-	const CHECK_MISSING_INDEXES_EVENT = self::class . '::CHECK_MISSING_INDEXES';
+    const ADD_MISSING_INDEXES_EVENT = self::class . '::ADD_MISSING_INDEXES';
+    const CHECK_MISSING_INDEXES_EVENT = self::class . '::CHECK_MISSING_INDEXES';
 
-	/**
-	 * Gets the QueryBuilder for the connection.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder
-	 * @since 8.2.0
-	 */
-	public function getQueryBuilder();
+    /**
+     * Gets the QueryBuilder for the connection.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder
+     * @since 8.2.0
+     */
+    public function getQueryBuilder();
 
-	/**
-	 * Used to abstract the ownCloud database access away
-	 * @param string $sql the sql query with ? placeholder for params
-	 * @param int $limit the maximum number of rows
-	 * @param int $offset from which row we want to start
-	 * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
-	 * @since 6.0.0
-	 */
-	public function prepare($sql, $limit=null, $offset=null);
+    /**
+     * Used to abstract the ownCloud database access away
+     * @param string $sql the sql query with ? placeholder for params
+     * @param int $limit the maximum number of rows
+     * @param int $offset from which row we want to start
+     * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
+     * @since 6.0.0
+     */
+    public function prepare($sql, $limit=null, $offset=null);
 
-	/**
-	 * Executes an, optionally parameterized, SQL query.
-	 *
-	 * If the query is parameterized, a prepared statement is used.
-	 * If an SQLLogger is configured, the execution is logged.
-	 *
-	 * @param string $query The SQL query to execute.
-	 * @param string[] $params The parameters to bind to the query, if any.
-	 * @param array $types The types the previous parameters are in.
-	 * @return \Doctrine\DBAL\Driver\Statement The executed statement.
-	 * @since 8.0.0
-	 */
-	public function executeQuery($query, array $params = array(), $types = array());
+    /**
+     * Executes an, optionally parameterized, SQL query.
+     *
+     * If the query is parameterized, a prepared statement is used.
+     * If an SQLLogger is configured, the execution is logged.
+     *
+     * @param string $query The SQL query to execute.
+     * @param string[] $params The parameters to bind to the query, if any.
+     * @param array $types The types the previous parameters are in.
+     * @return \Doctrine\DBAL\Driver\Statement The executed statement.
+     * @since 8.0.0
+     */
+    public function executeQuery($query, array $params = array(), $types = array());
 
-	/**
-	 * Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
-	 * and returns the number of affected rows.
-	 *
-	 * This method supports PDO binding types as well as DBAL mapping types.
-	 *
-	 * @param string $query The SQL query.
-	 * @param array $params The query parameters.
-	 * @param array $types The parameter types.
-	 * @return integer The number of affected rows.
-	 * @since 8.0.0
-	 */
-	public function executeUpdate($query, array $params = array(), array $types = array());
+    /**
+     * Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
+     * and returns the number of affected rows.
+     *
+     * This method supports PDO binding types as well as DBAL mapping types.
+     *
+     * @param string $query The SQL query.
+     * @param array $params The query parameters.
+     * @param array $types The parameter types.
+     * @return integer The number of affected rows.
+     * @since 8.0.0
+     */
+    public function executeUpdate($query, array $params = array(), array $types = array());
 
-	/**
-	 * Used to get the id of the just inserted element
-	 * @param string $table the name of the table where we inserted the item
-	 * @return int the id of the inserted element
-	 * @since 6.0.0
-	 */
-	public function lastInsertId($table = null);
+    /**
+     * Used to get the id of the just inserted element
+     * @param string $table the name of the table where we inserted the item
+     * @return int the id of the inserted element
+     * @since 6.0.0
+     */
+    public function lastInsertId($table = null);
 
-	/**
-	 * Insert a row if the matching row does not exists.
-	 *
-	 * @param string $table The table name (will replace *PREFIX* with the actual prefix)
-	 * @param array $input data that should be inserted into the table  (column name => value)
-	 * @param array|null $compare List of values that should be checked for "if not exists"
-	 *				If this is null or an empty array, all keys of $input will be compared
-	 *				Please note: text fields (clob) must not be used in the compare array
-	 * @return int number of inserted rows
-	 * @throws \Doctrine\DBAL\DBALException
-	 * @since 6.0.0 - parameter $compare was added in 8.1.0, return type changed from boolean in 8.1.0
-	 */
-	public function insertIfNotExist($table, $input, array $compare = null);
+    /**
+     * Insert a row if the matching row does not exists.
+     *
+     * @param string $table The table name (will replace *PREFIX* with the actual prefix)
+     * @param array $input data that should be inserted into the table  (column name => value)
+     * @param array|null $compare List of values that should be checked for "if not exists"
+     *				If this is null or an empty array, all keys of $input will be compared
+     *				Please note: text fields (clob) must not be used in the compare array
+     * @return int number of inserted rows
+     * @throws \Doctrine\DBAL\DBALException
+     * @since 6.0.0 - parameter $compare was added in 8.1.0, return type changed from boolean in 8.1.0
+     */
+    public function insertIfNotExist($table, $input, array $compare = null);
 
-	/**
-	 * Insert or update a row value
-	 *
-	 * @param string $table
-	 * @param array $keys (column name => value)
-	 * @param array $values (column name => value)
-	 * @param array $updatePreconditionValues ensure values match preconditions (column name => value)
-	 * @return int number of new rows
-	 * @throws \Doctrine\DBAL\DBALException
-	 * @throws PreconditionNotMetException
-	 * @since 9.0.0
-	 */
-	public function setValues($table, array $keys, array $values, array $updatePreconditionValues = []);
+    /**
+     * Insert or update a row value
+     *
+     * @param string $table
+     * @param array $keys (column name => value)
+     * @param array $values (column name => value)
+     * @param array $updatePreconditionValues ensure values match preconditions (column name => value)
+     * @return int number of new rows
+     * @throws \Doctrine\DBAL\DBALException
+     * @throws PreconditionNotMetException
+     * @since 9.0.0
+     */
+    public function setValues($table, array $keys, array $values, array $updatePreconditionValues = []);
 
-	/**
-	 * Create an exclusive read+write lock on a table
-	 *
-	 * Important Note: Due to the nature how locks work on different DBs, it is
-	 * only possible to lock one table at a time. You should also NOT start a
-	 * transaction while holding a lock.
-	 *
-	 * @param string $tableName
-	 * @since 9.1.0
-	 */
-	public function lockTable($tableName);
+    /**
+     * Create an exclusive read+write lock on a table
+     *
+     * Important Note: Due to the nature how locks work on different DBs, it is
+     * only possible to lock one table at a time. You should also NOT start a
+     * transaction while holding a lock.
+     *
+     * @param string $tableName
+     * @since 9.1.0
+     */
+    public function lockTable($tableName);
 
-	/**
-	 * Release a previous acquired lock again
-	 *
-	 * @since 9.1.0
-	 */
-	public function unlockTable();
+    /**
+     * Release a previous acquired lock again
+     *
+     * @since 9.1.0
+     */
+    public function unlockTable();
 
-	/**
-	 * Start a transaction
-	 * @since 6.0.0
-	 */
-	public function beginTransaction();
+    /**
+     * Start a transaction
+     * @since 6.0.0
+     */
+    public function beginTransaction();
 
-	/**
-	 * Check if a transaction is active
-	 *
-	 * @return bool
-	 * @since 8.2.0
-	 */
-	public function inTransaction();
+    /**
+     * Check if a transaction is active
+     *
+     * @return bool
+     * @since 8.2.0
+     */
+    public function inTransaction();
 
-	/**
-	 * Commit the database changes done during a transaction that is in progress
-	 * @since 6.0.0
-	 */
-	public function commit();
+    /**
+     * Commit the database changes done during a transaction that is in progress
+     * @since 6.0.0
+     */
+    public function commit();
 
-	/**
-	 * Rollback the database changes done during a transaction that is in progress
-	 * @since 6.0.0
-	 */
-	public function rollBack();
+    /**
+     * Rollback the database changes done during a transaction that is in progress
+     * @since 6.0.0
+     */
+    public function rollBack();
 
-	/**
-	 * Gets the error code and message as a string for logging
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getError();
+    /**
+     * Gets the error code and message as a string for logging
+     * @return string
+     * @since 6.0.0
+     */
+    public function getError();
 
-	/**
-	 * Fetch the SQLSTATE associated with the last database operation.
-	 *
-	 * @return integer The last error code.
-	 * @since 8.0.0
-	 */
-	public function errorCode();
+    /**
+     * Fetch the SQLSTATE associated with the last database operation.
+     *
+     * @return integer The last error code.
+     * @since 8.0.0
+     */
+    public function errorCode();
 
-	/**
-	 * Fetch extended error information associated with the last database operation.
-	 *
-	 * @return array The last error information.
-	 * @since 8.0.0
-	 */
-	public function errorInfo();
+    /**
+     * Fetch extended error information associated with the last database operation.
+     *
+     * @return array The last error information.
+     * @since 8.0.0
+     */
+    public function errorInfo();
 
-	/**
-	 * Establishes the connection with the database.
-	 *
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function connect();
+    /**
+     * Establishes the connection with the database.
+     *
+     * @return bool
+     * @since 8.0.0
+     */
+    public function connect();
 
-	/**
-	 * Close the database connection
-	 * @since 8.0.0
-	 */
-	public function close();
+    /**
+     * Close the database connection
+     * @since 8.0.0
+     */
+    public function close();
 
-	/**
-	 * Quotes a given input parameter.
-	 *
-	 * @param mixed $input Parameter to be quoted.
-	 * @param int $type Type of the parameter.
-	 * @return string The quoted parameter.
-	 * @since 8.0.0
-	 */
-	public function quote($input, $type = IQueryBuilder::PARAM_STR);
+    /**
+     * Quotes a given input parameter.
+     *
+     * @param mixed $input Parameter to be quoted.
+     * @param int $type Type of the parameter.
+     * @return string The quoted parameter.
+     * @since 8.0.0
+     */
+    public function quote($input, $type = IQueryBuilder::PARAM_STR);
 
-	/**
-	 * Gets the DatabasePlatform instance that provides all the metadata about
-	 * the platform this driver connects to.
-	 *
-	 * @return \Doctrine\DBAL\Platforms\AbstractPlatform The database platform.
-	 * @since 8.0.0
-	 */
-	public function getDatabasePlatform();
+    /**
+     * Gets the DatabasePlatform instance that provides all the metadata about
+     * the platform this driver connects to.
+     *
+     * @return \Doctrine\DBAL\Platforms\AbstractPlatform The database platform.
+     * @since 8.0.0
+     */
+    public function getDatabasePlatform();
 
-	/**
-	 * Drop a table from the database if it exists
-	 *
-	 * @param string $table table name without the prefix
-	 * @since 8.0.0
-	 */
-	public function dropTable($table);
+    /**
+     * Drop a table from the database if it exists
+     *
+     * @param string $table table name without the prefix
+     * @since 8.0.0
+     */
+    public function dropTable($table);
 
-	/**
-	 * Check if a table exists
-	 *
-	 * @param string $table table name without the prefix
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function tableExists($table);
+    /**
+     * Check if a table exists
+     *
+     * @param string $table table name without the prefix
+     * @return bool
+     * @since 8.0.0
+     */
+    public function tableExists($table);
 
-	/**
-	 * Escape a parameter to be used in a LIKE query
-	 *
-	 * @param string $param
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function escapeLikeParameter($param);
+    /**
+     * Escape a parameter to be used in a LIKE query
+     *
+     * @param string $param
+     * @return string
+     * @since 9.0.0
+     */
+    public function escapeLikeParameter($param);
 
-	/**
-	 * Check whether or not the current database support 4byte wide unicode
-	 *
-	 * @return bool
-	 * @since 11.0.0
-	 */
-	public function supports4ByteText();
+    /**
+     * Check whether or not the current database support 4byte wide unicode
+     *
+     * @return bool
+     * @since 11.0.0
+     */
+    public function supports4ByteText();
 
-	/**
-	 * Create the schema of the connected database
-	 *
-	 * @return Schema
-	 * @since 13.0.0
-	 */
-	public function createSchema();
+    /**
+     * Create the schema of the connected database
+     *
+     * @return Schema
+     * @since 13.0.0
+     */
+    public function createSchema();
 
-	/**
-	 * Migrate the database to the given schema
-	 *
-	 * @param Schema $toSchema
-	 * @since 13.0.0
-	 */
-	public function migrateToSchema(Schema $toSchema);
+    /**
+     * Migrate the database to the given schema
+     *
+     * @param Schema $toSchema
+     * @since 13.0.0
+     */
+    public function migrateToSchema(Schema $toSchema);
 }

Spacing +3 added lines, -3 removed lines

@@ -46,8 +46,8 @@ 
  */
 interface IDBConnection {
 
-	const ADD_MISSING_INDEXES_EVENT = self::class . '::ADD_MISSING_INDEXES';
-	const CHECK_MISSING_INDEXES_EVENT = self::class . '::CHECK_MISSING_INDEXES';
+	const ADD_MISSING_INDEXES_EVENT = self::class.'::ADD_MISSING_INDEXES';
+	const CHECK_MISSING_INDEXES_EVENT = self::class.'::CHECK_MISSING_INDEXES';
 
 	/**
 	 * Gets the QueryBuilder for the connection.
@@ -65,7 +65,7 @@ 
 	 * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
 	 * @since 6.0.0
 	 */
-	public function prepare($sql, $limit=null, $offset=null);
+	public function prepare($sql, $limit = null, $offset = null);
 
 	/**
 	 * Executes an, optionally parameterized, SQL query.