Validate macro name in MacroReferenceExpression constructor

The name passed to MacroReferenceExpression is emitted as raw PHP in
compile() via "->{$name}(...)". Callers were expected to validate
the name, but a missing check led to CVE-2026-XXXXX (PHP code injection
via _self / import macro reference): defense-in-depth, validate the
name in the constructor so the class is safe by construction.
This commit is contained in:
Fabien Potencier
2026-05-19 23:33:26 +02:00
parent 324fa60545
commit ea3f7a2844
2 changed files with 49 additions and 0 deletions
@@ -26,6 +26,14 @@ class MacroReferenceExpression extends AbstractExpression implements SupportDefi
public function __construct(TemplateVariable $template, string $name, AbstractExpression $arguments, int $lineno)
{
// The name is emitted as raw PHP in compile() via "->{$name}(...)",
// so it must be a valid PHP method identifier. Reject anything else
// as a defense-in-depth against accidental PHP code injection from
// a caller that forgot to validate user-controlled input.
if (!preg_match('#^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$#D', $name)) {
throw new \LogicException(\sprintf('Macro name "%s" is not a valid PHP identifier.', $name));
}
parent::__construct(['template' => $template, 'arguments' => $arguments], ['name' => $name], $lineno);
}