make csrf_token() usable without forms

xabbuh · xabbuh · commit 2abd80eb458e · 2017-11-28T18:57:19.000+01:00
The Twig function `csrf_token()` is currently only registered when the
Form component is installed. However, this function is also useful, for
example, when creating simple login forms for which you do not need the
full Form component.
diff --git a/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php b/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Security\Acl\Voter\FieldVote;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
@@ -25,10 +26,12 @@
 class SecurityExtension extends AbstractExtension
 {
     private $securityChecker;
+    private $csrfTokenManager;
 
-    public function __construct(AuthorizationCheckerInterface $securityChecker = null)
+    public function __construct(AuthorizationCheckerInterface $securityChecker = null, CsrfTokenManagerInterface $csrfTokenManager = null)
     {
         $this->securityChecker = $securityChecker;
+        $this->csrfTokenManager = $csrfTokenManager;
     }
 
     public function isGranted($role, $object = null, $field = null)
@@ -48,14 +51,25 @@ public function isGranted($role, $object = null, $field = null)
         }
     }
 
+    public function getCsrfToken(string $tokenId): string
+    {
+        return $this->csrfTokenManager->getToken($tokenId)->getValue();
+    }
+
     /**
      * {@inheritdoc}
      */
     public function getFunctions()
     {
-        return array(
+        $functions = array(
             new TwigFunction('is_granted', array($this, 'isGranted')),
         );
+
+        if (null !== $this->csrfTokenManager) {
+            $functions[] = new TwigFunction('csrf_token', array($this, 'getCsrfToken'));
+        }
+
+        return $functions;
     }
 
     /**
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_twig.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_twig.xml
@@ -15,6 +15,7 @@
         <service id="twig.extension.security" class="Symfony\Bridge\Twig\Extension\SecurityExtension">
             <tag name="twig.extension" />
             <argument type="service" id="security.authorization_checker" on-invalid="ignore" />
+            <argument type="service" id="security.csrf.token_manager" on-invalid="null" />
         </service>
     </services>
 </container>
