]> source.dussan.org Git - nextcloud-server.git/commitdiff
Use legacy method when ownCloud is not yet installed
authorLukas Reschke <lukas@owncloud.com>
Tue, 12 Jan 2016 20:47:49 +0000 (21:47 +0100)
committerLukas Reschke <lukas@owncloud.com>
Tue, 12 Jan 2016 20:47:49 +0000 (21:47 +0100)
The new `\OCP\ICertificateManager::getAbsoluteBundlePath` API instantiiates an ownCloud view which makes the installation fail as it queries the DB before it actually is setup. This change uses the old approach again for the case that the installation is not yet setup.

The client service is required for the `.htaccess` effectivity check in the setup. In the future we could move this to a JS based one (as we have for the other setupchecks) so we can get rid of such hacks.

Fixes https://github.com/owncloud/core/issues/21669 which was a regression in master caused by https://github.com/owncloud/core/issues/21336

lib/private/http/client/client.php

index 8cddfc3ae03ec49f3a9f7933749cce33d91ee22d..98d7ee03b19a7c50342d941655fe9141fe11f3e9 100644 (file)
@@ -62,7 +62,14 @@ class Client implements IClient {
                if ($this->certificateManager->listCertificates() !== []) {
                        $this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath());
                } else {
-                       $this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath(null));
+                       // If the instance is not yet setup we need to use the static path as
+                       // $this->certificateManager->getAbsoluteBundlePath() tries to instantiiate
+                       // a view
+                       if($this->config->getSystemValue('installed', false)) {
+                               $this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath(null));
+                       } else {
+                               $this->client->setDefaultOption('verify', \OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
+                       }
                }
 
                $this->client->setDefaultOption('headers/User-Agent', 'ownCloud Server Crawler');