Make explicit what part of the config is wrong when non-array endpoint type encountered (#2335)

thijskh · thijskh · commit 89e05f48b490 · 2024-11-28T06:56:28.000Z
diff --git a/src/SimpleSAML/Configuration.php b/src/SimpleSAML/Configuration.php
@@ -1204,9 +1204,14 @@ public function getEndpoints(string $endpointType): array
             return [];
         }
 
-
         $eps = $this->configuration[$endpointType];
-        Assert::isArray($eps, Error\CriticalConfigurationError::class);
+        if (!is_array($eps)) {
+            $filename = explode('/', $loc)[0];
+            throw new Error\CriticalConfigurationError(
+                "Endpoint of type $endpointType is not an array in $loc.",
+                $filename,
+            );
+        }
 
         $eps_count = count($eps);
 
diff --git a/tests/src/SimpleSAML/ConfigurationTest.php b/tests/src/SimpleSAML/ConfigurationTest.php
@@ -974,7 +974,8 @@ public function testGetEndpoints(): void
 
         // define a set of exception messages to expect
         $msgs = [
-            'The configuration is invalid: Expected an array. Got: integer',
+            "The configuration ([ARRAY]['SingleSignOnService']:) is invalid: Endpoint of type " .
+            "SingleSignOnService is not an array in [ARRAY]['SingleSignOnService']:.",
             'Expected a string or an array.',
             'Missing Location.',
             'Location must be a string.',
