X5U Certification Loading

This commit fixes a bug when the X5U certificates already have the BEGIN and END statements.
web-token · Jan 4, 2018 · 5237fe4 · 5237fe4
1 parent a1b60e8
commit 5237fe4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/Component/KeyManagement/X5UFactory.php b/src/Component/KeyManagement/X5UFactory.php
@@ -58,7 +58,9 @@ public function loadFromUrl(string $url, array $header = []): JWKSet
 
         $keys = [];
         foreach ($data as $kid => $cert) {
-            $cert = '-----BEGIN CERTIFICATE-----'.PHP_EOL.$cert.PHP_EOL.'-----END CERTIFICATE-----';
+            if (false === strpos($cert, '-----BEGIN CERTIFICATE-----')) {
+                $cert = '-----BEGIN CERTIFICATE-----'.PHP_EOL.$cert.PHP_EOL.'-----END CERTIFICATE-----';
+            }
             $jwk = KeyConverter::loadKeyFromCertificate($cert);
             if (is_string($kid)) {
                 $jwk['kid'] = $kid;