diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-05-25 15:03:52 +0200 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2020-05-25 17:53:23 +0000 |
| commit | 64df6aaf854ca3ca1cb121cf4470d758f154d827 (patch) | |
| tree | a055c44ce7457ea0ba6a2faea94bd5eacb5167b0 /lib | |
| parent | 1d816add44fb0058d1fd927585a4e894c1d39132 (diff) | |
| download | nextcloud-server-64df6aaf854ca3ca1cb121cf4470d758f154d827.tar.gz nextcloud-server-64df6aaf854ca3ca1cb121cf4470d758f154d827.zip | |
Do not read certificate bundle from data dir by default
Before the resources/config/ca-bundle.crt was only used when the list of custom
certificates was empty and the instance was not installed. But it should also
be used when the list is empty and the instance is installed.
This is inverting the logic to stop if the instance is not installed to use the
default bundle. And it also does this when the list is empty.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Http/Client/Client.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/private/Http/Client/Client.php b/lib/private/Http/Client/Client.php index c52d90ff8ec..3e606caae19 100644 --- a/lib/private/Http/Client/Client.php +++ b/lib/private/Http/Client/Client.php @@ -81,18 +81,18 @@ class Client implements IClient { } private function getCertBundle(): string { - if ($this->certificateManager->listCertificates() !== []) { - return $this->certificateManager->getAbsoluteBundlePath(); - } - // 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)) { - return $this->certificateManager->getAbsoluteBundlePath(null); + if ($this->config->getSystemValue('installed', false) === false) { + return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt'; + } + + if ($this->certificateManager->listCertificates() === []) { + return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt'; } - return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt'; + return $this->certificateManager->getAbsoluteBundlePath(); } /** |