Improved error handling: test entityIDs

Author: tvdijen

composer.json

@@ -36,7 +36,7 @@
     },
     "require": {
         "php": "^8.1",
-        "simplesamlphp/assert": "^1.0",
+        "simplesamlphp/saml2": "~5.0.2",
         "simplesamlphp/simplesamlphp": "^2.1",
         "symfony/http-foundation": "^6.4"
     },

src/Auth/Process/Authorize.php

@@ -4,10 +4,10 @@
 
 namespace SimpleSAML\Module\authorize\Auth\Process;
 
-use SimpleSAML\Assert\Assert;
 use SimpleSAML\Auth;
 use SimpleSAML\Error;
 use SimpleSAML\Module;
+use SimpleSAML\SAML2\Assert\Assert;
 use SimpleSAML\Utils;
 
 use function array_diff;
@@ -141,12 +141,16 @@ public function __construct(array $config, $reserved)
             // Extract spEntityIDs if present
             $spEntityIDs = null;
             if (isset($values['spEntityIDs'])) {
-                if (!is_array($values['spEntityIDs'])) {
-                    throw new Error\Exception(sprintf(
+                Assert::isArray(
+                    $values['spEntityIDs'],
+                    sprintf(
                         'Filter Authorize: spEntityIDs must be an array for attribute: %s',
                         var_export($attribute, true),
-                    ));
-                }
+                    ),
+                    Error\Exception::class,
+                );
+                Assert::allValidEntityID($values['spEntityIDs']);
+
                 $spEntityIDs = $values['spEntityIDs'];
                 unset($values['spEntityIDs']);
             }