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

This reverts commit 18b0d753f2.
This commit is contained in:
Morris Jobke 2020-12-04 13:37:10 +01:00
parent a53871f629
commit b1e9752169
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
2 changed files with 10 additions and 9 deletions

View File

@ -98,20 +98,20 @@ 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 instantiate
// a view
if ($this->config->getSystemValue('installed', false) === false) {
return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
if ($this->config->getSystemValue('installed', false)) {
return $this->certificateManager->getAbsoluteBundlePath(null);
}
if ($this->certificateManager->listCertificates() === []) {
return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
}
return $this->certificateManager->getAbsoluteBundlePath();
}
/**
* Returns a null or an associative array specifiying the proxy URI for
* 'http' and 'https' schemes, in addition to a 'no' key value pair

View File

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