Use composer bundled cacerts rather than self-bundled (#34697)

Author: wilsonge

administrator/components/com_admin/script.php

@@ -5859,8 +5859,9 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/media/com_fields/js/admin-field-edit-modal.js',
 			'/media/com_fields/js/admin-field-edit-modal.min.js',
 			'/media/com_fields/js/admin-field-edit-modal.min.js.gz',
-			// 4.0 from RC 2 to RC 3
+			// 4.0 from RC 3 to RC 4
 			'/components/com_contact/layouts/joomla/form/renderfield.php',
+			'/libraries/src/Http/Transport/cacert.pem'
 		);
 
 		$folders = array(

composer.json

@@ -81,7 +81,8 @@
         "ext-simplexml": "*",
         "psr/log": "~1.0",
         "ext-gd": "*",
-        "web-auth/webauthn-lib": "2.1.*"
+        "web-auth/webauthn-lib": "2.1.*",
+        "composer/ca-bundle": "^1.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5",

composer.lock

@@ -10,6 +10,7 @@
 
 \defined('JPATH_PLATFORM') or die;
 
+use Composer\CaBundle\CaBundle;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Http\Response;
 use Joomla\CMS\Http\TransportInterface;
@@ -69,7 +70,7 @@ public function request($method, UriInterface $uri, $data = null, array $headers
 		$options[CURLOPT_NOBODY] = ($method === 'HEAD');
 
 		// Initialize the certificate store
-		$options[CURLOPT_CAINFO] = $this->getOption('curl.certpath', __DIR__ . '/cacert.pem');
+		$options[CURLOPT_CAINFO] = $this->getOption('curl.certpath', CaBundle::getBundledCaBundlePath());
 
 		// If data exists let's encode it and make sure our Content-type header is set.
 		if (isset($data))

libraries/src/Http/Transport/CurlTransport.php

@@ -10,6 +10,7 @@
 
 \defined('JPATH_PLATFORM') or die;
 
+use Composer\CaBundle\CaBundle;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Http\Response;
 use Joomla\CMS\Http\TransportInterface;
@@ -137,7 +138,7 @@ public function request($method, UriInterface $uri, $data = null, array $headers
 				'http' => $options,
 				'ssl' => array(
 					'verify_peer'      => true,
-					'cafile'           => $this->getOption('stream.certpath', __DIR__ . '/cacert.pem'),
+					'cafile'           => $this->getOption('stream.certpath', CaBundle::getBundledCaBundlePath()),
 					'verify_depth'     => 5,
 					'verify_peer_name' => true,
 				),