Merge pull request #543 from web-token/3.3.x-merge-up-into-4.0.x_JT8er826

Merge release 3.3.3 into 4.0.x

Author: Spomky

ecs.php

@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use PhpCsFixer\Fixer\Alias\MbStrFunctionsFixer;
 use PhpCsFixer\Fixer\ArrayNotation\ArraySyntaxFixer;
 use PhpCsFixer\Fixer\ClassNotation\ProtectedToPrivateFixer;
 use PhpCsFixer\Fixer\Comment\HeaderCommentFixer;
@@ -30,6 +29,8 @@
 use Symplify\EasyCodingStandard\Config\ECSConfig;
 use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
+//use PhpCsFixer\Fixer\Alias\MbStrFunctionsFixer;
+
 return static function (ECSConfig $config): void {
     $header = '';
     $config->import(SetList::PSR_12);
@@ -53,7 +54,7 @@
     $config->rule(ProtectedToPrivateFixer::class);
     $config->rule(DeclareStrictTypesFixer::class);
     $config->rule(NativeConstantInvocationFixer::class);
-    $config->rule(MbStrFunctionsFixer::class);
+    //$config->rule(MbStrFunctionsFixer::class);
     $config->rule(LinebreakAfterOpeningTagFixer::class);
     $config->rule(CombineConsecutiveIssetsFixer::class);
     $config->rule(CombineConsecutiveUnsetsFixer::class);

performance/JWE/EncryptionBench.php

@@ -46,17 +46,14 @@
  */
 abstract class EncryptionBench
 {
-    private AlgorithmManager $contentEncryptionAlgorithmsManager;
-
-    private AlgorithmManager $keyEncryptionAlgorithmsManager;
-
-    private CompressionMethodManager $compressionMethodsManager;
+    private AlgorithmManager $algorithmsManager;
 
     private JWESerializerManager $serializerManager;
 
     public function init(): void
     {
-        $this->keyEncryptionAlgorithmsManager = new AlgorithmManager([
+        $this->algorithmsManager = new AlgorithmManager([
+            // Key Encryption
             new A128KW(),
             new A192KW(),
             new A256KW(),
@@ -74,8 +71,8 @@ public function init(): void
             new RSA15(),
             new RSAOAEP(),
             new RSAOAEP256(),
-        ]);
-        $this->contentEncryptionAlgorithmsManager = new AlgorithmManager([
+
+            // Content Encryption
             new A128CBCHS256(),
             new A192CBCHS384(),
             new A256CBCHS512(),
@@ -97,11 +94,7 @@ public function init(): void
      */
     public function encryption(array $params): void
     {
-        $jweBuilder = new JWEBuilder(
-            $this->getKeyEncryptionAlgorithmsManager(),
-            $this->getContentEncryptionAlgorithmsManager(),
-            $this->getCompressionMethodsManager()
-        );
+        $jweBuilder = new JWEBuilder($this->getAlgorithmsManager());
         $jweBuilder
             ->withPayload($params['payload'])
             ->withAAD($this->getAAD())
@@ -118,11 +111,7 @@ public function encryption(array $params): void
      */
     public function decryption(array $params): void
     {
-        $jweLoader = new JWEDecrypter(
-            $this->getKeyEncryptionAlgorithmsManager(),
-            $this->getContentEncryptionAlgorithmsManager(),
-            $this->getCompressionMethodsManager()
-        );
+        $jweLoader = new JWEDecrypter($this->getAlgorithmsManager());
         $jwe = $this->serializerManager->unserialize($params['input']);
         $keyset = JWKSet::createFromKeyData($params['recipient_keys']);
         $jweLoader->decryptUsingKeySet($jwe, $keyset, 0);
@@ -143,18 +132,8 @@ abstract public function dataRecipientPublicKeys(): array;
 
     abstract protected function getAAD(): ?string;
 
-    private function getKeyEncryptionAlgorithmsManager(): AlgorithmManager
-    {
-        return $this->keyEncryptionAlgorithmsManager;
-    }
-
-    private function getContentEncryptionAlgorithmsManager(): AlgorithmManager
-    {
-        return $this->contentEncryptionAlgorithmsManager;
-    }
-
-    private function getCompressionMethodsManager(): CompressionMethodManager
+    private function getAlgorithmsManager(): AlgorithmManager
     {
-        return $this->compressionMethodsManager;
+        return $this->algorithmsManager;
     }
 }

phpstan-baseline.neon

@@ -8,7 +8,6 @@
 use Jose\Bundle\JoseFramework\Event\JWEBuiltSuccessEvent;
 use Jose\Bundle\JoseFramework\Event\JWEDecryptionFailureEvent;
 use Jose\Bundle\JoseFramework\Event\JWEDecryptionSuccessEvent;
-use Jose\Component\Encryption\Compression\CompressionMethodManagerFactory;
 use Jose\Component\Encryption\JWEBuilder;
 use Jose\Component\Encryption\JWEDecrypter;
 use Jose\Component\Encryption\JWELoader;
@@ -59,7 +58,6 @@ final class JWECollector implements Collector, EventSubscriberInterface
     private array $jweLoaders = [];
 
     public function __construct(
-        private readonly ?CompressionMethodManagerFactory $compressionMethodManagerFactory = null,
         private readonly ?JWESerializerManagerFactory $jweSerializerManagerFactory = null
     ) {
     }
@@ -70,7 +68,6 @@ public function __construct(
     #[Override]
     public function collect(array &$data, Request $request, Response $response, ?Throwable $exception = null): void
     {
-        $this->collectSupportedCompressionMethods($data);
         $this->collectSupportedJWESerializations($data);
         $this->collectSupportedJWEBuilders($data);
         $this->collectSupportedJWEDecrypters($data);
@@ -128,21 +125,6 @@ public function catchJweBuiltFailure(JWEBuiltFailureEvent $event): void
         $this->jweBuiltFailures[] = $cloner->cloneVar($event);
     }
 
-    /**
-     * @param array<string, array<string, mixed>> $data
-     */
-    private function collectSupportedCompressionMethods(array &$data): void
-    {
-        $data['jwe']['compression_methods'] = [];
-        if ($this->compressionMethodManagerFactory === null) {
-            return;
-        }
-        $compressionMethods = $this->compressionMethodManagerFactory->all();
-        foreach ($compressionMethods as $alias => $compressionMethod) {
-            $data['jwe']['compression_methods'][$alias] = $compressionMethod->name();
-        }
-    }
-
     /**
      * @param array<string, array<string, mixed>> $data
      */
@@ -166,11 +148,7 @@ private function collectSupportedJWEBuilders(array &$data): void
         $data['jwe']['jwe_builders'] = [];
         foreach ($this->jweBuilders as $id => $jweBuilder) {
             $data['jwe']['jwe_builders'][$id] = [
-                'key_encryption_algorithms' => $jweBuilder->getKeyEncryptionAlgorithmManager()
-                    ->list(),
-                'content_encryption_algorithms' => $jweBuilder->getContentEncryptionAlgorithmManager()
-                    ->list(),
-                'compression_methods' => $jweBuilder->getCompressionMethodManager()
+                'encryption_algorithms' => $jweBuilder->getKeyEncryptionAlgorithmManager()
                     ->list(),
             ];
         }
@@ -184,11 +162,7 @@ private function collectSupportedJWEDecrypters(array &$data): void
         $data['jwe']['jwe_decrypters'] = [];
         foreach ($this->jweDecrypters as $id => $jweDecrypter) {
             $data['jwe']['jwe_decrypters'][$id] = [
-                'key_encryption_algorithms' => $jweDecrypter->getKeyEncryptionAlgorithmManager()
-                    ->list(),
-                'content_encryption_algorithms' => $jweDecrypter->getContentEncryptionAlgorithmManager()
-                    ->list(),
-                'compression_methods' => $jweDecrypter->getCompressionMethodManager()
+                'encryption_algorithms' => $jweDecrypter->getKeyEncryptionAlgorithmManager()
                     ->list(),
             ];
         }
@@ -204,15 +178,9 @@ private function collectSupportedJWELoaders(array &$data): void
             $data['jwe']['jwe_loaders'][$id] = [
                 'serializers' => $jweLoader->getSerializerManager()
                     ->names(),
-                'key_encryption_algorithms' => $jweLoader->getJweDecrypter()
+                'encryption_algorithms' => $jweLoader->getJweDecrypter()
                     ->getKeyEncryptionAlgorithmManager()
                     ->list(),
-                'content_encryption_algorithms' => $jweLoader->getJweDecrypter()
-                    ->getContentEncryptionAlgorithmManager()
-                    ->list(),
-                'compression_methods' => $jweLoader->getJweDecrypter()
-                    ->getCompressionMethodManager()
-                    ->list(),
             ];
         }
     }

src/Bundle/DataCollector/JWECollector.php

@@ -24,29 +24,14 @@ public function getNodeDefinition(NodeDefinition $node): void
             ->info('If true, the service will be public, else private.')
             ->defaultTrue()
             ->end()
-            ->arrayNode('key_encryption_algorithms')
+            ->arrayNode('encryption_algorithms')
             ->info('A list of supported key encryption algorithms.')
             ->useAttributeAsKey('name')
             ->isRequired()
             ->requiresAtLeastOneElement()
             ->scalarPrototype()
             ->end()
             ->end()
-            ->arrayNode('content_encryption_algorithms')
-            ->info('A list of supported content encryption algorithms.')
-            ->useAttributeAsKey('name')
-            ->isRequired()
-            ->requiresAtLeastOneElement()
-            ->scalarPrototype()
-            ->end()
-            ->end()
-            ->arrayNode('compression_methods')
-            ->info('A list of supported compression methods.')
-            ->useAttributeAsKey('name')
-            ->defaultValue(['DEF'])
-            ->scalarPrototype()
-            ->end()
-            ->end()
             ->arrayNode('tags')
             ->info('A list of tags to be associated to the service.')
             ->useAttributeAsKey('name')

src/Bundle/DependencyInjection/Compiler/CompressionMethodCompilerPass.php

@@ -4,7 +4,6 @@
 
 namespace Jose\Bundle\JoseFramework\DependencyInjection\Source\Encryption;
 
-use Jose\Bundle\JoseFramework\DependencyInjection\Compiler\CompressionMethodCompilerPass;
 use Jose\Bundle\JoseFramework\DependencyInjection\Compiler\EncryptionSerializerCompilerPass;
 use Jose\Bundle\JoseFramework\DependencyInjection\Source\Source;
 use Jose\Bundle\JoseFramework\DependencyInjection\Source\SourceWithCompilerPasses;
@@ -54,7 +53,6 @@ public function load(array $configs, ContainerBuilder $container): void
         $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../../../Resources/config'));
         $loader->load('jwe_services.php');
         $loader->load('jwe_serializers.php');
-        $loader->load('compression_methods.php');
 
         $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../../../Resources/config/Algorithms/'));
         foreach ($this->getAlgorithmsFiles() as $class => $file) {
@@ -104,7 +102,7 @@ public function prepend(ContainerBuilder $container, array $config): array
     #[Override]
     public function getCompilerPasses(): array
     {
-        return [new EncryptionSerializerCompilerPass(), new CompressionMethodCompilerPass()];
+        return [new EncryptionSerializerCompilerPass()];
     }
 
     private function getAlgorithmsFiles(): array

src/Bundle/DependencyInjection/Source/Encryption/AbstractEncryptionSource.php

@@ -27,11 +27,7 @@ public function load(array $configs, ContainerBuilder $container): void
             $definition = new Definition(JWEBuilderService::class);
             $definition
                 ->setFactory([new Reference(JWEBuilderFactory::class), 'create'])
-                ->setArguments([
-                    $itemConfig['key_encryption_algorithms'],
-                    $itemConfig['content_encryption_algorithms'],
-                    $itemConfig['compression_methods'],
-                ])
+                ->setArguments([$itemConfig['encryption_algorithms']])
                 ->addTag('jose.jwe_builder')
                 ->setPublic($itemConfig['is_public']);
             foreach ($itemConfig['tags'] as $id => $attributes) {

src/Bundle/DependencyInjection/Source/Encryption/EncryptionSource.php

@@ -27,11 +27,7 @@ public function load(array $configs, ContainerBuilder $container): void
             $definition = new Definition(JWEDecrypterService::class);
             $definition
                 ->setFactory([new Reference(JWEDecrypterFactory::class), 'create'])
-                ->setArguments([
-                    $itemConfig['key_encryption_algorithms'],
-                    $itemConfig['content_encryption_algorithms'],
-                    $itemConfig['compression_methods'],
-                ])
+                ->setArguments([$itemConfig['encryption_algorithms']])
                 ->addTag('jose.jwe_decrypter')
                 ->setPublic($itemConfig['is_public']);
             foreach ($itemConfig['tags'] as $id => $attributes) {

src/Bundle/DependencyInjection/Source/Encryption/JWEBuilder.php

@@ -31,9 +31,7 @@ public function load(array $configs, ContainerBuilder $container): void
                 ->setFactory([new Reference(JWELoaderFactory::class), 'create'])
                 ->setArguments([
                     $itemConfig['serializers'],
-                    $itemConfig['key_encryption_algorithms'],
-                    $itemConfig['content_encryption_algorithms'],
-                    $itemConfig['compression_methods'],
+                    $itemConfig['encryption_algorithms'],
                     $itemConfig['header_checkers'],
                 ])
                 ->addTag('jose.jwe_loader')
@@ -61,27 +59,13 @@ public function getNodeDefinition(NodeDefinition $node): void
             ->info('If true, the service will be public, else private.')
             ->defaultTrue()
             ->end()
-            ->arrayNode('key_encryption_algorithms')
+            ->arrayNode('encryption_algorithms')
             ->info('A list of key encryption algorithm aliases.')
             ->useAttributeAsKey('name')
             ->isRequired()
             ->scalarPrototype()
             ->end()
             ->end()
-            ->arrayNode('content_encryption_algorithms')
-            ->info('A list of key encryption algorithm aliases.')
-            ->useAttributeAsKey('name')
-            ->isRequired()
-            ->scalarPrototype()
-            ->end()
-            ->end()
-            ->arrayNode('compression_methods')
-            ->info('A list of compression method aliases.')
-            ->useAttributeAsKey('name')
-            ->defaultValue(['DEF'])
-            ->scalarPrototype()
-            ->end()
-            ->end()
             ->arrayNode('serializers')
             ->info('A list of signature serializer aliases.')
             ->useAttributeAsKey('name')