bug #45017 [Security] Fix retrieving strategy for custom AccessDecisionManager (javer)

chalasr · chalasr · commit 37328e30a5b2 · 2022-01-17T11:48:34.000+01:00
This PR was merged into the 6.1 branch. Discussion ---------- [Security] Fix retrieving strategy for custom AccessDecisionManager | Q | A | ------------- | --- | Branch? | 6.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Adding property types to `TraceableAccessDecisionManager` in 85065e4 leads to the TypeError when using custom `AccessDecisionManager` in the application: ``` Error: Typed property Symfony\Component\Security\Core\Authorization\TraceableAccessDecisionManager::$strategy must not be accessed before initialization ``` I'm targeting 6.1 branch, because property types are here only in 6.1 branch. Previously they were in 6.0 also, but later it was reverted. Commits ------- 50dd188 Fix retrieving strategy for custom AccessDecisionManager
diff --git a/src/Symfony/Component/Security/Core/Authorization/TraceableAccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/TraceableAccessDecisionManager.php
@@ -26,7 +26,7 @@
 class TraceableAccessDecisionManager implements AccessDecisionManagerInterface
 {
     private AccessDecisionManagerInterface $manager;
-    private AccessDecisionStrategyInterface $strategy;
+    private ?AccessDecisionStrategyInterface $strategy = null;
     /** @var iterable<mixed, VoterInterface> */
     private iterable $voters = [];
     private array $decisionLog = []; // All decision logs
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/TraceableAccessDecisionManagerTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/TraceableAccessDecisionManagerTest.php
@@ -274,4 +274,13 @@ public function testAccessDecisionManagerCalledByVoter()
             ],
         ], $sut->getDecisionLog());
     }
+
+    public function testCustomAccessDecisionManagerReturnsEmptyStrategy()
+    {
+        $admMock = $this->createMock(AccessDecisionManagerInterface::class);
+
+        $adm = new TraceableAccessDecisionManager($admMock);
+
+        $this->assertEquals('-', $adm->getStrategy());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`class TraceableAccessDecisionManager implements AccessDecisionManagerInterface`
`27`	`27`	`{`
`28`	`28`	`private AccessDecisionManagerInterface $manager;`
`29`		`- private AccessDecisionStrategyInterface $strategy;`
	`29`	`+ private ?AccessDecisionStrategyInterface $strategy = null;`
`30`	`30`	`/** @var iterable<mixed, VoterInterface> */`
`31`	`31`	`private iterable $voters = [];`
`32`	`32`	`private array $decisionLog = []; // All decision logs`
Original file line number	Diff line number	Diff line change
`@@ -274,4 +274,13 @@ public function testAccessDecisionManagerCalledByVoter()`
`274`	`274`	`],`
`275`	`275`	`], $sut->getDecisionLog());`
`276`	`276`	`}`
	`277`	`+`
	`278`	`+ public function testCustomAccessDecisionManagerReturnsEmptyStrategy()`
	`279`	`+ {`
	`280`	`+ $admMock = $this->createMock(AccessDecisionManagerInterface::class);`
	`281`	`+`
	`282`	`+ $adm = new TraceableAccessDecisionManager($admMock);`
	`283`	`+`
	`284`	`+ $this->assertEquals('-', $adm->getStrategy());`
	`285`	`+ }`
`277`	`286`	`}`