Limit query length (#147)

EmicoEcommerce · Feb 21, 2024 · 83799ea · 83799ea
1 parent f1c9865
commit 83799ea
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/Block/Catalog/Product/ProductList/Toolbar/Plugin.php b/Block/Catalog/Product/ProductList/Toolbar/Plugin.php
@@ -79,6 +79,10 @@ public function aroundGetAvailableOrders(Toolbar $subject, Closure $proceed)
             return $proceed();
         }
 
+        if (!$this->context->getResponse()) {
+            return $proceed();
+        }
+
         /** @var SortFieldType[] $sortFields */
         $sortFields = $this->context->getResponse()->getProperties()->getSortFields();
 

diff --git a/Model/Catalog/Layer/Url/Strategy/QueryParameterStrategy.php b/Model/Catalog/Layer/Url/Strategy/QueryParameterStrategy.php
@@ -22,6 +22,7 @@
 use Magento\Framework\App\Request\Http as MagentoHttpRequest;
 use Magento\Framework\Stdlib\CookieManagerInterface;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Url;
+use Magento\Search\Helper\Data;
 
 class QueryParameterStrategy implements UrlInterface, FilterApplierInterface, CategoryUrlInterface
 {
@@ -89,6 +90,11 @@ class QueryParameterStrategy implements UrlInterface, FilterApplierInterface, Ca
      */
     protected $layerUrl;
 
+    /**
+     * @var Data
+     */
+    private Data $searchConfig;
+
     /**
      * Magento constructor.
      *
@@ -102,13 +108,15 @@ public function __construct(
         StrategyHelper $strategyHelper,
         CookieManagerInterface $cookieManager,
         TweakwiseConfig $config,
-        Url $layerUrl
+        Url $layerUrl,
+        Data $searchConfig
     ) {
         $this->url = $url;
         $this->strategyHelper = $strategyHelper;
         $this->cookieManager = $cookieManager;
         $this->tweakwiseConfig = $config;
         $this->layerUrl = $layerUrl;
+        $this->searchConfig = $searchConfig;
     }
 
     /**
@@ -508,7 +516,19 @@ protected function getLimit(MagentoHttpRequest $request)
      */
     protected function getSearch(MagentoHttpRequest $request)
     {
-        return $request->getQuery(self::PARAM_SEARCH);
+        $searchLength = 100;
+        $search = $request->getQuery(self::PARAM_SEARCH);
+        $maxQueryLength = $this->searchConfig->getMaxQueryLength();
+
+        if ($maxQueryLength) {
+            if ($maxQueryLength < $searchLength) {
+                $searchLength = $maxQueryLength;
+            }
+        }
+
+        $search = mb_substr((string) $search, 0, $searchLength);
+
+        return $search;
     }
 
     /**