Merge pull request #31 from FELDSAM-INC/feldsam/update-ca-cert

Use composer/ca-bundle instead of bundled root cert
mhujer · Jun 7, 2024 · e5ccd10 · e5ccd10
2 parents 8eb9a0d + 9fd291f
commit e5ccd10
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 67 deletions.
diff --git a/composer.json b/composer.json
@@ -20,15 +20,13 @@
   "require": {
     "php": "~7.4||~8.0",
     "ext-curl": "*",
-    "guzzlehttp/guzzle": "~6.1|~7.0"
+    "guzzlehttp/guzzle": "~6.1|~7.0",
+    "composer/ca-bundle": "^1.5"
   },
   "require-dev": {
     "phpunit/phpunit": "9.5.10",
     "squizlabs/php_codesniffer": "3.6.1"
   },
-  "suggest": {
-    "composer/ca-bundle": "Provides regularly updated root certificates list"
-  },
   "autoload": {
     "psr-4": {
       "FioApi\\": "src/FioApi"

diff --git a/src/FioApi/Downloader.php b/src/FioApi/Downloader.php
@@ -3,55 +3,34 @@
 
 namespace FioApi;
 
+use Composer\CaBundle\CaBundle;
 use FioApi\Exceptions\InternalErrorException;
 use FioApi\Exceptions\TooGreedyException;
+use GuzzleHttp\Client;
 use GuzzleHttp\ClientInterface;
+use GuzzleHttp\RequestOptions;
 use Psr\Http\Message\ResponseInterface;
 
 class Downloader
 {
     /** @var UrlBuilder */
     protected $urlBuilder;
 
-    /** @var \GuzzleHttp\Client */
+    /** @var Client */
     protected $client;
 
-    /** @var string */
-    protected $certificatePath;
-
-    public function __construct(
-        string $token,
-        \GuzzleHttp\ClientInterface $client = null
-    ) {
+    public function __construct(string $token, ClientInterface $client = null)
+    {
         $this->urlBuilder = new UrlBuilder($token);
         $this->client = $client;
     }
 
-    public function setCertificatePath(string $path)
-    {
-        $this->certificatePath = $path;
-    }
-
-    public function getCertificatePath(): string
-    {
-        if ($this->certificatePath) {
-            return $this->certificatePath;
-        }
-
-        if (class_exists('\Composer\CaBundle\CaBundle')) {
-            return \Composer\CaBundle\CaBundle::getSystemCaRootBundlePath();
-        } elseif (class_exists('\Kdyby\CurlCaBundle\CertificateHelper')) {
-            return \Kdyby\CurlCaBundle\CertificateHelper::getCaInfoFile();
-        }
-
-        //Key downloaded from https://www.geotrust.com/resources/root-certificates/
-        return __DIR__ . '/keys/Geotrust_PCA_G3_Root.pem';
-    }
-
     public function getClient(): ClientInterface
     {
         if (!$this->client) {
-            $this->client = new \GuzzleHttp\Client();
+            $this->client = new Client([
+                RequestOptions::VERIFY => CaBundle::getSystemCaRootBundlePath()
+            ]);
         }
         return $this->client;
     }
@@ -79,7 +58,7 @@ public function setLastId(string $id): void
         $url = $this->urlBuilder->buildSetLastIdUrl($id);
 
         try {
-            $client->request('get', $url, ['verify' => $this->getCertificatePath()]);
+            $client->request('get', $url);
         } catch (\GuzzleHttp\Exception\BadResponseException $e) {
             $this->handleException($e);
         }
@@ -91,7 +70,7 @@ private function downloadTransactionsList(string $url): TransactionList
 
         try {
             /** @var ResponseInterface $response */
-            $response = $client->request('get', $url, ['verify' => $this->getCertificatePath()]);
+            $response = $client->request('get', $url);
         } catch (\GuzzleHttp\Exception\BadResponseException $e) {
             $this->handleException($e);
         }

diff --git a/src/FioApi/keys/Geotrust_PCA_G3_Root.pem b/src/FioApi/keys/Geotrust_PCA_G3_Root.pem
diff --git a/tests/FioApi/DownloaderTest.php b/tests/FioApi/DownloaderTest.php
@@ -92,11 +92,4 @@ public function testDownloaderSetsLastId()
 
         $this->assertSame('https://fioapi.fio.cz/v1/rest/set-last-id/validToken/123456/', (string) $request->getUri());
     }
-
-    public function testDownloaderSetCertificatePath()
-    {
-        $downloader = new Downloader('validToken');
-        $downloader->setCertificatePath('foo.pem');
-        $this->assertSame('foo.pem', $downloader->getCertificatePath());
-    }
 }