mirror of
https://github.com/twigphp/Twig.git
synced 2026-08-30 20:16:45 +00:00
security #535 Fix sandbox __toString bypasses via Traversable in join/replace filters and the in/not in operators (fabpot)
This PR was squashed before being merged into the twig-3.x branch. Discussion ---------- Fix sandbox `__toString` bypasses via `Traversable` in `join`/`replace` filters and the `in`/`not in` operators Fixes #512 Commits -------e3f66654b8Fix deprecation notices in tests475fb690acGuard sandbox `__toString` walker against self-referencing iterablese9e818cbfcFix sandbox `__toString` bypass via `Stringable` + `Traversable` containers8d6af0707bFix sandbox `__toString` bypass via the `in` and `not in` operatorscc1e21a2a2Fix sandbox __toString bypass via Traversable in join/replace filters
This commit is contained in:
@@ -7,6 +7,9 @@
|
||||
* Escape root profile name in `HtmlDumper`
|
||||
* Deprecate the `Twig\Sandbox\SourcePolicyInterface` interface with no replacement
|
||||
* Fix sandbox bypass in the "column" filter when sandboxing is enabled via `SourcePolicyInterface`
|
||||
* Fix sandbox `__toString` bypass via `Traversable` arguments to the `join` and `replace` filters (also covers containers that implement both `Stringable` and `Traversable`)
|
||||
* Fix sandbox `__toString` bypass via the `in` and `not in` operators
|
||||
* Prevent a stack overflow in `SandboxExtension::ensureToStringAllowed()` when a self-referencing iterable is passed to a sandboxed template
|
||||
|
||||
# 3.26.0 (2026-05-20)
|
||||
|
||||
|
||||
@@ -126,24 +126,7 @@ final class SandboxExtension extends AbstractExtension
|
||||
*/
|
||||
public function ensureToStringAllowed($obj, int $lineno = -1, ?Source $source = null)
|
||||
{
|
||||
if (\is_array($obj)) {
|
||||
$this->ensureToStringAllowedForArray($obj, $lineno, $source);
|
||||
|
||||
return $obj;
|
||||
}
|
||||
|
||||
if ($obj instanceof \Stringable && $this->isSandboxed($source)) {
|
||||
try {
|
||||
$this->policy->checkMethodAllowed($obj, '__toString');
|
||||
} catch (SecurityNotAllowedMethodError $e) {
|
||||
$e->setSourceContext($source);
|
||||
$e->setTemplateLine($lineno);
|
||||
|
||||
throw $e;
|
||||
}
|
||||
}
|
||||
|
||||
return $obj;
|
||||
return $this->doEnsureToStringAllowed($obj, $lineno, $source, new \SplObjectStorage());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -155,16 +138,72 @@ final class SandboxExtension extends AbstractExtension
|
||||
*/
|
||||
public function ensureSpreadAllowed(iterable $obj, int $lineno = -1, ?Source $source = null): array
|
||||
{
|
||||
$seen = new \SplObjectStorage();
|
||||
if ($obj instanceof \Traversable) {
|
||||
$seen[$obj] = true;
|
||||
$obj = iterator_to_array($obj);
|
||||
}
|
||||
|
||||
$this->ensureToStringAllowedForArray($obj, $lineno, $source);
|
||||
$this->ensureToStringAllowedForArray($obj, $lineno, $source, $seen);
|
||||
|
||||
return $obj;
|
||||
}
|
||||
|
||||
private function ensureToStringAllowedForArray(array $obj, int $lineno, ?Source $source, array &$stack = []): void
|
||||
private function doEnsureToStringAllowed($obj, int $lineno, ?Source $source, \SplObjectStorage $seen)
|
||||
{
|
||||
if (\is_array($obj)) {
|
||||
$this->ensureToStringAllowedForArray($obj, $lineno, $source, $seen);
|
||||
|
||||
return $obj;
|
||||
}
|
||||
|
||||
if (!$this->isSandboxed($source)) {
|
||||
return $obj;
|
||||
}
|
||||
|
||||
if ($obj instanceof \Stringable) {
|
||||
try {
|
||||
$this->policy->checkMethodAllowed($obj, '__toString');
|
||||
} catch (SecurityNotAllowedMethodError $e) {
|
||||
$e->setSourceContext($source);
|
||||
$e->setTemplateLine($lineno);
|
||||
|
||||
throw $e;
|
||||
}
|
||||
}
|
||||
|
||||
// A Traversable would later be materialised (e.g. by filters such as `join`
|
||||
// or `replace`) and its elements coerced to string by PHP itself, bypassing
|
||||
// the policy. Materialise it now and recursively check the contents. This
|
||||
// also applies to objects that implement both `Stringable` and `Traversable`:
|
||||
// the `__toString` check above only validates the container's own coercion,
|
||||
// not the elements yielded by `getIterator()`.
|
||||
if ($obj instanceof \Traversable) {
|
||||
// Guard against self-referencing iterables (e.g. an IteratorAggregate
|
||||
// whose getIterator() yields $this): without this check, materialising
|
||||
// and recursing into the elements would overflow the stack. Mirrors
|
||||
// the array-cycle guard in ensureToStringAllowedForArray().
|
||||
if (isset($seen[$obj])) {
|
||||
return $obj;
|
||||
}
|
||||
|
||||
$seen[$obj] = true;
|
||||
$array = iterator_to_array($obj);
|
||||
$this->ensureToStringAllowedForArray($array, $lineno, $source, $seen);
|
||||
|
||||
// Return the materialised array only when the object is not also
|
||||
// Stringable, so that callers that rely on `__toString` (e.g. `{{ obj }}`)
|
||||
// keep working. Plain consumers of iterables (join, replace, ...) call
|
||||
// `iterator_to_array()` again, so the extra materialisation is benign.
|
||||
if (!$obj instanceof \Stringable) {
|
||||
return $array;
|
||||
}
|
||||
}
|
||||
|
||||
return $obj;
|
||||
}
|
||||
|
||||
private function ensureToStringAllowedForArray(array $obj, int $lineno, ?Source $source, \SplObjectStorage $seen, array &$stack = []): void
|
||||
{
|
||||
foreach ($obj as $k => $v) {
|
||||
if (!$v) {
|
||||
@@ -172,7 +211,7 @@ final class SandboxExtension extends AbstractExtension
|
||||
}
|
||||
|
||||
if (!\is_array($v)) {
|
||||
$this->ensureToStringAllowed($v, $lineno, $source);
|
||||
$this->doEnsureToStringAllowed($v, $lineno, $source, $seen);
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -184,7 +223,7 @@ final class SandboxExtension extends AbstractExtension
|
||||
$stack[$r->getId()] = true;
|
||||
}
|
||||
|
||||
$this->ensureToStringAllowedForArray($v, $lineno, $source, $stack);
|
||||
$this->ensureToStringAllowedForArray($v, $lineno, $source, $seen, $stack);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,9 +12,10 @@
|
||||
namespace Twig\Node\Expression\Binary;
|
||||
|
||||
use Twig\Compiler;
|
||||
use Twig\Node\CoercesChildrenToStringInterface;
|
||||
use Twig\Node\Expression\ReturnBoolInterface;
|
||||
|
||||
class InBinary extends AbstractBinary implements ReturnBoolInterface
|
||||
class InBinary extends AbstractBinary implements ReturnBoolInterface, CoercesChildrenToStringInterface
|
||||
{
|
||||
public function compile(Compiler $compiler): void
|
||||
{
|
||||
@@ -31,4 +32,9 @@ class InBinary extends AbstractBinary implements ReturnBoolInterface
|
||||
{
|
||||
return $compiler->raw('in');
|
||||
}
|
||||
|
||||
public function getStringCoercedChildNames(): array
|
||||
{
|
||||
return ['left', 'right'];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,9 +12,10 @@
|
||||
namespace Twig\Node\Expression\Binary;
|
||||
|
||||
use Twig\Compiler;
|
||||
use Twig\Node\CoercesChildrenToStringInterface;
|
||||
use Twig\Node\Expression\ReturnBoolInterface;
|
||||
|
||||
class NotInBinary extends AbstractBinary implements ReturnBoolInterface
|
||||
class NotInBinary extends AbstractBinary implements ReturnBoolInterface, CoercesChildrenToStringInterface
|
||||
{
|
||||
public function compile(Compiler $compiler): void
|
||||
{
|
||||
@@ -31,4 +32,9 @@ class NotInBinary extends AbstractBinary implements ReturnBoolInterface
|
||||
{
|
||||
return $compiler->raw('not in');
|
||||
}
|
||||
|
||||
public function getStringCoercedChildNames(): array
|
||||
{
|
||||
return ['left', 'right'];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,6 +62,10 @@ class SandboxTest extends TestCase
|
||||
'magic' => new MagicObject(),
|
||||
'recursion' => [4],
|
||||
'iterator' => new \ArrayIterator(['a', new FooObject()]),
|
||||
'iterator_map' => new \ArrayIterator(['__toString' => new FooObject()]),
|
||||
'iterator_nested' => new \ArrayIterator(['a', new \ArrayIterator(['b', new FooObject()])]),
|
||||
'stringable_iterator' => new StringableTraversableObject(['a', new FooObject()]),
|
||||
'stringable_iterator_map' => new StringableTraversableObject(['__toString' => new FooObject()]),
|
||||
];
|
||||
self::$params['recursion'][] = &self::$params['recursion'];
|
||||
self::$params['recursion'][] = new FooObject();
|
||||
@@ -589,6 +593,9 @@ class SandboxTest extends TestCase
|
||||
'spread_array_operator' => ['{{ [1, 2, ...[5, 6, 7, obj]]|join(",") }}'],
|
||||
'spread_array_operator_var' => ['{{ [1, 2, ...some_array]|join(",") }}'],
|
||||
'spread_iterator_in_function_args' => ['{{ ["x", ...iterator]|join(",") }}'],
|
||||
'iterator_in_join' => ['{{ iterator|join(", ") }}'],
|
||||
'iterator_nested_in_join' => ['{{ iterator_nested|join(", ") }}'],
|
||||
'iterator_in_replace' => ['{{ "__toString"|replace(iterator_map) }}'],
|
||||
'recursion' => ['{{ recursion|join(", ") }}'],
|
||||
'ternary_print' => ['{{ true ? obj : "" }}'],
|
||||
'ternary_filter_input' => ['{{ (true ? obj : "")|upper }}'],
|
||||
@@ -609,6 +616,12 @@ class SandboxTest extends TestCase
|
||||
'concat_right_in_if' => ['{% if "" ~ obj %}LEAK{% endif %}'],
|
||||
'range_left' => ['{% for x in obj..1 %}LEAK{% endfor %}'],
|
||||
'range_right' => ['{% for x in 1..obj %}LEAK{% endfor %}'],
|
||||
'in_array_right' => ['{% if "needle" in [obj] %}LEAK{% endif %}'],
|
||||
'in_array_left' => ['{% if obj in ["needle"] %}LEAK{% endif %}'],
|
||||
'notin_array_right' => ['{% if "needle" not in [obj] %}LEAK{% endif %}'],
|
||||
'notin_array_left' => ['{% if obj not in ["needle"] %}LEAK{% endif %}'],
|
||||
'in_iterator_right' => ['{% if "needle" in iterator %}LEAK{% endif %}'],
|
||||
'notin_iterator_right' => ['{% if "needle" not in iterator %}LEAK{% endif %}'],
|
||||
'do_tag_function_arg' => ['{% do my_func(obj) %}'],
|
||||
'do_tag_filter_input' => ['{% do obj|upper %}'],
|
||||
'do_tag_concat' => ['{% do obj ~ "" %}'],
|
||||
@@ -1165,6 +1178,171 @@ EOF
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider getStringableTraversableBypassTemplates
|
||||
*/
|
||||
public function testSandboxBlocksToStringInStringableTraversable(string $template)
|
||||
{
|
||||
$twig = $this->getEnvironment(
|
||||
true,
|
||||
[],
|
||||
['index' => $template],
|
||||
[],
|
||||
['join', 'replace'],
|
||||
['Twig\Tests\Extension\StringableTraversableObject' => ['__tostring']],
|
||||
);
|
||||
|
||||
try {
|
||||
$twig->load('index')->render(self::$params);
|
||||
$this->fail('Sandbox should block __toString on objects yielded by a Stringable+Traversable container, even when the container\'s own __toString is allowed.');
|
||||
} catch (SecurityNotAllowedMethodError $e) {
|
||||
$this->assertSame('Twig\Tests\Extension\FooObject', $e->getClassName());
|
||||
$this->assertSame('__tostring', $e->getMethodName());
|
||||
}
|
||||
}
|
||||
|
||||
public static function getStringableTraversableBypassTemplates(): iterable
|
||||
{
|
||||
yield 'join' => ['{{ stringable_iterator|join(", ") }}'];
|
||||
yield 'replace' => ['{{ "__toString"|replace(stringable_iterator_map) }}'];
|
||||
}
|
||||
|
||||
/**
|
||||
* @group legacy
|
||||
*
|
||||
* @dataProvider getStringableTraversableBypassTemplates
|
||||
*/
|
||||
public function testSourcePolicySandboxBlocksToStringInStringableTraversable(string $template)
|
||||
{
|
||||
$this->expectDeprecation('Since twig/twig 3.27.0: The "Twig\Sandbox\SourcePolicyInterface" interface is deprecated with no replacement, do not pass an instance to "Twig\Extension\SandboxExtension".');
|
||||
|
||||
$sourcePolicy = new class implements SourcePolicyInterface {
|
||||
public function enableSandbox(Source $source): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
$twig = $this->getEnvironment(
|
||||
false,
|
||||
[],
|
||||
['index' => $template],
|
||||
[],
|
||||
['join', 'replace'],
|
||||
['Twig\Tests\Extension\StringableTraversableObject' => ['__tostring']],
|
||||
[],
|
||||
[],
|
||||
$sourcePolicy,
|
||||
);
|
||||
|
||||
try {
|
||||
$twig->load('index')->render(self::$params);
|
||||
$this->fail('Sandbox should block __toString on objects yielded by a Stringable+Traversable container under a SourcePolicyInterface-only sandbox.');
|
||||
} catch (SecurityNotAllowedMethodError $e) {
|
||||
$this->assertSame('Twig\Tests\Extension\FooObject', $e->getClassName());
|
||||
$this->assertSame('__tostring', $e->getMethodName());
|
||||
}
|
||||
}
|
||||
|
||||
public function testSandboxAllowsPrintingStringableTraversableWhenToStringAllowed()
|
||||
{
|
||||
// Printing the container itself yields its `__toString()` value. The
|
||||
// sandbox materialises the iterable to also policy-check the elements
|
||||
// (some consumers like `join`/`replace` would coerce them too), so the
|
||||
// inner items must not contain anything that violates the policy.
|
||||
$twig = $this->getEnvironment(
|
||||
true,
|
||||
['autoescape' => 'html'],
|
||||
['index' => '{{ obj }}'],
|
||||
[],
|
||||
['escape'],
|
||||
['Twig\Tests\Extension\StringableTraversableObject' => ['__tostring']],
|
||||
);
|
||||
|
||||
$params = ['obj' => new StringableTraversableObject(['a', 'b'])];
|
||||
|
||||
$this->assertSame('stringable-traversable', $twig->load('index')->render($params));
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider getCyclicTraversableTemplates
|
||||
*/
|
||||
public function testSandboxHandlesCyclicTraversableWithoutStackOverflow(string $template)
|
||||
{
|
||||
// A self-referencing IteratorAggregate must not cause the sandbox policy
|
||||
// walker to recurse infinitely when materialising the iterable. PHP itself
|
||||
// throws a clean error when the cyclic object reaches `implode()` /
|
||||
// string coercion; the sandbox must NOT turn that into a stack overflow.
|
||||
$twig = $this->getEnvironment(
|
||||
true,
|
||||
[],
|
||||
['index' => $template],
|
||||
[],
|
||||
['join', 'replace'],
|
||||
);
|
||||
|
||||
$this->expectException(RuntimeError::class);
|
||||
|
||||
$twig->load('index')->render(['obj' => new CyclicTraversableObject()]);
|
||||
}
|
||||
|
||||
public static function getCyclicTraversableTemplates(): iterable
|
||||
{
|
||||
yield 'join' => ['{{ obj|join(",") }}'];
|
||||
yield 'replace' => ['{{ "x"|replace(obj) }}'];
|
||||
yield 'spread' => ['{{ ["a", ...obj]|join(",") }}'];
|
||||
}
|
||||
|
||||
/**
|
||||
* @group legacy
|
||||
*/
|
||||
public function testSourcePolicySandboxBlocksToStringInTraversableJoin()
|
||||
{
|
||||
$this->expectDeprecation('Since twig/twig 3.27.0: The "Twig\Sandbox\SourcePolicyInterface" interface is deprecated with no replacement, do not pass an instance to "Twig\Extension\SandboxExtension".');
|
||||
|
||||
$sourcePolicy = new class implements SourcePolicyInterface {
|
||||
public function enableSandbox(Source $source): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
$twig = $this->getEnvironment(false, [], ['index' => '{{ iterator|join(", ") }}'], [], ['join'], [], [], [], $sourcePolicy);
|
||||
|
||||
try {
|
||||
$twig->load('index')->render(self::$params);
|
||||
$this->fail('Sandbox should block __toString on objects contained in a Traversable passed to the "join" filter (SourcePolicyInterface).');
|
||||
} catch (SecurityNotAllowedMethodError $e) {
|
||||
$this->assertSame('Twig\Tests\Extension\FooObject', $e->getClassName());
|
||||
$this->assertSame('__tostring', $e->getMethodName());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @group legacy
|
||||
*/
|
||||
public function testSourcePolicySandboxBlocksToStringInTraversableReplace()
|
||||
{
|
||||
$this->expectDeprecation('Since twig/twig 3.27.0: The "Twig\Sandbox\SourcePolicyInterface" interface is deprecated with no replacement, do not pass an instance to "Twig\Extension\SandboxExtension".');
|
||||
|
||||
$sourcePolicy = new class implements SourcePolicyInterface {
|
||||
public function enableSandbox(Source $source): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
$twig = $this->getEnvironment(false, [], ['index' => '{{ "__toString"|replace(iterator_map) }}'], [], ['replace'], [], [], [], $sourcePolicy);
|
||||
|
||||
try {
|
||||
$twig->load('index')->render(self::$params);
|
||||
$this->fail('Sandbox should block __toString on objects contained in a Traversable passed to the "replace" filter (SourcePolicyInterface).');
|
||||
} catch (SecurityNotAllowedMethodError $e) {
|
||||
$this->assertSame('Twig\Tests\Extension\FooObject', $e->getClassName());
|
||||
$this->assertSame('__tostring', $e->getMethodName());
|
||||
}
|
||||
}
|
||||
|
||||
public function testColumnFilterUnaffectedOutsideSandbox()
|
||||
{
|
||||
$params = ['obj' => new ColumnObject()];
|
||||
@@ -1671,3 +1849,36 @@ class ColumnObject
|
||||
{
|
||||
public $bar = 'bar';
|
||||
}
|
||||
|
||||
// Implements both Stringable and Traversable: a sandbox policy may legitimately
|
||||
// allow the container's own `__toString`, but the elements yielded by
|
||||
// `getIterator()` must still be policy-checked when consumers (`join`, `replace`,
|
||||
// ...) materialise the iterable and coerce its contents to string.
|
||||
class StringableTraversableObject implements \IteratorAggregate, \Stringable
|
||||
{
|
||||
public function __construct(private array $items)
|
||||
{
|
||||
}
|
||||
|
||||
public function __toString(): string
|
||||
{
|
||||
return 'stringable-traversable';
|
||||
}
|
||||
|
||||
public function getIterator(): \Traversable
|
||||
{
|
||||
yield from $this->items;
|
||||
}
|
||||
}
|
||||
|
||||
// Self-referencing IteratorAggregate: getIterator() yields `$this`. Used to
|
||||
// verify that the sandbox policy walker (which materialises Traversables to
|
||||
// enforce the `__toString` policy on yielded elements) does not recurse
|
||||
// infinitely.
|
||||
class CyclicTraversableObject implements \IteratorAggregate
|
||||
{
|
||||
public function getIterator(): \Traversable
|
||||
{
|
||||
yield $this;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user