security-package: Added try/catch to Magento\ReCaptchaUi\Model\RequestHandler.php

Author: engcom-Foxtrot

ReCaptchaUi/Model/RequestHandler.php

@@ -11,8 +11,10 @@
 use Magento\Framework\App\ActionFlag;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
+use Magento\Framework\Exception\InputException;
 use Magento\Framework\Message\ManagerInterface as MessageManagerInterface;
 use Magento\ReCaptchaValidationApi\Api\ValidatorInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * @inheritdoc
@@ -44,25 +46,33 @@ class RequestHandler implements RequestHandlerInterface
      */
     private $actionFlag;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param CaptchaResponseResolverInterface $captchaResponseResolver
      * @param ValidationConfigResolverInterface $validationConfigResolver
      * @param ValidatorInterface $captchaValidator
      * @param MessageManagerInterface $messageManager
      * @param ActionFlag $actionFlag
+     * @param LoggerInterface $logger
      */
     public function __construct(
         CaptchaResponseResolverInterface $captchaResponseResolver,
         ValidationConfigResolverInterface $validationConfigResolver,
         ValidatorInterface $captchaValidator,
         MessageManagerInterface $messageManager,
-        ActionFlag $actionFlag
+        ActionFlag $actionFlag,
+        LoggerInterface $logger
     ) {
         $this->captchaResponseResolver = $captchaResponseResolver;
         $this->validationConfigResolver = $validationConfigResolver;
         $this->captchaValidator = $captchaValidator;
         $this->messageManager = $messageManager;
         $this->actionFlag = $actionFlag;
+        $this->logger = $logger;
     }
 
     /**
@@ -74,20 +84,18 @@ public function execute(
         HttpResponseInterface $response,
         string $redirectOnFailureUrl
     ): void {
-
         try {
             $reCaptchaResponse = $this->captchaResponseResolver->resolve($request);
-            $validationConfig = $this->validationConfigResolver->get($key);
+        } catch (InputException $e) {
+            $reCaptchaResponse = '';
+            $this->logger->error($e);
+        }
 
-            $validationResult = $this->captchaValidator->isValid($reCaptchaResponse, $validationConfig);
-            if (false === $validationResult->isValid()) {
-                $this->messageManager->addErrorMessage($validationConfig->getValidationFailureMessage());
-                $this->actionFlag->set('', Action::FLAG_NO_DISPATCH, true);
+        $validationConfig = $this->validationConfigResolver->get($key);
 
-                $response->setRedirect($redirectOnFailureUrl);
-            }
-        } catch (\Exception $e) {
-            $this->messageManager->addErrorMessage($e->getMessage());
+        $validationResult = $this->captchaValidator->isValid($reCaptchaResponse, $validationConfig);
+        if (false === $validationResult->isValid()) {
+            $this->messageManager->addErrorMessage($validationConfig->getValidationFailureMessage());
             $this->actionFlag->set('', Action::FLAG_NO_DISPATCH, true);
 
             $response->setRedirect($redirectOnFailureUrl);