Custom header support for JKU/X5U key sets

Author: Spomky

src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSetSource/JKU.php

@@ -14,6 +14,7 @@
 namespace Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement\JWKSetSource;
 
 use Jose\Bundle\JoseFramework\DependencyInjection\Source\AbstractSource;
+use Jose\Component\Core\JWKSet;
 use Jose\Component\KeyManagement\JKUFactory;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -30,14 +31,14 @@ final class JKU extends AbstractSource implements JWKSetSource
      */
     public function createDefinition(ContainerBuilder $container, array $config): Definition
     {
-        $definition = new Definition(\Jose\Component\Core\JWKSet::class);
+        $definition = new Definition(JWKSet::class);
         $definition->setFactory([
             new Reference(JKUFactory::class),
             'loadFromUrl',
         ]);
         $definition->setArguments([
             $config['url'],
-//            $config['headers'],
+            $config['headers'],
         ]);
         $definition->addTag('jose.jwkset');
 
@@ -64,6 +65,13 @@ public function addConfiguration(NodeDefinition $node)
                     ->info('URL of the key set.')
                     ->isRequired()
                 ->end()
+                ->arrayNode('headers')
+                    ->treatNullLike([])
+                    ->treatFalseLike([])
+                    ->info('Header key/value pairs added to the request.')
+                    ->useAttributeAsKey('name')
+                    ->prototype('variable')->end()
+                ->end()
             ->end();
     }
 }

src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSetSource/X5U.php

@@ -14,6 +14,7 @@
 namespace Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement\JWKSetSource;
 
 use Jose\Bundle\JoseFramework\DependencyInjection\Source\AbstractSource;
+use Jose\Component\Core\JWKSet;
 use Jose\Component\KeyManagement\X5UFactory;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -30,14 +31,14 @@ final class X5U extends AbstractSource implements JWKSetSource
      */
     public function createDefinition(ContainerBuilder $container, array $config): Definition
     {
-        $definition = new Definition(\Jose\Component\Core\JWKSet::class);
+        $definition = new Definition(JWKSet::class);
         $definition->setFactory([
             new Reference(X5UFactory::class),
             'loadFromUrl',
         ]);
         $definition->setArguments([
             $config['url'],
-//            $config['headers'],
+            $config['headers'],
         ]);
         $definition->addTag('jose.jwkset');
 
@@ -64,6 +65,13 @@ public function addConfiguration(NodeDefinition $node)
                     ->info('URL of the key set.')
                     ->isRequired()
                 ->end()
+                ->arrayNode('headers')
+                    ->treatNullLike([])
+                    ->treatFalseLike([])
+                    ->info('Header key/value pairs added to the request.')
+                    ->useAttributeAsKey('name')
+                    ->prototype('variable')->end()
+                ->end()
             ->end();
     }
 }