ensure trust boundaries are retrieved if x-allowed-locations exists

Author: bshaffer

src/TrustBoundaryTrait.php

@@ -37,11 +37,15 @@ private function getTrustBoundary(
             return null;
         }
 
+        if (array_key_exists('x-allowed-locations', $headers)) {
+            // If the headers are already set, do not set them
+            return null;
+        }
+
         // Return cached value if it exists
         if ($cached = $this->getCachedValue($this->getCacheKey() . ':trustboundary')) {
             return $cached;
         }
-
         if (!array_key_exists('authorization', $headers)) {
             // If we don't have an authorization token we can't look up the trust boundary
             return null;

tests/TrustBoundaryTraitTest.php

@@ -144,6 +144,19 @@ public function testSkipLookupOutsideDefaultUniverseDomain()
         $this->assertNull($result1);
     }
 
+    public function testSkipLookupIfXAllowedLocationsAreAlreadySet()
+    {
+        // First call, should fetch and cache
+        $result1 = $this->impl->getTrustBoundary(
+            'universe.domain',
+            fn () => throw new \Exception('Should not be called'),
+            'default',
+            ['authorization' => ['xyz'], ['x-allowed-locations' => 'abc']]
+        );
+
+        $this->assertNull($result1);
+    }
+
     public function testLookupIsFailOpen()
     {
         $mock = new MockHandler([