Skip to content

[!!!][TASK] Refactor expression evaluation in access checkers #163

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
kszymukowicz merged 1 commit into from
Oct 3, 2026
Merged

[!!!][TASK] Refactor expression evaluation in access checkers #163

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
31 changes: 14 additions & 17 deletions Classes/Security/AbstractAccessChecker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,22 @@ public function __construct(
protected readonly EventDispatcherInterface $eventDispatcher
) {}

protected function getExpressionLanguageResolver(array $additionalExpressionLanguageVariables = []): Resolver
{
static $expressionLanguageResolver;
/**
* Built once per checker without any variables - variables differ for every check (`object`,
* `t3apiOperation`, `t3apiFilter`, event-provided ones) and are passed to each evaluation.
*/
protected ?Resolver $expressionLanguageResolver = null;

if ($expressionLanguageResolver === null) {
$context = GeneralUtility::makeInstance(Context::class);
protected function evaluateExpression(string $expression, array $additionalExpressionLanguageVariables = []): bool
{
$this->expressionLanguageResolver ??= GeneralUtility::makeInstance(Resolver::class, 't3api', []);

$variables = array_merge(
ExpressionLanguageService::getUserVariables($context),
return (bool)$this->expressionLanguageResolver->evaluate(
$expression,
array_merge(
ExpressionLanguageService::getUserVariables(GeneralUtility::makeInstance(Context::class)),
$additionalExpressionLanguageVariables
);

$expressionLanguageResolver = GeneralUtility::makeInstance(
Resolver::class,
't3api',
$variables
);
}

return $expressionLanguageResolver;
)
);
}
}
2 changes: 1 addition & 1 deletion Classes/Security/FilterAccessChecker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ public function isGranted(ApiFilter $filter, array $expressionLanguageVariables

$variables = array_merge($expressionLanguageVariables, ['t3apiFilter' => $filter]);

return $this->getExpressionLanguageResolver($variables)->evaluate($filter->getStrategy()->getCondition());
return $this->evaluateExpression($filter->getStrategy()->getCondition(), $variables);
}
}
4 changes: 2 additions & 2 deletions Classes/Security/OperationAccessChecker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function isGranted(OperationInterface $operation, array $expressionLangua

$variables = array_merge($expressionLanguageVariables, ['t3apiOperation' => $operation]);

return $this->getExpressionLanguageResolver($variables)->evaluate($operation->getSecurity());
return $this->evaluateExpression($operation->getSecurity(), $variables);
}

public function isGrantedPostDenormalize(
Expand All @@ -45,6 +45,6 @@ public function isGrantedPostDenormalize(

$variables = array_merge($expressionLanguageVariables, ['t3apiOperation' => $operation]);

return $this->getExpressionLanguageResolver($variables)->evaluate($operation->getSecurityPostDenormalize());
return $this->evaluateExpression($operation->getSecurityPostDenormalize(), $variables);
}
}
Loading
Loading