geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-10-06 03:47:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sandbox filter/tag/function allow-list bypass when sandbox state changes between renders

Browse Source
This commit is contained in:
Fabien Potencier
2026-05-24 20:08:38 +02:00
parent 7d55aa838c
commit 23eb6eb126
8 changed files with 463 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Node/IncludeNode.php
-18
View File
@@ -38,8 +38,6 @@ class IncludeNode extends Node implements NodeOutputInterface, CoercesChildrenTo
{
$compiler->addDebugInfo($this);
$sandboxed = $this->hasAttribute('sandboxed') && $this->getAttribute('sandboxed');
if ($this->getAttribute('ignore_missing')) {
$template = $compiler->getVarName();
@@ -64,10 +62,6 @@ class IncludeNode extends Node implements NodeOutputInterface, CoercesChildrenTo
->indent()
;
if ($sandboxed) {
$compiler->write(\sprintf("\$%s->unwrap()->checkSecurity();\n", $template));
}
$compiler->write(\sprintf('yield from $%s->unwrap()->yield(', $template));
$this->addTemplateArguments($compiler);
@@ -76,18 +70,6 @@ class IncludeNode extends Node implements NodeOutputInterface, CoercesChildrenTo
->outdent()
->write("}\n")
;
} elseif ($sandboxed) {
$template = $compiler->getVarName();
$compiler->write(\sprintf('$%s = ', $template));
$this->addGetTemplate($compiler);
$compiler
->raw(";\n")
->write(\sprintf("\$%s->unwrap()->checkSecurity();\n", $template))
->write(\sprintf('yield from $%s->unwrap()->yield(', $template))
;
$this->addTemplateArguments($compiler);
$compiler->raw(");\n");
} else {
$compiler->write('yield from ');
$this->addGetTemplate($compiler);