Merge pull request #24556 from nextcloud/revert/stable20/21090

Revert "Do not read certificate bundle from data dir by default"
nextcloud · Dec 4, 2020 · c7cb8eb · c7cb8eb
2 parents a53871f + b1e9752
commit c7cb8eb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/lib/private/Http/Client/Client.php b/lib/private/Http/Client/Client.php
@@ -98,18 +98,18 @@ private function buildRequestOptions(array $options): array {
 	}
 
 	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->certificateManager->listCertificates() === []) {
-			return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
+		if ($this->config->getSystemValue('installed', false)) {
+			return $this->certificateManager->getAbsoluteBundlePath(null);
 		}
 
-		return $this->certificateManager->getAbsoluteBundlePath();
+		return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
 	}
 
 	/**

diff --git a/tests/lib/Http/Client/ClientTest.php b/tests/lib/Http/Client/ClientTest.php
@@ -461,8 +461,9 @@ public function testSetDefaultOptionsWithNotInstalled(): void {
 			->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',