fix exception handler priority

dachcom-digital · May 13, 2024 · 86fb9ed · 86fb9ed
1 parent 7fb5f10
commit 86fb9ed
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
@@ -1,9 +1,9 @@
 name: Codeception
 on:
     push:
-        branches: [ 'master' ]
+        branches: [ '4.x' ]
     pull_request:
-        branches: [ 'master' ]
+        branches: [ '4.x' ]
 
 jobs:
     codeception:
@@ -120,6 +120,7 @@ jobs:
                     TEST_PIMCORE_VERSION: ${{ matrix.pimcore }}
                     TEST_SYMFONY_VERSION: ${{ matrix.symfony }}
                 run: |
+                    sed -i 's|"require-dev": {|"conflict": {"league/csv": ">=9.11.0"},\n "require-dev": {|' ${{ github.workspace }}/lib/test-bundle/composer.json
                     chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
                     ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
 

diff --git a/.github/workflows/ecs.yml b/.github/workflows/ecs.yml
@@ -1,9 +1,9 @@
 name: Easy Coding Standards
 on:
     push:
-        branches: [ 'master' ]
+        branches: [ '4.x' ]
     pull_request:
-        branches: [ 'master' ]
+        branches: [ '4.x' ]
 
 jobs:
     ecs:
@@ -103,6 +103,7 @@ jobs:
                     TEST_PIMCORE_VERSION: ${{ matrix.pimcore }}
                     TEST_SYMFONY_VERSION: ${{ matrix.symfony }}
                 run: |
+                    sed -i 's|"require-dev": {|"conflict": {"league/csv": ">=9.11.0"},\n "require-dev": {|' ${{ github.workspace }}/lib/test-bundle/composer.json
                     chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
                     ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
 

diff --git a/.github/workflows/php-stan.yml b/.github/workflows/php-stan.yml
@@ -1,9 +1,9 @@
 name: PHP Stan
 on:
     push:
-        branches: [ 'master' ]
+        branches: [ '4.x' ]
     pull_request:
-        branches: [ 'master' ]
+        branches: [ '4.x' ]
 
 jobs:
     stan:
@@ -103,6 +103,7 @@ jobs:
                     TEST_PIMCORE_VERSION: ${{ matrix.pimcore }}
                     TEST_SYMFONY_VERSION: ${{ matrix.symfony }}
                 run: |
+                    sed -i 's|"require-dev": {|"conflict": {"league/csv": ">=9.11.0"},\n "require-dev": {|' ${{ github.workspace }}/lib/test-bundle/composer.json
                     chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
                     ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
 

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,8 @@
 # Upgrade Notes
 
+## 4.1.10
+- [BUGFIX] Fix exception handler priority to prevent authentication exception hijacking
+
 ## 4.1.9
 - [BUGFIX] Move preview listener to earlier state to allow static route preview with restricted sites
 

diff --git a/src/I18nBundle/EventListener/Frontend/ResponseExceptionListener.php b/src/I18nBundle/EventListener/Frontend/ResponseExceptionListener.php
@@ -59,7 +59,7 @@ public function __construct(
     public static function getSubscribedEvents(): array
     {
         return [
-            KernelEvents::EXCEPTION => ['onKernelException', 10]
+            KernelEvents::EXCEPTION => 'onKernelException'
         ];
     }