[5.x] Detect recursion when augmenting Entries (#11854)

Author: JohnathonKoster

src/Data/HasOrigin.php

@@ -2,10 +2,13 @@
 
 namespace Statamic\Data;
 
+use Statamic\Exceptions\RecursiveAugmentationException;
 use Statamic\Facades\Blink;
 
 trait HasOrigin
 {
+    private $resolvingValues = false;
+
     /**
      * @var string
      */
@@ -31,14 +34,33 @@ public function keys()
             ->merge($computedKeys);
     }
 
+    private function guardRecursiveAugmentation()
+    {
+        if ($this->resolvingValues) {
+            $className = get_class($this);
+            throw new RecursiveAugmentationException("Recursion detected while augmenting [{$className}] with ID [{$this->id}].");
+        }
+
+        $this->resolvingValues = true;
+    }
+
+    private function ungardRecursiveAugmentation()
+    {
+        $this->resolvingValues = false;
+    }
+
     public function values()
     {
+        $this->guardRecursiveAugmentation();
+
         $originFallbackValues = method_exists($this, 'getOriginFallbackValues') ? $this->getOriginFallbackValues() : collect();
 
         $originValues = $this->hasOrigin() ? $this->origin()->values() : collect();
 
         $computedData = method_exists($this, 'computedData') ? $this->computedData() : [];
 
+        $this->ungardRecursiveAugmentation();
+
         return collect()
             ->merge($originFallbackValues)
             ->merge($originValues)

src/Exceptions/RecursiveAugmentationException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Statamic\Exceptions;
+
+class RecursiveAugmentationException extends \Exception
+{
+}

tests/Data/Entries/EntryTest.php

@@ -29,6 +29,7 @@
 use Statamic\Events\EntryDeleting;
 use Statamic\Events\EntrySaved;
 use Statamic\Events\EntrySaving;
+use Statamic\Exceptions\RecursiveAugmentationException;
 use Statamic\Facades;
 use Statamic\Facades\Blink;
 use Statamic\Fields\Blueprint;
@@ -2678,4 +2679,23 @@ public function it_clones_internal_collections()
         $this->assertEquals('A', $entry->getSupplement('bar'));
         $this->assertEquals('B', $clone->getSupplement('bar'));
     }
+
+    #[Test]
+    public function it_detects_recursive_augmentation()
+    {
+        $this->expectException(RecursiveAugmentationException::class);
+        $this->expectExceptionMessage('Recursion detected while augmenting [Statamic\Entries\Entry] with ID [entry-id]');
+
+        \Statamic\Facades\Collection::computed('test', 'the_value', function ($entry) {
+            // Trigger recursion that will bypass without computed values.
+            return $entry->routeData();
+        });
+
+        $entry = EntryFactory::id('entry-id')
+            ->collection('test')
+            ->slug('entry-slug')
+            ->create();
+
+        $entry->values();
+    }
 }