From dc4eed19cd179817c9ff1180aa9dfef1e6af8559 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Fri, 14 Jun 2024 13:35:32 +0200
Subject: [PATCH] fix: don't use custom certificate bundle if no customer
 certificates are configured

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 lib/private/Security/CertificateManager.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/private/Security/CertificateManager.php b/lib/private/Security/CertificateManager.php
index 3a87b7f1a004e..479cb0e3abda8 100644
--- a/lib/private/Security/CertificateManager.php
+++ b/lib/private/Security/CertificateManager.php
@@ -241,17 +241,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;