Implement DOM schema validation

Author: tvdijen

composer.json

@@ -32,9 +32,9 @@
         "psr/http-message": "^2.0",
         "psr/log": "^2.0 || ^3.0",
         "simplesamlphp/assert": "~1.6.0",
-        "simplesamlphp/xml-common": "~1.22.0",
+        "simplesamlphp/xml-common": "~1.23.0",
         "simplesamlphp/xml-security": "~1.12.0",
-        "simplesamlphp/xml-soap": "~1.5.6"
+        "simplesamlphp/xml-soap": "~1.6.0"
     },
     "require-dev": {
         "ext-intl": "*",

src/XML/alg/AbstractAlgElement.php

@@ -19,4 +19,7 @@ abstract class AbstractAlgElement extends AbstractElement
 
     /** @var string */
     public const NS_PREFIX = 'alg';
+
+    /** @var string */
+    public const SCHEMA = 'resources/schemas/sstc-saml-metadata-algsupport-v1.0.xsd';
 }

src/XML/alg/DigestMethod.php

@@ -9,6 +9,8 @@
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableElementTrait;
+use SimpleSAML\XML\SchemaValidatableElementInterface;
+use SimpleSAML\XML\SchemaValidatableElementTrait;
 use SimpleSAML\XML\XsNamespace as NS;
 
 /**
@@ -17,9 +19,10 @@
  * @link http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-metadata-algsupport.pdf
  * @package simplesamlphp/saml2
  */
-final class DigestMethod extends AbstractAlgElement
+final class DigestMethod extends AbstractAlgElement implements SchemaValidatableElementInterface
 {
     use ExtendableElementTrait;
+    use SchemaValidatableElementTrait;
 
     /** The namespace-attribute for the xs:any element */
     public const XS_ANY_ELT_NAMESPACE = NS::ANY;

src/XML/alg/SigningMethod.php

@@ -9,6 +9,8 @@
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableElementTrait;
+use SimpleSAML\XML\SchemaValidatableElementInterface;
+use SimpleSAML\XML\SchemaValidatableElementTrait;
 use SimpleSAML\XML\XsNamespace as NS;
 
 use function strval;
@@ -19,9 +21,10 @@
  * @link http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-metadata-algsupport.pdf
  * @package simplesamlphp/saml2
  */
-final class SigningMethod extends AbstractAlgElement
+final class SigningMethod extends AbstractAlgElement implements SchemaValidatableElementInterface
 {
     use ExtendableElementTrait;
+    use SchemaValidatableElementTrait;
 
     /** The namespace-attribute for the xs:any element */
     public const XS_ANY_ELT_NAMESPACE = NS::ANY;

src/XML/ecp/AbstractEcpElement.php

@@ -21,4 +21,7 @@ abstract class AbstractEcpElement extends AbstractElement
 
     /** @var string */
     public const NS_PREFIX = 'ecp';
+
+    /** @var string */
+    public const SCHEMA = 'resources/schemas/saml-schema-ecp-2.0.xsd';
 }

src/XML/ecp/RelayState.php

@@ -10,15 +10,18 @@
 use SimpleSAML\SOAP\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingAttributeException;
+use SimpleSAML\XML\SchemaValidatableElementInterface;
+use SimpleSAML\XML\SchemaValidatableElementTrait;
 use SimpleSAML\XML\StringElementTrait;
 
 /**
  * Class representing the ECP RelayState element.
  *
  * @package simplesamlphp/saml2
  */
-final class RelayState extends AbstractEcpElement
+final class RelayState extends AbstractEcpElement implements SchemaValidatableElementInterface
 {
+    use SchemaValidatableElementTrait;
     use StringElementTrait;
 
     /**

src/XML/ecp/Request.php

@@ -13,6 +13,8 @@
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingAttributeException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
+use SimpleSAML\XML\SchemaValidatableElementInterface;
+use SimpleSAML\XML\SchemaValidatableElementTrait;
 
 use function intval;
 use function strval;
@@ -22,8 +24,10 @@
  *
  * @package simplesamlphp/saml2
  */
-final class Request extends AbstractEcpElement
+final class Request extends AbstractEcpElement implements SchemaValidatableElementInterface
 {
+    use SchemaValidatableElementTrait;
+
     /**
      * Create a ECP Request element.
      *

src/XML/ecp/RequestAuthenticated.php

@@ -10,6 +10,8 @@
 use SimpleSAML\SOAP\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingAttributeException;
+use SimpleSAML\XML\SchemaValidatableElementInterface;
+use SimpleSAML\XML\SchemaValidatableElementTrait;
 
 use function boolval;
 use function strval;
@@ -19,8 +21,10 @@
  *
  * @package simplesamlphp/saml2
  */
-final class RequestAuthenticated extends AbstractEcpElement
+final class RequestAuthenticated extends AbstractEcpElement implements SchemaValidatableElementInterface
 {
+    use SchemaValidatableElementTrait;
+
     /**
      * Create a ECP RequestAuthenticated element.
      *

src/XML/ecp/Response.php

@@ -11,14 +11,18 @@
 use SimpleSAML\SOAP\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingAttributeException;
+use SimpleSAML\XML\SchemaValidatableElementInterface;
+use SimpleSAML\XML\SchemaValidatableElementTrait;
 
 /**
  * Class representing the ECP Response element.
  *
  * @package simplesamlphp/saml2
  */
-final class Response extends AbstractEcpElement
+final class Response extends AbstractEcpElement implements SchemaValidatableElementInterface
 {
+    use SchemaValidatableElementTrait;
+
     /**
      * Create a ECP Response element.
      *

src/XML/ecp/SubjectConfirmation.php

@@ -13,14 +13,18 @@
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingAttributeException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
+use SimpleSAML\XML\SchemaValidatableElementInterface;
+use SimpleSAML\XML\SchemaValidatableElementTrait;
 
 /**
  * Class representing the ECP SubjectConfirmation element.
  *
  * @package simplesamlphp/saml2
  */
-final class SubjectConfirmation extends AbstractEcpElement
+final class SubjectConfirmation extends AbstractEcpElement implements SchemaValidatableElementInterface
 {
+    use SchemaValidatableElementTrait;
+
     /**
      * Create a ECP SubjectConfirmation element.
      *