Test/remove 2.4.4

.github/workflows/code_quality.yml

@@ -75,11 +75,6 @@ jobs:
           #  composer: "v1"
           #  elasticsearch: "7.10.2"
 
-          - magento: "2.4.4"
-            php: "8.1"
-            composer: "v2"
-            opensearch: "1.2.0"
-
           - magento: "2.4.5"
             php: "8.1"
             composer: "v2"
@@ -89,7 +84,6 @@ jobs:
             php: "8.2"
             composer: "v2"
             opensearch: "2.5.0"
-
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/shielding-check-cron-manual.yaml

@@ -17,10 +17,10 @@ jobs:
       run: |
         cat ./temp.json | jq . > etc/shielding/datacenters.json
         rm -f ./temp.json
-        echo "::set-output name=diff-count::$(git diff --name-only | wc -l)"
+        echo "diff-count=$(git diff --name-only | wc -l)" >> "$GITHUB_OUTPUT"
         SHA1=`sha1sum etc/shielding/datacenters.json | awk '{print $1}'`
-        echo "::set-output name=sha1::$SHA1"
-        echo "::set-output name=pr-count::$(gh pr list --search "${SHA1} in:title is:open" --json title -q '.[] | .title' | wc -l)"
+        echo "sha1=$SHA1" >> "$GITHUB_OUTPUT"
+        echo "pr-count=$(gh pr list --search "${SHA1} in:title is:open" --json title -q '.[] | .title' | wc -l)" >> "$GITHUB_OUTPUT"
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Check diff and create PR

.github/workflows/shielding-check-cron.yaml

@@ -20,10 +20,10 @@ jobs:
       run: |
         cat ./temp.json | jq . > etc/shielding/datacenters.json
         rm -f ./temp.json
-        echo "::set-output name=diff-count::$(git diff --name-only | wc -l)"
+        echo "diff-count=$(git diff --name-only | wc -l)" >> "$GITHUB_OUTPUT"
         SHA1=`sha1sum etc/shielding/datacenters.json | awk '{print $1}'`
-        echo "::set-output name=sha1::$SHA1"
-        echo "::set-output name=pr-count::$(gh pr list --search "${SHA1} in:title is:open" --json title -q '.[] | .title' | wc -l)"
+        echo "sha1=$SHA1" >> "$GITHUB_OUTPUT"
+        echo "pr-count=$(gh pr list --search "${SHA1} in:title is:open" --json title -q '.[] | .title' | wc -l)" >> "$GITHUB_OUTPUT"
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Check diff and create PR

Block/GeoIp/GetAction.php

@@ -18,6 +18,7 @@
  * @copyright   Copyright (c) 2016 Fastly, Inc. (http://www.fastly.com)
  * @license     BSD, see LICENSE_FASTLY_CDN.txt
  */
+
 namespace Fastly\Cdn\Block\GeoIp;
 
 use Fastly\Cdn\Model\Config;
@@ -60,13 +61,14 @@ class GetAction extends AbstractBlock
      * @param EncoderInterface $urlEncoder
      */
     public function __construct(
-        Config $config,
-        Context $context,
-        Response $response,
-        Url $url,
+        Config           $config,
+        Context          $context,
+        Response         $response,
+        Url              $url,
         EncoderInterface $urlEncoder,
-        array $data = []
-    ) {
+        array            $data = []
+    )
+    {
         $this->config = $config;
         $this->response = $response;
         $this->url = $url;
@@ -92,8 +94,8 @@ protected function _toHtml() // @codingStandardsIgnoreLine - required by parent
         $currentUrl = $this->url->getCurrentUrl();
         $baseUrl = $this->url->getBaseUrl();
         $webTypeUrl = $this->url->getBaseUrl(['_type' => Url::URL_TYPE_WEB]);
-        
-        if (strpos($currentUrl, $baseUrl) !== false) {
+
+        if (strpos($currentUrl, rtrim($baseUrl, "/")) !== false) {
             $targetUrl = $currentUrl;
         } else {
             $targetUrl = str_replace($webTypeUrl, $baseUrl, $currentUrl);
@@ -109,7 +111,7 @@ protected function _toHtml() // @codingStandardsIgnoreLine - required by parent
             $this->response->setHeader("x-esi", "1");
         }
         // Due to Varnish parser limitations HTTPS ESIs are not supported so we need to turn them into HTTP URLs
-        // This does not mean that request will go over HTTP. ESI subrequest will go out to the backend that is 
+        // This does not mean that request will go over HTTP. ESI subrequest will go out to the backend that is
         // currently specified so if it's HTTPS it will go over HTTPS
         return sprintf(
             '<esi:include src=\'%s\' />',

Controller/Adminhtml/FastlyCdn/Logging/CreateEndpoint.php

@@ -29,12 +29,11 @@
 use Magento\Framework\Controller\Result\JsonFactory;
 
 /**
- * Class CreateEndpoint
- * @package Fastly\Cdn\Controller\Adminhtml\FastlyCdn\Logging
+ * Class CreateEndpoint for Logging
  */
 class CreateEndpoint extends Action
 {
-    const ADMIN_RESOURCE = 'Magento_Config::config';
+    public const ADMIN_RESOURCE = 'Magento_Config::config';
 
     /**
      * @var Http
@@ -113,6 +112,11 @@ public function execute()
                 $this->getRequest()->getParam('condition_priority')
             );
 
+            $selectedConditions = $this->getRequest()->getParam('conditions', '');
+            if (!$condition) {
+                $condition = $selectedConditions;
+            }
+
             $params = array_merge(
                 $this->getRequest()->getParam('log_endpoint'),
                 ['response_condition' => $condition]
@@ -152,17 +156,18 @@ public function execute()
     }
 
     /**
+     *
      * @param $clone
      * @param $conditionName
      * @param $applyIf
      * @param $conditionPriority
-     * @return string|null
+     * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function createCondition($clone, $conditionName, $applyIf, $conditionPriority)
     {
         if (!$conditionName || !$applyIf || !$conditionPriority) {
-            return null;
+            return '';
         }
         $condition = [
             'name'      => $conditionName,

Controller/Adminhtml/FastlyCdn/Logging/UpdateEndpoint.php

@@ -29,12 +29,11 @@
 use Magento\Framework\Controller\Result\JsonFactory;
 
 /**
- * Class UpdateEndpoint
- * @package Fastly\Cdn\Controller\Adminhtml\FastlyCdn\Logging
+ * Class UpdateEndpoint for Logging
  */
 class UpdateEndpoint extends Action
 {
-    const ADMIN_RESOURCE = 'Magento_Config::config';
+    public const ADMIN_RESOURCE = 'Magento_Config::config';
 
     /**
      * @var Http
@@ -84,6 +83,7 @@ public function __construct(
     }
 
     /**
+     *
      * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\Result\Json|\Magento\Framework\Controller\ResultInterface
      */
     public function execute()
@@ -114,14 +114,15 @@ public function execute()
                 $this->getRequest()->getParam('condition_priority')
             );
 
-            $params = array_merge(
-                $this->getRequest()->getParam('log_endpoint'),
-                ['response_condition' => $condition]
-            );
-
+            $selectedConditions = $this->getRequest()->getParam('conditions', '');
+            if (!$condition) {
+                $condition = $selectedConditions;
+            }
+            $params = $this->getRequest()->getParam('log_endpoint');
             $params = array_filter($params);
-            //Array filter removes empty strings, but empty compression_codec param turns off compression formats
-            if (!isset($params['compression_codec'])){
+            $params['response_condition'] = $condition;
+
+            if (!isset($params['compression_codec'])) {
                 $params['compression_codec'] = "";
             }
             $endpoint = $this->api->updateLogEndpoint($clone->number, $endpointType, $params, $oldName);
@@ -157,17 +158,18 @@ public function execute()
     }
 
     /**
+     *
      * @param $clone
      * @param $conditionName
      * @param $applyIf
      * @param $conditionPriority
-     * @return string|null
+     * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function createCondition($clone, $conditionName, $applyIf, $conditionPriority)
     {
         if (!$conditionName || !$applyIf || !$conditionPriority) {
-            return null;
+            return '';
         }
         $condition = [
             'name'      => $conditionName,

Documentation/Guides/Edge-Modules/EDGE-MODULE-NETACEA-INTEGRATION.md

@@ -12,25 +12,8 @@ After you have enabled the module it's time to configure. You will be prompted w
 
 ## Configurable options
 
-### Netacea API Key
-
-This is the API key provided to you by Netacea.
-
-### Netacea Secret
-
-This is the Secret provided to you by Netacea.
-
-### Netacea Ignore List
-
-This is the list of URL paths which integration will skip and won't apply any action to requests. <br />
-Please note that the integration will check if a request's URL path starts with a value from the list and will decide if it should be skipped. <br />
-Example:
-  - Path `/skipthis` is added to the ignore list
-  - Integration will skip requests which paths are starting from the `/skipthis`
-  - This means that requests for such websites would be skipped by the integration:
-    - `www.domain.com/skipthis`
-    - `www.domain.com/skipthisalso`
-    - `www.domain.com/skipthis/andthistoo`
+In order to configure Netacea module please see the following documentation.<br />
+[Netacea - Fastly/Magento](https://docs.netacea.com/netacea-plugin-information/fastly-magento/installation-and-configuration)
 
 ## Enabling
 

Model/Api.php

@@ -534,7 +534,7 @@ public function uploadSnippet($version, array $snippet)
         if (isset($snippet['content'])) {
             $adminUrl = $this->vcl->getAdminFrontName();
             $adminPathTimeout = $this->config->getAdminPathTimeout();
-            $ignoredUrlParameters = $this->config->getIgnoredUrlParameters();
+            $ignoredUrlParameters = (string)$this->config->getIgnoredUrlParameters();
 
             if ($ignoredUrlParameters === "") {
                 $queryParameters = '&';

Model/FrontControllerPlugin.php

@@ -135,7 +135,7 @@ public function aroundDispatch(FrontControllerInterface $subject, callable $proc
             return $proceed(...$args);
         }
 
-        $path = strtolower($this->request->getPathInfo());
+        $path = strtolower($this->request->getRequestUri());
 
         if ($isRateLimitingEnabled && $this->sensitivePathProtection($path)) {
             return $this->response;
@@ -167,7 +167,8 @@ private function sensitivePathProtection($path)
 
         $limit = false;
         foreach ($limitedPaths as $key => $value) {
-            if (preg_match('{' . $value->path . '}i', $path) == 1) {
+            $value->path = str_replace("#", "\#", $value->path);
+            if (preg_match('#' . $value->path . '#i', $path)) {
                 $limit = true;
                 break;
             }
@@ -333,26 +334,24 @@ private function verifyBots($ip)
         return false;
     }
 
-    private function readMaintenanceIp($ip)
+    private function readMaintenanceIp($clientIps)
     {
         $tag = self::FASTLY_CACHE_MAINTENANCE_IP_FILE_TAG;
-        $data = json_decode($this->cache->load($tag));
-        if (empty($data)) {
-            $data = [];
+        $allowedIps = json_decode($this->cache->load($tag));
+        if (empty($allowedIps)) {
+            $allowedIps = [];
             $flagDir = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
             if ($flagDir->isExist('.maintenance.ip')) {
                 $temp = $flagDir->readFile('.maintenance.ip');
-                $data = explode(',', trim($temp));
-                $this->cache->save(json_encode($data), $tag, []);
+                $allowedIps = explode(',', trim($temp));
+                $this->cache->save(json_encode($allowedIps), $tag, []);
             }
         }
 
-        foreach ($data as $key => $value) {
-            if (!empty($value) && trim($value) == $ip) {
-                return true;
-            }
-        }
-        return false;
+        $ips = array_map("trim", explode(",", $clientIps));
+        $isAllowed = array_intersect($allowedIps, $ips);
+
+        return !empty($isAllowed);
     }
 
     private function log($message)

Model/Layout/LayoutPlugin.php

@@ -98,7 +98,7 @@ public function afterGenerateElements(\Magento\Framework\View\Layout $subject):
     public function afterGetOutput(\Magento\Framework\View\Layout $subject, $result) // @codingStandardsIgnoreLine - unused parameter
     {
         if ($this->config->getType() === Config::FASTLY) {
-            $this->response->setHeader("Fastly-Module-Enabled", "1.2.211", true);
+            $this->response->setHeader("Fastly-Module-Enabled", "1.2.217", true);
         }
 
         return $result;

Model/ResponsePlugin.php

@@ -79,7 +79,10 @@ public function aroundSetHeader(Http $subject, callable $proceed, $name, $value,
         // Make the necessary adjustment
         $value = $this->cacheTags->convertCacheTags(str_replace(',', ' ', $value));
         $tagsSize = $this->config->getXMagentoTagsSize();
-        if (strlen($value) > $tagsSize) {
+
+        if ($tagsSize === 0) {
+            $value = "";
+        } else if (strlen($value) > $tagsSize) {
             $trimmedArgs = substr($value, 0, $tagsSize);
             $value = substr($trimmedArgs, 0, strrpos($trimmedArgs, ' ', -1));
         }

Release-Notes.md

@@ -1,5 +1,31 @@
 # Fastly_Cdn Release Notes
 
+## 1.2.217
+
+- Update to Netacea module https://github.com/fastly/fastly-magento2/pull/690
+
+## 1.2.216
+
+- Fix for GEOIP redirection causes 404 in specific cases https://github.com/fastly/fastly-magento2/pull/694
+
+## 1.2.215
+
+- Fix for checking if current IP is in maintenance IP list https://github.com/fastly/fastly-magento2/pull/692
+
+## 1.2.214
+
+- Rate limiting doesn't work correctly when store codes are involved https://github.com/fastly/fastly-magento2/pull/689
+
+## 1.2.213
+
+- Update Netacea Edge Module to 5.9.0 https://github.com/fastly/fastly-magento2/pull/687
+- Add support for Brotli static compression https://github.com/fastly/fastly-magento2/pull/688
+
+## 1.2.212
+
+- Additional fixes to log shipping menu https://github.com/fastly/fastly-magento2/pull/684
+- Updating to DataDome Fastly Module 2.19.4 https://github.com/fastly/fastly-magento2/pull/685
+
 ## 1.2.211
 
 - Fix for not being able to add log shipping jobs due to bug in Fastly Magento UI https://github.com/fastly/fastly-magento2/pull/683

VERSION

@@ -1 +1 @@
-1.2.211
+1.2.217

composer.json

@@ -12,7 +12,7 @@
         "zordius/lightncandy": "^1.2"
     },
     "type": "magento2-module",
-    "version": "1.2.211",
+    "version": "1.2.217",
     "license": "BSD-3-Clause",
     "autoload": {
         "files": [ "registration.php" ],