Ensure the NameID value matches the Format

simplesamlphp · Jul 19, 2024 · 7a328da · 7a328da
1 parent afae4f3
commit 7a328da
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/SAML2/XML/saml/NameID.php b/src/SAML2/XML/saml/NameID.php
@@ -41,6 +41,19 @@ public function __construct(
         ?string $Format = null,
         ?string $SPProvidedID = null,
     ) {
+        if ($Format === C::NAMEID_EMAIL_ADDRESS) {
+            Assert::email(
+                $value,
+                "The content %s of the NameID was not in the format specified by the Format attribute",
+            );
+        }
+
+        if ($Format === C::NAMEID_ENTITY) {
+            Assert::null($NameQualifier, "Entity Identifier included a disallowed NameQualifier attribute.");
+            Assert::null($SPNameQualifier, "Entity Identifier included a disallowed SPNameQualifier attribute.");
+            Assert::null($SPProvidedID, "Entity Identifier included a disallowed SPProvidedID attribute.");
+        }
+
         parent::__construct($value, $NameQualifier, $SPNameQualifier, $Format, $SPProvidedID);
     }