geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-13 02:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweaked sandbox generated code

Browse Source
This commit is contained in:
Fabien Potencier
2019-03-11 08:52:26 +01:00
parent 7ce5261621
commit cbb8f6edc1
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Node/CheckSecurityNode.php
+2 -1
View File
@@ -45,12 +45,13 @@ class CheckSecurityNode extends Node
} }
$compiler $compiler
->write("\$this->sandbox = \$this->env->getExtension('\Twig\Extension\SandboxExtension');\n")
->write('$tags = ')->repr(array_filter($tags))->raw(";\n") ->write('$tags = ')->repr(array_filter($tags))->raw(";\n")
->write('$filters = ')->repr(array_filter($filters))->raw(";\n") ->write('$filters = ')->repr(array_filter($filters))->raw(";\n")
->write('$functions = ')->repr(array_filter($functions))->raw(";\n\n") ->write('$functions = ')->repr(array_filter($functions))->raw(";\n\n")
->write("try {\n") ->write("try {\n")
->indent() ->indent()
->write("\$this->env->getExtension('\Twig\Extension\SandboxExtension')->checkSecurity(\n") ->write("\$this->sandbox->checkSecurity(\n")
->indent() ->indent()
->write(!$tags ? "[],\n" : "['".implode("', '", array_keys($tags))."'],\n") ->write(!$tags ? "[],\n" : "['".implode("', '", array_keys($tags))."'],\n")
->write(!$filters ? "[],\n" : "['".implode("', '", array_keys($filters))."'],\n") ->write(!$filters ? "[],\n" : "['".implode("', '", array_keys($filters))."'],\n")
src/Node/SandboxNode.php
+3 -4
View File
@@ -29,16 +29,15 @@ class SandboxNode extends Node
{ {
$compiler $compiler
->addDebugInfo($this) ->addDebugInfo($this)
->write("\$sandbox = \$this->env->getExtension('\Twig\Extension\SandboxExtension');\n") ->write("if (!\$alreadySandboxed = \$this->sandbox->isSandboxed()) {\n")
->write("if (!\$alreadySandboxed = \$sandbox->isSandboxed()) {\n")
->indent() ->indent()
->write("\$sandbox->enableSandbox();\n") ->write("\$this->sandbox->enableSandbox();\n")
->outdent() ->outdent()
->write("}\n") ->write("}\n")
->subcompile($this->getNode('body')) ->subcompile($this->getNode('body'))
->write("if (!\$alreadySandboxed) {\n") ->write("if (!\$alreadySandboxed) {\n")
->indent() ->indent()
->write("\$sandbox->disableSandbox();\n") ->write("\$this->sandbox->disableSandbox();\n")
->outdent() ->outdent()
->write("}\n") ->write("}\n")
; ;
src/NodeVisitor/SandboxNodeVisitor.php
+1 -1
View File
@@ -77,7 +77,7 @@ class SandboxNodeVisitor extends AbstractNodeVisitor
if ($node instanceof ModuleNode) { if ($node instanceof ModuleNode) {
$this->inAModule = false; $this->inAModule = false;
$node->setNode('display_start', new Node([new CheckSecurityNode($this->filters, $this->tags, $this->functions), $node->getNode('display_start')])); $node->setNode('constructor_end', new Node([new CheckSecurityNode($this->filters, $this->tags, $this->functions), $node->getNode('display_start')]));
} }
return $node; return $node;
src/Template.php
+1
View File
@@ -39,6 +39,7 @@ abstract class Template implements \Twig_TemplateInterface
protected $env; protected $env;
protected $blocks = []; protected $blocks = [];
protected $traits = []; protected $traits = [];
protected $sandbox;
public function __construct(Environment $env) public function __construct(Environment $env)
{ {
test/Twig/Tests/Node/SandboxTest.php
+3 -4
View File
@@ -32,13 +32,12 @@ class Twig_Tests_Node_SandboxTest extends NodeTestCase
$tests[] = [$node, <<<EOF $tests[] = [$node, <<<EOF
// line 1 // line 1
\$sandbox = \$this->env->getExtension('\Twig\Extension\SandboxExtension'); if (!\$alreadySandboxed = \$this->sandbox->isSandboxed()) {
if (!\$alreadySandboxed = \$sandbox->isSandboxed()) { \$this->sandbox->enableSandbox();
\$sandbox->enableSandbox();
} }
echo "foo"; echo "foo";
if (!\$alreadySandboxed) { if (!\$alreadySandboxed) {
\$sandbox->disableSandbox(); \$this->sandbox->disableSandbox();
} }
EOF EOF
]; ];