Commit495b2ce

committed

Ensure placeholders strictly matches roles

1 parent0240d67 commit495b2ceCopy full SHA for 495b2ce

File tree

-1

lines changed

src/Symfony/Component/Security/Core
- Role
  - RoleHierarchy.php
- Tests/Role
  - RoleHierarchyTest.php

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,6 @@ private function getPlaceholderPattern(string $role): string\|false`
`134`	`134`	`/** @var int $count */`
`135`	`135`	`$placeholderPattern =preg_replace(pattern:'/(?<=_)\\\\\(?=_\|$)/', replacement:'[^\]*', subject:preg_quote($role), count:$count);`
`136`	`136`
`137`		`-return ($count >0) ?sprintf('/%s/',$placeholderPattern) :false;`
	`137`	`+return ($count >0) ?sprintf('/^%s$/',$placeholderPattern) :false;`
`138`	`138`	`}`
`139`	`139`	`}`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ public function testGetReachableRoleNamesWithPlaceholders()`
`37`	`37`	`'ROLE_BAZ_*' => ['ROLE_USER'],`
`38`	`38`	`'ROLE_FOO_*' => ['ROLE_BAZ_FOO'],`
`39`	`39`	`'ROLE_BAR_*' => ['ROLE_BAZ_BAR'],`
	`40`	`+'ROLE_QUX_*_BAR' => ['ROLE_FOOBAR'],`
`40`	`41`	`]);`
`41`	`42`
`42`	`43`	`$this->assertEquals(['ROLE_BAZ_A','ROLE_USER'],$role->getReachableRoleNames(['ROLE_BAZ_A']));`
`@@ -47,6 +48,10 @@ public function testGetReachableRoleNamesWithPlaceholders()`
`47`	`48`
`48`	`49`	`// Multiple roles matching multiple placeholders`
`49`	`50`	`$this->assertEquals(['ROLE_FOO_A','ROLE_BAR_A','ROLE_BAZ_FOO','ROLE_BAZ_BAR','ROLE_USER'],$role->getReachableRoleNames(['ROLE_FOO_A','ROLE_BAR_A']));`
	`51`	`+`
	`52`	`+// Test placeholders don't match more than the pattern`
	`53`	`+$this->assertEquals(['FOO_ROLE_FOO_A'],$role->getReachableRoleNames(['FOO_ROLE_FOO_A']));// Doesn't start with ROLE_FOO_`
	`54`	`+$this->assertEquals(['ROLE_QUX_A_BARA'],$role->getReachableRoleNames(['ROLE_QUX_A_BARA']));// Doesn't end with _BAR`
`50`	`55`	`}`
`51`	`56`
`52`	`57`	`publicfunctiontestGetReachableRoleNamesWithRecursivePlaceholders()`

Comments

(0)