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

Revert "[stable19] Do not read certificate bundle from data dir by default"

This commit is contained in:
Roeland Jago Douma 2020-07-03 14:21:38 +02:00 committed by GitHub
parent d203f8f985
commit 905fab3356
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,18 +93,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) === false) { if ($this->config->getSystemValue('installed', false)) {
return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt'; return $this->certificateManager->getAbsoluteBundlePath(null);
} }
if ($this->certificateManager->listCertificates() === []) { return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
}
return $this->certificateManager->getAbsoluteBundlePath();
} }
/** /**

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

@ -460,8 +460,9 @@ class ClientTest extends \Test\TestCase {
->with('installed', false) ->with('installed', false)
->willReturn(false); ->willReturn(false);
$this->certificateManager $this->certificateManager
->expects($this->never()) ->expects($this->once())
->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',