Skip to content

allow absence of token for sf authentication manager #3899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 13, 2020
Merged

allow absence of token for sf authentication manager #3899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions src/Security/ResourceAccessChecker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,20 @@ public function isGranted(string $resourceClass, string $expression, array $extr
if (null === $this->tokenStorage || null === $this->authenticationTrustResolver) {
throw new \LogicException('The "symfony/security" library must be installed to use the "security" attribute.');
}
if (null === $token = $this->tokenStorage->getToken()) {
throw new \LogicException('The current token must be set to use the "security" attribute (is the URL behind a firewall?).');
}
if (null === $this->expressionLanguage) {
throw new \LogicException('The "symfony/expression-language" library must be installed to use the "security".');
throw new \LogicException('The "symfony/expression-language" library must be installed to use the "security" attribute.');
}

$variables = array_merge($extraVariables, [
'trust_resolver' => $this->authenticationTrustResolver,
'auth_checker' => $this->authorizationChecker, // needed for the is_granted expression function
]);

if ($token = $this->tokenStorage->getToken()) {
$variables = array_merge($variables, $this->getVariables($token));
}

return (bool) $this->expressionLanguage->evaluate($expression, array_merge($extraVariables, $this->getVariables($token)));
return (bool) $this->expressionLanguage->evaluate($expression, $variables);
}

/**
Expand All @@ -69,9 +75,6 @@ private function getVariables(TokenInterface $token): array
'token' => $token,
'user' => $token->getUser(),
'roles' => $this->getEffectiveRoles($token),
'trust_resolver' => $this->authenticationTrustResolver,
// needed for the is_granted expression function
'auth_checker' => $this->authorizationChecker,
];
}

Expand Down
14 changes: 1 addition & 13 deletions tests/Security/ResourceAccessCheckerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public function testSecurityComponentNotAvailable()
public function testExpressionLanguageNotInstalled()
{
$this->expectException(\LogicException::class);
$this->expectExceptionMessage('The "symfony/expression-language" library must be installed to use the "security".');
$this->expectExceptionMessage('The "symfony/expression-language" library must be installed to use the "security" attribute.');

$authenticationTrustResolverProphecy = $this->prophesize(AuthenticationTrustResolverInterface::class);
$tokenStorageProphecy = $this->prophesize(TokenStorageInterface::class);
Expand All @@ -85,16 +85,4 @@ public function testExpressionLanguageNotInstalled()
$checker = new ResourceAccessChecker(null, $authenticationTrustResolverProphecy->reveal(), null, $tokenStorageProphecy->reveal());
$checker->isGranted(Dummy::class, 'is_granted("ROLE_ADMIN")');
}

public function testNotBehindAFirewall()
{
$this->expectException(\LogicException::class);
$this->expectExceptionMessage('The current token must be set to use the "security" attribute (is the URL behind a firewall?).');

$authenticationTrustResolverProphecy = $this->prophesize(AuthenticationTrustResolverInterface::class);
$tokenStorageProphecy = $this->prophesize(TokenStorageInterface::class);

$checker = new ResourceAccessChecker(null, $authenticationTrustResolverProphecy->reveal(), null, $tokenStorageProphecy->reveal());
$checker->isGranted(Dummy::class, 'is_granted("ROLE_ADMIN")');
}
}