Add doctrine cache ua family parser

nelmio · Aug 23, 2016 · 00ff590 · 00ff590
1 parent e8977f2
commit 00ff590
Show file tree

Hide file tree

Showing 15 changed files with 240 additions and 20 deletions.
diff --git a/DependencyInjection/Compiler/UAParserCompilerPass.php b/DependencyInjection/Compiler/UAParserCompilerPass.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Nelmio\SecurityBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+
+class UAParserCompilerPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->hasParameter('nelmio_browser_adaptive_parser')) {
+            return;
+        }
+
+        $container
+            ->getDefinition('nelmio_security.ua_parser')
+            ->setArguments(array($container->getDefinition($container->getParameter('nelmio_browser_adaptive_parser'))));
+    }
+}
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -210,9 +210,27 @@ private function addReportOrEnforceNode($reportOrEnforce)
             ->end();
 
         $children
-            ->booleanNode('browser_adaptive')
+            ->arrayNode('browser_adaptive')
+                ->canBeEnabled()
                 ->info('Do not send directives that browser do not support')
-                ->defaultValue(false)
+                ->addDefaultsIfNotSet()
+                ->children()
+                    ->scalarNode('parser')
+                        ->defaultValue('nelmio_security.ua_parser.ua_php')
+                    ->end()
+                ->end()
+                ->beforeNormalization()
+                    ->always(function ($v) {
+                        if (!is_array($v)) {
+                            return array(
+                                'enabled' => $v,
+                                'parser' => 'nelmio_security.ua_parser.ua_php',
+                            );
+                        }
+
+                        return $v;
+                    })
+                ->end()
             ->end();
 
         foreach (DirectiveSet::getNames() as $name => $type) {

diff --git a/DependencyInjection/NelmioSecurityExtension.php b/DependencyInjection/NelmioSecurityExtension.php
@@ -157,14 +157,19 @@ private function buildDirectiveSetDefinition(ContainerBuilder $container, $confi
 
         $pmDefinition = $container->getDefinition('nelmio_security.policy_manager');
 
-        if (isset($config[$type]) && $config[$type]['browser_adaptive']) {
-            $service = $container->getParameter('nelmio_security.ua_parser.service');
+        if (isset($config[$type]) && $config[$type]['browser_adaptive']['enabled']) {
+            $service = $config[$type]['browser_adaptive']['parser'];
 
             if ($service === 'nelmio_security.ua_parser.ua_php' && !class_exists('UAParser\Parser')) {
                 throw new \RuntimeException('You must require "ua-parser/uap-php" as a dependency to use the browser_adaptive feature or configure your own "nelmio_security.ua_parser.service"');
             }
 
-            $pmDefinition->setArguments(array($container->getDefinition($service)));
+            $container->setParameter('nelmio_browser_adaptive_parser', $service);
+
+            $uaParser = $container->getDefinition('nelmio_security.ua_parser');
+            $uaParser->setArguments(array($container->getDefinition('nelmio_security.ua_parser.ua_php')));
+
+            $pmDefinition->setArguments(array($uaParser));
         }
 
         $directiveDefinition->setArguments(array($pmDefinition, $config, $type));

diff --git a/NelmioSecurityBundle.php b/NelmioSecurityBundle.php
@@ -11,6 +11,7 @@
 
 namespace Nelmio\SecurityBundle;
 
+use Nelmio\SecurityBundle\DependencyInjection\Compiler\UAParserCompilerPass;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Nelmio\SecurityBundle\DependencyInjection\Compiler\CSPTwigCompilerPass;
@@ -22,5 +23,6 @@ public function build(ContainerBuilder $container)
         parent::build($container);
 
         $container->addCompilerPass(new CSPTwigCompilerPass());
+        $container->addCompilerPass(new UAParserCompilerPass());
     }
 }
diff --git a/README.md b/README.md
@@ -93,7 +93,8 @@ nelmio_security:
         content_types: []
         enforce:
             level1_fallback: false
-            browser_adaptive: false
+            browser_adaptive:
+                enabled: false
             report-uri: %router.request_context.base_url%/nelmio/csp/report
             default-src:
                 - 'none'
@@ -168,7 +169,8 @@ nelmio_security:
             level1_fallback: true
             # Only send directives supported by the browser, defaults to false
             # This is a port of https://github.com/twitter/secureheaders/blob/83a564a235c8be1a8a3901373dbc769da32f6ed7/lib/secure_headers/headers/policy_management.rb#L97
-            browser_adaptive: false
+            browser_adaptive:
+                enabled: false
             report-uri: %router.request_context.base_url%/nelmio/csp/report
             default-src: [ 'self' ]
             frame-src: [ 'https://www.youtube.com' ]
@@ -186,7 +188,8 @@ nelmio_security:
             level1_fallback: true
             # Only send directives supported by the browser, defaults to false
             # This is a port of https://github.com/twitter/secureheaders/blob/83a564a235c8be1a8a3901373dbc769da32f6ed7/lib/secure_headers/headers/policy_management.rb#L97
-            browser_adaptive: true
+            browser_adaptive:
+                enabled: true
             report-uri: %router.request_context.base_url%/nelmio/csp/report
             script-src:
                 - 'self'

diff --git a/Resources/config/csp.yml b/Resources/config/csp.yml
@@ -1,11 +1,14 @@
 parameters:
     nelmio_security.nonce_generator.number_of_bytes: 16
-    nelmio_security.ua_parser.service: nelmio_security.ua_parser.ua_php
 
 services:
-    nelmio_security.ua_parser.ua_php:
-        class: Nelmio\SecurityBundle\UserAgent\UAParserUserAgentParser
+    nelmio_security.ua_parser:
+        class: Nelmio\SecurityBundle\UserAgent\UserAgentParser
         public: false
+
+    nelmio_security.ua_parser.ua_php:
+        class: Nelmio\SecurityBundle\UserAgent\UAFamilyParser\UAFamilyParser
+        public: true
         arguments: ['@nelmio_security.ua_parser.ua_php.provider']
 
     nelmio_security.ua_parser.ua_php.provider:

diff --git a/Resources/config/csp_legacy.yml b/Resources/config/csp_legacy.yml
@@ -1,11 +1,14 @@
 parameters:
     nelmio_security.nonce_generator.number_of_bytes: 16
-    nelmio_security.ua_parser.service: nelmio_security.ua_parser.ua_php
 
 services:
-    nelmio_security.ua_parser.ua_php:
-        class: Nelmio\SecurityBundle\UserAgent\UAParserUserAgentParser
+    nelmio_security.ua_parser:
+        class: Nelmio\SecurityBundle\UserAgent\UserAgentParser
         public: false
+
+    nelmio_security.ua_parser.ua_php:
+        class: Nelmio\SecurityBundle\UserAgent\UAFamilyParser\UAFamilyParser
+        public: true
         arguments: ['@nelmio_security.ua_parser.ua_php.provider']
 
     nelmio_security.ua_parser.ua_php.provider:

diff --git a/Tests/ContentSecurityPolicy/DirectiveSetTest.php b/Tests/ContentSecurityPolicy/DirectiveSetTest.php
@@ -4,7 +4,8 @@
 
 use Nelmio\SecurityBundle\ContentSecurityPolicy\DirectiveSet;
 use Nelmio\SecurityBundle\ContentSecurityPolicy\PolicyManager;
-use Nelmio\SecurityBundle\UserAgent\UAParserUserAgentParser;
+use Nelmio\SecurityBundle\UserAgent\UAFamilyParser\UAFamilyParser;
+use Nelmio\SecurityBundle\UserAgent\UserAgentParser;
 use Symfony\Component\HttpFoundation\Request;
 use UAParser\Parser;
 
@@ -30,7 +31,7 @@ public function testFromConfig($expected, $ua, array $directives)
 
     private function createPolicyManager()
     {
-        return new PolicyManager(new UAParserUserAgentParser(Parser::create()));
+        return new PolicyManager(new UserAgentParser(new UAFamilyParser(Parser::create())));
     }
 
     public function provideVariousConfig()

diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -63,6 +63,30 @@ public function testCspWithLevel2()
         );
     }
 
+    public function testBrowserAdaptiveBoolean()
+    {
+        $this->processYamlConfiguration(
+            "csp:\n".
+            "  report:\n".
+            "    script-src:\n".
+            "      - 'self'\n".
+            "    browser_adaptive: true\n"
+        );
+    }
+
+    public function testBrowserAdaptiveArray()
+    {
+        $this->processYamlConfiguration(
+            "csp:\n".
+            "  report:\n".
+            "    script-src:\n".
+            "      - 'self'\n".
+            "    browser_adaptive:\n".
+            "      enabled: true\n".
+            "      parser: service_name"
+        );
+    }
+
     private function processYamlConfiguration($config)
     {
         $parser = new Parser();

diff --git a/UserAgent/UAFamilyParser/DoctrineCacheUAFamilyParser.php b/UserAgent/UAFamilyParser/DoctrineCacheUAFamilyParser.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Nelmio SecurityBundle.
+ *
+ * (c) Nelmio <hello@nelm.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Nelmio\SecurityBundle\UserAgent\UAFamilyParser;
+
+use Doctrine\Common\Cache\Cache;
+
+class DoctrineCacheUAFamilyParser implements UAFamilyParserInterface
+{
+    private $cache;
+    private $parser;
+    private $lifetime;
+    private $prefix;
+
+    public function __construct(Cache $cache, UAFamilyParser $parser, $lifetime = 0, $prefix = 'nelmio-ua-parser-')
+    {
+        $this->parser = $parser;
+        $this->cache = $cache;
+        $this->lifetime = $lifetime;
+        $this->prefix = $prefix;
+    }
+
+    public function getUaFamily($userAgent)
+    {
+        $id = $this->prefix.md5($userAgent);
+
+        if (false !== $name = $this->cache->fetch($id)) {
+            return $name;
+        }
+
+        $name = $this->parser->getUaFamily($userAgent);
+
+        $this->cache->save($id, $name, $this->lifetime);
+
+        return $name;
+    }
+}
diff --git a/UserAgent/UAFamilyParser/PsrCacheUAFamilyParser.php b/UserAgent/UAFamilyParser/PsrCacheUAFamilyParser.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Nelmio SecurityBundle.
+ *
+ * (c) Nelmio <hello@nelm.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Nelmio\SecurityBundle\UserAgent\UAFamilyParser;
+
+use Psr\Cache\CacheItemPoolInterface;
+use Psr\Cache\CacheException;
+
+class PsrCacheUAFamilyParser implements UAFamilyParserInterface
+{
+    private $cache;
+    private $parser;
+    private $lifetime;
+    private $prefix;
+
+    public function __construct(CacheItemPoolInterface $cache, UAFamilyParser $parser, $lifetime = 0, $prefix = 'nelmio-ua-parser-')
+    {
+        $this->parser = $parser;
+        $this->cache = $cache;
+        $this->lifetime = $lifetime;
+        $this->prefix = $prefix;
+    }
+
+    public function getUaFamily($userAgent)
+    {
+        $id = $this->prefix.md5($userAgent);
+
+        $item = $this->cache->getItem($id);
+
+        if ($item->isHit()) {
+            return $item->get();
+        }
+
+        $name = $this->parser->getUaFamily($userAgent);
+
+        $this->cache->save($item->set($name)->expiresAfter($this->lifetime));
+
+        return $name;
+    }
+}
diff --git a/UserAgent/UAFamilyParser/UAFamilyParser.php b/UserAgent/UAFamilyParser/UAFamilyParser.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Nelmio SecurityBundle.
+ *
+ * (c) Nelmio <hello@nelm.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Nelmio\SecurityBundle\UserAgent\UAFamilyParser;
+
+use UAParser\Parser;
+
+class UAFamilyParser implements UAFamilyParserInterface
+{
+    private $parser;
+
+    public function __construct(Parser $parser)
+    {
+        $this->parser = $parser;
+    }
+
+    public function getUaFamily($userAgent)
+    {
+        return strtolower($this->parser->parse($userAgent)->ua->family);
+    }
+}
diff --git a/UserAgent/UAFamilyParser/UAFamilyParserInterface.php b/UserAgent/UAFamilyParser/UAFamilyParserInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Nelmio SecurityBundle.
+ *
+ * (c) Nelmio <hello@nelm.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Nelmio\SecurityBundle\UserAgent\UAFamilyParser;
+
+interface UAFamilyParserInterface
+{
+    public function getUaFamily($userAgent);
+}
diff --git a/UserAgent/UAParserUserAgentParser.php → UserAgent/UserAgentParser.php b/UserAgent/UAParserUserAgentParser.php → UserAgent/UserAgentParser.php
@@ -11,13 +11,13 @@
 
 namespace Nelmio\SecurityBundle\UserAgent;
 
-use UAParser\Parser;
+use Nelmio\SecurityBundle\UserAgent\UAFamilyParser\UAFamilyParserInterface;
 
-class UAParserUserAgentParser implements UserAgentParserInterface
+class UserAgentParser implements UserAgentParserInterface
 {
     private $parser;
 
-    public function __construct(Parser $parser)
+    public function __construct(UAFamilyParserInterface $parser)
     {
         $this->parser = $parser;
     }
@@ -27,7 +27,7 @@ public function __construct(Parser $parser)
      */
     public function getBrowser($userAgent)
     {
-        $name = strtolower($this->parser->parse($userAgent)->ua->family);
+        $name = $this->parser->getUaFamily($userAgent);
 
         switch (true) {
             case 'chrome' === $name:

diff --git a/composer.json b/composer.json
@@ -20,7 +20,9 @@
         "paragonie/random_compat": "~1.0|~2.0"
     },
     "require-dev": {
+        "doctrine/cache": "^1.0",
         "phpunit/phpunit": "^4.5",
+        "psr/cache": "^1.0",
         "twig/twig": "^1.24",
         "ua-parser/uap-php": "^3.4"
     },