Update spomky-labs/pki-framework version and improve error handling

This commit updates the 'spomky-labs/pki-framework' dependency to version 1.2.1 in both 'src/Library/composer.json' and 'composer.json' files. It also adds an exception dump in 'src/Library/KeyManagement/KeyConverter/KeyConverter.php' file for better error debugging.~
web-token · Apr 9, 2024 · c66f1b7 · c66f1b7
1 parent 3005ee6
commit c66f1b7
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 33 deletions.
diff --git a/composer.json b/composer.json
@@ -53,7 +53,7 @@
         "brick/math": "^0.12",
         "psr/clock": "^1.0",
         "psr/event-dispatcher": "^1.0",
-        "spomky-labs/pki-framework": "^1.1",
+        "spomky-labs/pki-framework": "^1.2.1",
         "symfony/config": "^7.0",
         "symfony/console": "^7.0",
         "symfony/dependency-injection": "^7.0",

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1840,6 +1840,41 @@ parameters:
 			count: 1
 			path: src/Library/KeyManagement/KeyConverter/ECKey.php
 
+		-
+			message: "#^Access to an undefined property Jose\\\\Component\\\\KeyManagement\\\\UrlKeySetFactory\\:\\:\\$requestFactory\\.$#"
+			count: 1
+			path: src/Library/KeyManagement/UrlKeySetFactory.php
+
+		-
+			message: "#^Call to an undefined method Jose\\\\Component\\\\KeyManagement\\\\UrlKeySetFactory\\:\\:sendPsrRequest\\(\\)\\.$#"
+			count: 1
+			path: src/Library/KeyManagement/UrlKeySetFactory.php
+
+		-
+			message: "#^Call to function assert\\(\\) with true will always evaluate to true\\.$#"
+			count: 1
+			path: src/Library/KeyManagement/UrlKeySetFactory.php
+
+		-
+			message: "#^Class Psr\\\\Http\\\\Client\\\\ClientInterface not found\\.$#"
+			count: 3
+			path: src/Library/KeyManagement/UrlKeySetFactory.php
+
+		-
+			message: "#^Instanceof between Symfony\\\\Contracts\\\\HttpClient\\\\HttpClientInterface and Symfony\\\\Contracts\\\\HttpClient\\\\HttpClientInterface will always evaluate to true\\.$#"
+			count: 3
+			path: src/Library/KeyManagement/UrlKeySetFactory.php
+
+		-
+			message: "#^Method Jose\\\\Component\\\\KeyManagement\\\\UrlKeySetFactory\\:\\:getContent\\(\\) should return string but returns mixed\\.$#"
+			count: 1
+			path: src/Library/KeyManagement/UrlKeySetFactory.php
+
+		-
+			message: "#^Result of && is always false\\.$#"
+			count: 1
+			path: src/Library/KeyManagement/UrlKeySetFactory.php
+
 		-
 			message: "#^Parameter \\#2 \\$recipient of method Jose\\\\Component\\\\NestedToken\\\\NestedTokenLoader\\:\\:checkContentTypeHeader\\(\\) expects int, int\\|null given\\.$#"
 			count: 1

diff --git a/src/Bundle/DependencyInjection/Source/KeyManagement/JKUSource.php b/src/Bundle/DependencyInjection/Source/KeyManagement/JKUSource.php
@@ -35,15 +35,15 @@ public function getNodeDefinition(NodeDefinition $node): void
     {
         $node->children()
             ->arrayNode('jku_factory')
-                ->canBeEnabled()
-                ->children()
-                    ->scalarNode('client')
-                        ->info('HTTP Client used to retrieve key sets.')
-                        ->isRequired()
-                    ->end()
-                ->end()
+            ->canBeEnabled()
+            ->children()
+            ->scalarNode('client')
+            ->info('HTTP Client used to retrieve key sets.')
+            ->isRequired()
             ->end()
-        ->end();
+            ->end()
+            ->end()
+            ->end();
     }
 
     #[Override]

diff --git a/src/Deprecated/Core/composer.json b/src/Deprecated/Core/composer.json
diff --git a/src/Library/KeyManagement/KeyConverter/KeyConverter.php b/src/Library/KeyManagement/KeyConverter/KeyConverter.php
@@ -277,15 +277,6 @@ private static function loadPrivateKey(PEM $pem): array
     {
         try {
             $key = PrivateKey::fromPEM($pem);
-            $curve = self::getCurve($key->algorithmIdentifier()->oid());
-            $values = [
-                'kty' => 'OKP',
-                'crv' => $curve,
-                'd' => Base64UrlSafe::encodeUnpadded($key->privateKeyData()),
-            ];
-            return self::populatePoints($key, $values);
-        } catch (Throwable) {
-            // no break
             switch ($key->algorithmIdentifier()->oid()) {
                 case AlgorithmIdentifier::OID_RSASSA_PSS_ENCRYPTION:
                     assert($key instanceof RSASSAPSSPrivateKey);
@@ -317,19 +308,6 @@ private static function loadPrivateKey(PEM $pem): array
         } catch (Throwable $e) {
             throw new InvalidArgumentException('Unable to load the key.', 0, $e);
         }
-        try {
-            $key = PublicKey::fromPEM($pem);
-            $curve = self::getCurve($key->algorithmIdentifier()->oid());
-            self::checkType($curve);
-            return [
-                'kty' => 'OKP',
-                'crv' => $curve,
-                'x' => Base64UrlSafe::encodeUnpadded((string) $key->subjectPublicKey()),
-            ];
-        } catch (Throwable) {
-            // no break
-        }
-        throw new InvalidArgumentException('Unsupported key type');
     }
 
     /**

diff --git a/src/Library/KeyManagement/UrlKeySetFactory.php b/src/Library/KeyManagement/UrlKeySetFactory.php
@@ -6,10 +6,10 @@
 
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Http\Client\ClientInterface;
-use Psr\Http\Message\RequestFactoryInterface;
 use RuntimeException;
 use Symfony\Component\Cache\Adapter\NullAdapter;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
+use function assert;
 
 /**
  * @see \Jose\Tests\Component\KeyManagement\UrlKeySetFactoryTest

diff --git a/src/Library/composer.json b/src/Library/composer.json
@@ -43,7 +43,7 @@
         "ext-mbstring": "*",
         "brick/math": "^0.12",
         "psr/clock": "^1.0",
-        "spomky-labs/pki-framework": "^1.1"
+        "spomky-labs/pki-framework": "^1.2.1"
     },
     "conflict": {
         "spomky-labs/jose": "*"