geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-14 19:36:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed the special Sandbox Module class

Browse Source
This commit is contained in:
Fabien Potencier
2015-01-20 04:04:59 +01:00
parent 68e5db52f8
commit 3b12d558bb
3 changed files with 7 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Node/SandboxedModule.php → lib/Twig/Node/CheckSecurity.php
+6 -24
View File
@@ -3,46 +3,32 @@
/*
* This file is part of Twig.
*
* (c) 2009 Fabien Potencier
* (c) 2009 Armin Ronacher
* (c) 2015 Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
/**
* Represents a module node.
*
* @author Fabien Potencier <fabien@symfony.com>
*/
class Twig_Node_SandboxedModule extends Twig_Node_Module
class Twig_Node_CheckSecurity extends Twig_Node
{
protected $usedFilters;
protected $usedTags;
protected $usedFunctions;
public function __construct(Twig_Node_Module $node, array $usedFilters, array $usedTags, array $usedFunctions)
public function __construct(array $usedFilters, array $usedTags, array $usedFunctions)
{
parent::__construct($node->getNode('body'), $node->getNode('parent'), $node->getNode('blocks'), $node->getNode('macros'), $node->getNode('traits'), $node->getAttribute('embedded_templates'), $node->getAttribute('filename'));
$this->setAttribute('index', $node->getAttribute('index'));
$this->usedFilters = $usedFilters;
$this->usedTags = $usedTags;
$this->usedFunctions = $usedFunctions;
parent::__construct();
}
protected function compileDisplayBody(Twig_Compiler $compiler)
public function compile(Twig_Compiler $compiler)
{
$compiler->write("\$this->checkSecurity();\n");
parent::compileDisplayBody($compiler);
}
protected function compileDisplayFooter(Twig_Compiler $compiler)
{
parent::compileDisplayFooter($compiler);
$tags = $filters = $functions = array();
foreach (array('tags', 'filters', 'functions') as $type) {
foreach ($this->{'used'.ucfirst($type)} as $name => $node) {
@@ -55,8 +41,6 @@ class Twig_Node_SandboxedModule extends Twig_Node_Module
}
$compiler
->write("protected function checkSecurity()\n", "{\n")
->indent()
->write("\$tags = ")->repr(array_filter($tags))->raw(";\n")
->write("\$filters = ")->repr(array_filter($filters))->raw(";\n")
->write("\$functions = ")->repr(array_filter($functions))->raw(";\n\n")
@@ -88,8 +72,6 @@ class Twig_Node_SandboxedModule extends Twig_Node_Module
->write("}\n\n")
->write("throw \$e;\n")
->outdent()
->write("}\n")
->outdent()
->write("}\n\n")
;
}
lib/Twig/NodeVisitor/Sandbox.php
+1 -1
View File
@@ -76,7 +76,7 @@ class Twig_NodeVisitor_Sandbox implements Twig_NodeVisitorInterface
if ($node instanceof Twig_Node_Module) {
$this->inAModule = false;
return new Twig_Node_SandboxedModule($node, $this->filters, $this->tags, $this->functions);
$node->setNode('display_enter', new Twig_Node(array(new Twig_Node_CheckSecurity($this->filters, $this->tags, $this->functions), $node->getNode('display_enter'))));
}
return $node;
test/Twig/Tests/Node/SandboxedModuleTest.php
-203
View File
@@ -1,203 +0,0 @@
<?php
/*
* This file is part of Twig.
*
* (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
class Twig_Tests_Node_SandboxedModuleTest extends Twig_Test_NodeTestCase
{
public function testConstructor()
{
$body = new Twig_Node_Text('foo', 1);
$parent = new Twig_Node_Expression_Constant('layout.twig', 1);
$blocks = new Twig_Node();
$macros = new Twig_Node();
$traits = new Twig_Node();
$filename = 'foo.twig';
$node = new Twig_Node_Module($body, $parent, $blocks, $macros, $traits, new Twig_Node(array()), $filename);
$node = new Twig_Node_SandboxedModule($node, array('for'), array('upper'), array('cycle'));
$this->assertEquals($body, $node->getNode('body'));
$this->assertEquals($blocks, $node->getNode('blocks'));
$this->assertEquals($macros, $node->getNode('macros'));
$this->assertEquals($parent, $node->getNode('parent'));
$this->assertEquals($filename, $node->getAttribute('filename'));
}
public function getTests()
{
$twig = new Twig_Environment(new Twig_Loader_String());
$tests = array();
$body = new Twig_Node_Text('foo', 1);
$extends = null;
$blocks = new Twig_Node();
$macros = new Twig_Node();
$traits = new Twig_Node();
$filename = 'foo.twig';
$node = new Twig_Node_Module($body, $extends, $blocks, $macros, $traits, new Twig_Node(array()), $filename);
$node = new Twig_Node_SandboxedModule($node, array('for'), array('upper'), array('cycle'));
$tests[] = array($node, <<<EOF
<?php
/* foo.twig */
class __TwigTemplate_a2bfbf7dd6ab85666684fe9297f69363a3fc2046d90f22a317d380c18638df0d extends Twig_Template
{
public function __construct(Twig_Environment \$env)
{
parent::__construct(\$env);
\$this->parent = false;
\$this->blocks = array(
);
}
protected function doDisplay(array \$context, array \$blocks = array())
{
\$this->checkSecurity();
// line 1
echo "foo";
}
protected function checkSecurity()
{
\$tags = array();
\$filters = array();
\$functions = array();
try {
\$this->env->getExtension('sandbox')->checkSecurity(
array('upper'),
array('for'),
array('cycle')
);
} catch (Twig_Sandbox_SecurityError \$e) {
\$e->setTemplateFile(\$this->getTemplateName());
if (\$e instanceof Twig_Sandbox_SecurityNotAllowedTagError && isset(\$tags[\$e->getTagName()])) {
\$e->setTemplateLine(\$tags[\$e->getTagName()]);
} elseif (\$e instanceof Twig_Sandbox_SecurityNotAllowedFilterError && isset(\$filters[\$e->getFilterName()])) {
\$e->setTemplateLine(\$filters[\$e->getFilterName()]);
} elseif (\$e instanceof Twig_Sandbox_SecurityNotAllowedFunctionError && isset(\$functions[\$e->getFunctionName()])) {
\$e->setTemplateLine(\$functions[\$e->getFunctionName()]);
}
throw \$e;
}
}
public function getTemplateName()
{
return "foo.twig";
}
public function getDebugInfo()
{
return array ( 20 => 1,);
}
}
EOF
, $twig);
$body = new Twig_Node();
$extends = new Twig_Node_Expression_Constant('layout.twig', 1);
$blocks = new Twig_Node();
$macros = new Twig_Node();
$traits = new Twig_Node();
$filename = 'foo.twig';
$node = new Twig_Node_Module($body, $extends, $blocks, $macros, $traits, new Twig_Node(array()), $filename);
$node = new Twig_Node_SandboxedModule($node, array('for'), array('upper'), array('cycle'));
$tests[] = array($node, <<<EOF
<?php
/* foo.twig */
class __TwigTemplate_a2bfbf7dd6ab85666684fe9297f69363a3fc2046d90f22a317d380c18638df0d extends Twig_Template
{
public function __construct(Twig_Environment \$env)
{
parent::__construct(\$env);
// line 1
try {
\$this->parent = \$this->env->loadTemplate("layout.twig");
} catch (Twig_Error_Loader \$e) {
\$e->setTemplateFile(\$this->getTemplateName());
\$e->setTemplateLine(1);
throw \$e;
}
\$this->blocks = array(
);
}
protected function doGetParent(array \$context)
{
return "layout.twig";
}
protected function doDisplay(array \$context, array \$blocks = array())
{
\$this->checkSecurity();
\$this->parent->display(\$context, array_merge(\$this->blocks, \$blocks));
}
protected function checkSecurity()
{
\$tags = array();
\$filters = array();
\$functions = array();
try {
\$this->env->getExtension('sandbox')->checkSecurity(
array('upper'),
array('for'),
array('cycle')
);
} catch (Twig_Sandbox_SecurityError \$e) {
\$e->setTemplateFile(\$this->getTemplateName());
if (\$e instanceof Twig_Sandbox_SecurityNotAllowedTagError && isset(\$tags[\$e->getTagName()])) {
\$e->setTemplateLine(\$tags[\$e->getTagName()]);
} elseif (\$e instanceof Twig_Sandbox_SecurityNotAllowedFilterError && isset(\$filters[\$e->getFilterName()])) {
\$e->setTemplateLine(\$filters[\$e->getFilterName()]);
} elseif (\$e instanceof Twig_Sandbox_SecurityNotAllowedFunctionError && isset(\$functions[\$e->getFunctionName()])) {
\$e->setTemplateLine(\$functions[\$e->getFunctionName()]);
}
throw \$e;
}
}
public function getTemplateName()
{
return "foo.twig";
}
public function isTraitable()
{
return false;
}
public function getDebugInfo()
{
return array ( 11 => 1,);
}
}
EOF
, $twig);
return $tests;
}
}