Merge pull request #192 from julienpillias/master

add trusted roles
excelwebzone · Feb 22, 2018 · d41d646 · d41d646
2 parents 6cd55f8 + 04c582d
commit d41d646
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -28,6 +28,7 @@ public function getConfigTreeBuilder()
                 ->booleanNode('ajax')->defaultFalse()->end()
                 ->scalarNode('locale_key')->defaultValue('%kernel.default_locale%')->end()
                 ->booleanNode('locale_from_request')->defaultFalse()->end()
+				->arrayNode('trusted_roles')->prototype('scalar')->end()
             ->end()
         ;
 

diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
@@ -27,5 +27,7 @@ services:
             - '@request_stack'
             - '%ewz_recaptcha.http_proxy%'
             - '%ewz_recaptcha.verify_host%'
+            - '@security.authorization_checker'
+            - '%ewz_recaptcha.trusted_roles%'
         tags:
             - { name: validator.constraint_validator, alias: 'ewz_recaptcha.true' }
diff --git a/src/Validator/Constraints/IsTrueValidator.php b/src/Validator/Constraints/IsTrueValidator.php
@@ -3,6 +3,7 @@
 namespace EWZ\Bundle\RecaptchaBundle\Validator\Constraints;
 
 use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\ValidatorException;
@@ -44,6 +45,20 @@ class IsTrueValidator extends ConstraintValidator
      */
     protected $verifyHost;
 
+    /**
+     * Authorization Checker
+     *
+     * @var AuthorizationChecker
+     */
+    protected $authorizationChecker;
+
+    /**
+     * Trusted Roles
+     *
+     * @var Array
+     */
+    protected $trusted_roles;
+
     /**
      * The reCAPTCHA server URL's.
      */
@@ -56,13 +71,15 @@ class IsTrueValidator extends ConstraintValidator
      * @param array        $httpProxy
      * @param bool         $verifyHost
      */
-    public function __construct($enabled, $privateKey, RequestStack $requestStack, array $httpProxy, $verifyHost)
+    public function __construct($enabled, $privateKey, RequestStack $requestStack, array $httpProxy, $verifyHost, AuthorizationCheckerInterface $authorizationChecker, $trusted_roles)
     {
         $this->enabled = $enabled;
         $this->privateKey = $privateKey;
         $this->requestStack = $requestStack;
         $this->httpProxy = $httpProxy;
         $this->verifyHost = $verifyHost;
+        $this->authorizationChecker = $authorizationChecker;
+        $this->trusted_roles = $trusted_roles;
     }
 
     /**
@@ -75,6 +92,11 @@ public function validate($value, Constraint $constraint)
             return;
         }
 
+        // if we have an authorized role
+        if ($this->authorizationChecker->isGranted($this->trusted_roles)) {
+            return true;
+        }
+
         // define variable for recaptcha check answer
         $masterRequest = $this->requestStack->getMasterRequest();
         $remoteip = $masterRequest->getClientIp();