Skip to content

[SecurityBundle] support custom functions inside allow_if expressions #26263

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

Closed
dmaicher wants to merge 1 commit into from
Closed

[SecurityBundle] support custom functions inside allow_if expressions #26263

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
23 changes: 17 additions & 6 deletions src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
use Symfony\Component\DependencyInjection\DefinitionDecorator;
use Symfony\Component\DependencyInjection\Alias;
use Symfony\Component\ExpressionLanguage\SyntaxError;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\ContainerBuilder;
Expand Down Expand Up @@ -583,12 +584,22 @@ private function createExpression($container, $expression)
return $this->expressions[$id];
}

$container
->register($id, 'Symfony\Component\ExpressionLanguage\SerializedParsedExpression')
->setPublic(false)
->addArgument($expression)
->addArgument(serialize($this->getExpressionLanguage()->parse($expression, array('token', 'user', 'object', 'roles', 'request', 'trust_resolver'))->getNodes()))
;
try {
// due to the missing Cache component we try to parse the expression on Symfony < 3 as this will improve the performance.
// this can fail if custom functions are used inside the expression so we fallback to using a normal Expression instead
$container
->register($id, 'Symfony\Component\ExpressionLanguage\SerializedParsedExpression')
->setPublic(false)
->addArgument($expression)
->addArgument(serialize($this->getExpressionLanguage()->parse($expression, array('token', 'user', 'object', 'roles', 'request', 'trust_resolver'))->getNodes()))
;
} catch (SyntaxError $error) {
$container
->register($id, 'Symfony\Component\ExpressionLanguage\Expression')
->setPublic(false)
->addArgument($expression)
;
}

return $this->expressions[$id] = new Reference($id);
}
Expand Down
54 changes: 54 additions & 0 deletions src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,60 @@ public function testFirewallWithInvalidUserProvider()
$container->compile();
}

public function testRegisterRequestMatchersWithAllowIfExpression()
{
$container = $this->getRawContainer();

$rawExpression = "'foo' == 'bar' or 1 in [1, 3, 3]";
$rawExpressionWithCustomFunction = "foo('bar')";

$container->loadFromExtension('security', array(
'providers' => array(
'default' => array('id' => 'foo'),
),

'firewalls' => array(
'some_firewall' => array(
'pattern' => '/.*',
'http_basic' => array(),
),
),

'access_control' => array(
array('path' => '/', 'allow_if' => $rawExpression),
array('path' => '/foo', 'allow_if' => $rawExpressionWithCustomFunction),
),
));

$container->compile();

$accessMap = $container->getDefinition('security.access_map');
$this->assertCount(2, $accessMap->getMethodCalls());

// first expression without any custom functions can be parsed already
$call = $accessMap->getMethodCalls()[0];
$this->assertSame('add', $call[0]);
$args = $call[1];
$this->assertCount(3, $args);
$expressionId = $args[1][0];
$this->assertTrue($container->hasDefinition($expressionId));
$expressionDef = $container->getDefinition($expressionId);
$this->assertSame('Symfony\Component\ExpressionLanguage\SerializedParsedExpression', $expressionDef->getClass());
$this->assertSame($rawExpression, $expressionDef->getArgument(0));
$this->assertInstanceOf('Symfony\Component\ExpressionLanguage\Node\BinaryNode', unserialize($expressionDef->getArgument(1)));

// second expression cannot be parsed at compile-time so we use an Expression instead and let it be parsed at run-time
$call = $accessMap->getMethodCalls()[1];
$this->assertSame('add', $call[0]);
$args = $call[1];
$this->assertCount(3, $args);
$expressionId = $args[1][0];
$this->assertTrue($container->hasDefinition($expressionId));
$expressionDef = $container->getDefinition($expressionId);
$this->assertSame('Symfony\Component\ExpressionLanguage\Expression', $expressionDef->getClass());
$this->assertSame($rawExpressionWithCustomFunction, $expressionDef->getArgument(0));
}

protected function getRawContainer()
{
$container = new ContainerBuilder();
Expand Down