File size: 3,140 Bytes
4d2a9bf | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | diff --git a/src/Extension/CoreExtension.php b/src/Extension/CoreExtension.php
index fa97918b653..3ed27a35cc3 100644
--- a/src/Extension/CoreExtension.php
+++ b/src/Extension/CoreExtension.php
@@ -1431,13 +1431,6 @@ public static function include(Environment $env, $context, $template, $variables
if (!$alreadySandboxed = $sandbox->isSandboxed()) {
$sandbox->enableSandbox();
}
-
- foreach ((\is_array($template) ? $template : [$template]) as $name) {
- // if a Template instance is passed, it might have been instantiated outside of a sandbox, check security
- if ($name instanceof TemplateWrapper || $name instanceof Template) {
- $name->unwrap()->checkSecurity();
- }
- }
}
try {
@@ -1452,6 +1445,10 @@ public static function include(Environment $env, $context, $template, $variables
return '';
}
+ if ($isSandboxed) {
+ $loaded->unwrap()->checkSecurity();
+ }
+
return $loaded->render($variables);
} finally {
if ($isSandboxed && !$alreadySandboxed) {
diff --git a/tests/Extension/CoreTest.php b/tests/Extension/CoreTest.php
index e869f96c7b5..6bb74807f86 100644
--- a/tests/Extension/CoreTest.php
+++ b/tests/Extension/CoreTest.php
@@ -12,8 +12,13 @@
*/
use PHPUnit\Framework\TestCase;
+use Twig\Environment;
use Twig\Error\RuntimeError;
use Twig\Extension\CoreExtension;
+use Twig\Extension\SandboxExtension;
+use Twig\Loader\ArrayLoader;
+use Twig\Sandbox\SecurityError;
+use Twig\Sandbox\SecurityPolicy;
class CoreTest extends TestCase
{
@@ -354,6 +359,40 @@ public static function provideCompareCases()
[1, 42, "\x00\x34\x32"],
];
}
+
+ public function testSandboxedInclude()
+ {
+ $twig = new Environment(new ArrayLoader([
+ 'index' => '{{ include("included", sandboxed: true) }}',
+ 'included' => '{{ "included"|e }}',
+ ]));
+ $policy = new SecurityPolicy(allowedFunctions: ['include']);
+ $sandbox = new SandboxExtension($policy, false);
+ $twig->addExtension($sandbox);
+
+ // We expect a compile error
+ $this->expectException(SecurityError::class);
+ $twig->render('index');
+ }
+
+ public function testSandboxedIncludeWithPreloadedTemplate()
+ {
+ $twig = new Environment(new ArrayLoader([
+ 'index' => '{{ include("included", sandboxed: true) }}',
+ 'included' => '{{ "included"|e }}',
+ ]));
+ $policy = new SecurityPolicy(allowedFunctions: ['include']);
+ $sandbox = new SandboxExtension($policy, false);
+ $twig->addExtension($sandbox);
+
+ // The template is loaded without the sandbox enabled
+ // so, no compile error
+ $twig->load('included');
+
+ // We expect a runtime error
+ $this->expectException(SecurityError::class);
+ $twig->render('index');
+ }
}
final class CoreTestIteratorAggregate implements \IteratorAggregate
|