Datadome 2.22.0

.github/workflows/code_quality.yml

@@ -5,7 +5,7 @@ on:
     branches: [master]
 
 env:
-  MAGENTO_CODING_STANDARD: "v25"
+  MAGENTO_CODING_STANDARD: "v30"
 
 jobs:
   static_code_check:
@@ -47,16 +47,17 @@ jobs:
           --health-interval=10s
           --health-timeout=5s
           --health-retries=3
-      es:
-        image: docker.elastic.co/elasticsearch/elasticsearch:${{ matrix.elasticsearch }}
+      os:
+        image: opensearchproject/opensearch:${{ matrix.opensearch }}
         env:
-          ES_JAVA_OPTS: "-Xms512m -Xmx512m"
+          OPENSEARCH_JAVA_OPTS: "-Xms512m -Xmx512m"
 
         ports:
           - 9200:9200
         options: >-
           -e "discovery.type=single-node"
-          -e "xpack.security.enabled=false"
+          -e "plugins.security.disabled=true"
+          --name "opensearch-node"
           --health-cmd="curl --silent --fail localhost:9200/_cluster/health || exit 1"
           --health-interval=30s
           --health-timeout=30s
@@ -66,21 +67,28 @@ jobs:
       matrix:
         # https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/system-requirements.html
         include:
-          - magento: "2.4.3"
-            php: "7.4"
-            composer: "v1"
-            elasticsearch: "7.10.2"
+          # Higher matching version 4.6.1 of magento/magento2-functional-testing-framework was found in public repository packagist.org
+          # than 4.4.2 in private https://mirror.mage-os.org. Public package might've been taken over by a malicious entity,
+          # please investigate and update package requirement to match the version from the private repository
+          #- magento: "2.4.3-p3"
+          #  php: "7.4"
+          #  composer: "v1"
+          #  elasticsearch: "7.10.2"
 
           - magento: "2.4.4"
             php: "8.1"
             composer: "v2"
-            elasticsearch: "7.16.3"
+            opensearch: "1.2.0"
 
           - magento: "2.4.5"
             php: "8.1"
             composer: "v2"
-            elasticsearch: "7.17.5"
+            opensearch: "1.2.0"
 
+          - magento: "2.4.6"
+            php: "8.2"
+            composer: "v2"
+            opensearch: "2.5.0"
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -144,4 +152,5 @@ jobs:
         run: echo "::add-matcher::${{ github.workspace }}/app/code/Fastly/Cdn/.github/tests/phpunit_matcher.json"
 
       - name: Run tests
-        run: vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist --teamcity app/code/Fastly/Cdn/
+        run: ../../../vendor/bin/phpunit -c ../unit/phpunit.xml.dist --teamcity ../../../app/code/Fastly/Cdn/
+        working-directory: dev/tests/integration

.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/Advanced/CheckTlsSetting.php

@@ -34,6 +34,8 @@
  */
 class CheckTlsSetting extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Api
      */

Controller/Adminhtml/FastlyCdn/Advanced/ForceTls.php

@@ -35,6 +35,8 @@
  */
 class ForceTls extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Http
      */

Controller/Adminhtml/FastlyCdn/Backend/ConfigureBackend.php

@@ -35,6 +35,8 @@
  */
 class ConfigureBackend extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     use ValidationTrait;
 
     /**

Controller/Adminhtml/FastlyCdn/Backend/CreateBackend.php

@@ -39,6 +39,8 @@
  */
 class CreateBackend extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     use ValidationTrait;
 
     /**

Controller/Adminhtml/FastlyCdn/Backend/DeleteBackend.php

@@ -34,6 +34,8 @@
  */
 class DeleteBackend extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Http
      */

Controller/Adminhtml/FastlyCdn/Backend/GetBackends.php

@@ -37,6 +37,8 @@
  */
 class GetBackends extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Http
      */

Controller/Adminhtml/FastlyCdn/BasicAuthentication/CheckAuthDictionary.php

@@ -33,6 +33,8 @@
  */
 class CheckAuthDictionary extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Api
      */

Controller/Adminhtml/FastlyCdn/BasicAuthentication/CheckAuthSetting.php

@@ -33,6 +33,8 @@
  */
 class CheckAuthSetting extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Api
      */

Controller/Adminhtml/FastlyCdn/BasicAuthentication/CheckAuthUsersAvailable.php

@@ -33,6 +33,8 @@
  */
 class CheckAuthUsersAvailable extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Api
      */

Controller/Adminhtml/FastlyCdn/BasicAuthentication/Create.php

@@ -35,6 +35,8 @@
  */
 class Create extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Http
      */

Controller/Adminhtml/FastlyCdn/BasicAuthentication/Delete.php

@@ -36,6 +36,8 @@
  */
 class Delete extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Http
      */

Controller/Adminhtml/FastlyCdn/BasicAuthentication/EnableAuth.php

@@ -37,6 +37,8 @@
  */
 class EnableAuth extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Http
      */

Controller/Adminhtml/FastlyCdn/BasicAuthentication/Item/Create.php

@@ -35,6 +35,8 @@
  */
 class Create extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Http
      */

Controller/Adminhtml/FastlyCdn/BasicAuthentication/Item/Delete.php

@@ -35,6 +35,8 @@
  */
 class Delete extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Http
      */

Controller/Adminhtml/FastlyCdn/BasicAuthentication/Item/ListAll.php

@@ -35,6 +35,8 @@
  */
 class ListAll extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Http
      */

Controller/Adminhtml/FastlyCdn/Blocking/AbstractBlocking.php

@@ -8,6 +8,8 @@
 
 abstract class AbstractBlocking extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     protected $configWriter;
 
     public function __construct(

Controller/Adminhtml/FastlyCdn/Blocking/CheckBlockingSetting.php

@@ -34,6 +34,8 @@
  */
 class CheckBlockingSetting extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Api
      */

Controller/Adminhtml/FastlyCdn/Configuration/CustomerInfo.php

@@ -34,6 +34,8 @@
  */
 class CustomerInfo extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Api
      */

Controller/Adminhtml/FastlyCdn/Configuration/GetFastlyServiceInfo.php

@@ -34,6 +34,8 @@
  */
 class GetFastlyServiceInfo extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Api
      */

Controller/Adminhtml/FastlyCdn/Configuration/IsAlreadyConfigured.php

@@ -35,6 +35,8 @@
  */
 class IsAlreadyConfigured extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Api
      */

Controller/Adminhtml/FastlyCdn/Configuration/ServiceInfo.php

@@ -34,6 +34,8 @@
  */
 class ServiceInfo extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Api
      */

Controller/Adminhtml/FastlyCdn/Configuration/TestConnection.php

@@ -36,6 +36,8 @@
  */
 class TestConnection extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var Api
      */

Controller/Adminhtml/FastlyCdn/CustomSnippet/ChangeUpdateFlag.php

@@ -16,6 +16,8 @@
  */
 class ChangeUpdateFlag extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var JsonFactory
      */

Controller/Adminhtml/FastlyCdn/CustomSnippet/CheckCustomSnippet.php

@@ -20,8 +20,8 @@
  */
 namespace Fastly\Cdn\Controller\Adminhtml\FastlyCdn\CustomSnippet;
 
-use Magento\Framework\App\Action\Action;
-use Magento\Framework\App\Action\Context;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Response\Http\FileFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem\Directory\WriteFactory;
@@ -37,6 +37,8 @@
  */
 class CheckCustomSnippet extends Action
 {
+    const ADMIN_RESOURCE = 'Magento_Config::config';
+
     /**
      * @var FileFactory
      */