mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Morris Jobke 2020-05-25 15:03:52 +02:00
parent cbde1d102c
commit 18b0d753f2
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/private/Http/Client/Client.php
View File

@ -97,18 +97,18 @@ class Client implements IClient {
} }
private function getCertBundle(): string { 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 // If the instance is not yet setup we need to use the static path as
// $this->certificateManager->getAbsoluteBundlePath() tries to instantiiate // $this->certificateManager->getAbsoluteBundlePath() tries to instantiiate
// a view // a view
if ($this->config->getSystemValue('installed', false)) { if ($this->config->getSystemValue('installed', false) === false) {
return $this->certificateManager->getAbsoluteBundlePath(null); return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
} }
return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt'; if ($this->certificateManager->listCertificates() === []) {
return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
}
return $this->certificateManager->getAbsoluteBundlePath();
} }
/** /**

5
tests/lib/Http/Client/ClientTest.php
View File

@ -461,9 +461,8 @@ class ClientTest extends \Test\TestCase {
->with('installed', false) ->with('installed', false)
->willReturn(false); ->willReturn(false);
$this->certificateManager $this->certificateManager
->expects($this->once()) ->expects($this->never())
->method('listCertificates') ->method('listCertificates');
->willReturn([]);
$this->assertEquals([ $this->assertEquals([
'verify' => \OC::$SERVERROOT . '/resources/config/ca-bundle.crt', 'verify' => \OC::$SERVERROOT . '/resources/config/ca-bundle.crt',