Merge pull request #46069 from nextcloud/backport/45877/stable29

[stable29] fix: don't use custom certificate bundle if no customer certificates are configured
nextcloud · Jul 10, 2024 · 650aec5 · 650aec5
2 parents 0f33283 + 36ba1d8
commit 650aec5
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/lib/private/Security/CertificateManager.php b/lib/private/Security/CertificateManager.php
@@ -228,17 +228,17 @@ public function getAbsoluteBundlePath(): string {
 			if ($this->bundlePath === null) {
 				if (!$this->hasCertificates()) {
 					$this->bundlePath = \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
-				}
-
-				if ($this->needsRebundling()) {
-					$this->createCertificateBundle();
-				}
+				} else {
+					if ($this->needsRebundling()) {
+						$this->createCertificateBundle();
+					}
 
-				$certificateBundle = $this->getCertificateBundle();
-				$this->bundlePath = $this->view->getLocalFile($certificateBundle) ?: null;
+					$certificateBundle = $this->getCertificateBundle();
+					$this->bundlePath = $this->view->getLocalFile($certificateBundle) ?: null;
 
-				if ($this->bundlePath === null) {
-					throw new \RuntimeException('Unable to get certificate bundle "' . $certificateBundle . '".');
+					if ($this->bundlePath === null) {
+						throw new \RuntimeException('Unable to get certificate bundle "' . $certificateBundle . '".');
+					}
 				}
 			}
 			return $this->bundlePath;