Implement DOM schema validation

Author: tvdijen

src/Utils/XML.php

@@ -106,7 +106,7 @@ public static function processTransforms(
                     if ($xpath !== null) {
                         $arXPath = [];
                         $arXPath['query'] = '(.//. | .//@* | .//namespace::*)[' . $xpath->getExpression() . ']';
-                        $arXpath['namespaces'] = $xpath->getNamespaces();
+//                        $arXpath['namespaces'] = $xpath->getNamespaces();
                         // TODO: review if $nsnode->localName is equivalent to the keys in getNamespaces()
 //                        $nslist = $xp->query('./namespace::*', $node);
 //                        foreach ($nslist as $nsnode) {

src/XML/ds/AbstractDSAKeyValueType.php

@@ -9,6 +9,8 @@
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
+use SimpleSAML\XML\SchemaValidatableElementInterface;
+use SimpleSAML\XML\SchemaValidatableElementTrait;
 
 use function array_pop;
 
@@ -17,8 +19,10 @@
  *
  * @package simplesamlphp/xml-security
  */
-abstract class AbstractDSAKeyValueType extends AbstractDsElement
+abstract class AbstractDSAKeyValueType extends AbstractDsElement implements SchemaValidatableElementInterface
 {
+    use SchemaValidatableElementTrait;
+
     /**
      * DSAKeyValueType constructor.
      *

src/XML/ds/AbstractDsElement.php

@@ -19,4 +19,7 @@ abstract class AbstractDsElement extends AbstractElement
 
     /** @var string */
     public const NS_PREFIX = 'ds';
+
+    /** @var string */
+    public const SCHEMA = 'resources/schemas/xmldsig-core-schema.xsd';
 }

src/XML/ds/AbstractPGPDataType.php

@@ -10,6 +10,8 @@
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 use SimpleSAML\XML\ExtendableElementTrait;
+use SimpleSAML\XML\SchemaValidatableElementInterface;
+use SimpleSAML\XML\SchemaValidatableElementTrait;
 use SimpleSAML\XML\XsNamespace as NS;
 use SimpleSAML\XMLSecurity\XML\ds\AbstractDsElement;
 
@@ -20,9 +22,10 @@
  *
  * @package simplesamlphp/xml-security
  */
-abstract class AbstractPGPDataType extends AbstractDsElement
+abstract class AbstractPGPDataType extends AbstractDsElement implements SchemaValidatableElementInterface
 {
     use ExtendableElementTrait;
+    use SchemaValidatableElementTrait;
 
     /** @var \SimpleSAML\XML\XsNamespace */
     public const XS_ANY_ELT_NAMESPACE = NS::OTHER;

src/XML/ds/AbstractSPKIDataType.php

@@ -10,6 +10,8 @@
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\Registry\ElementRegistry;
+use SimpleSAML\XML\SchemaValidatableElementInterface;
+use SimpleSAML\XML\SchemaValidatableElementTrait;
 use SimpleSAML\XML\SerializableElementInterface;
 use SimpleSAML\XMLSecurity\XML\ds\AbstractDsElement;
 
@@ -18,8 +20,10 @@
  *
  * @package simplesamlphp/xml-security
  */
-abstract class AbstractSPKIDataType extends AbstractDsElement
+abstract class AbstractSPKIDataType extends AbstractDsElement implements SchemaValidatableElementInterface
 {
+    use SchemaValidatableElementTrait;
+
     /**
      * Initialize a SPKIData element.
      *

src/XML/ds/CanonicalizationMethod.php

@@ -8,6 +8,8 @@
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
+use SimpleSAML\XML\SchemaValidatableElementInterface;
+use SimpleSAML\XML\SchemaValidatableElementTrait;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 
@@ -16,8 +18,10 @@
  *
  * @package simplesamlphp/xml-security
  */
-final class CanonicalizationMethod extends AbstractDsElement
+final class CanonicalizationMethod extends AbstractDsElement implements SchemaValidatableElementInterface
 {
+    use SchemaValidatableElementTrait;
+
     /**
      * Initialize a CanonicalizationMethod element.
      *

src/XML/ds/DigestMethod.php

@@ -9,6 +9,8 @@
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableElementTrait;
+use SimpleSAML\XML\SchemaValidatableElementInterface;
+use SimpleSAML\XML\SchemaValidatableElementTrait;
 use SimpleSAML\XML\XsNamespace as NS;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
@@ -18,9 +20,10 @@
  *
  * @package simplesamlphp/xml-security
  */
-final class DigestMethod extends AbstractDsElement
+final class DigestMethod extends AbstractDsElement implements SchemaValidatableElementInterface
 {
     use ExtendableElementTrait;
+    use SchemaValidatableElementTrait;
 
     public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 

src/XML/ds/DigestValue.php

@@ -5,15 +5,18 @@
 namespace SimpleSAML\XMLSecurity\XML\ds;
 
 use SimpleSAML\XML\Base64ElementTrait;
+use SimpleSAML\XML\SchemaValidatableElementInterface;
+use SimpleSAML\XML\SchemaValidatableElementTrait;
 
 /**
  * Class representing a ds:DigestValue element.
  *
  * @package simplesaml/xml-security
  */
-final class DigestValue extends AbstractDsElement
+final class DigestValue extends AbstractDsElement implements SchemaValidatableElementInterface
 {
     use Base64ElementTrait;
+    use SchemaValidatableElementTrait;
 
 
     /**

src/XML/ds/DsObject.php

@@ -8,16 +8,19 @@
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableElementTrait;
+use SimpleSAML\XML\SchemaValidatableElementInterface;
+use SimpleSAML\XML\SchemaValidatableElementTrait;
 use SimpleSAML\XML\XsNamespace as NS;
 
 /**
  * Class representing a ds:Object element.
  *
  * @package simplesamlphp/xml-security
  */
-final class DsObject extends AbstractDsElement
+final class DsObject extends AbstractDsElement implements SchemaValidatableElementInterface
 {
     use ExtendableElementTrait;
+    use SchemaValidatableElementTrait;
 
     /** @var string */
     public const LOCALNAME = 'Object';

src/XML/ds/KeyInfo.php

@@ -7,6 +7,8 @@
 use DOMElement;
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
+use SimpleSAML\XML\SchemaValidatableElementInterface;
+use SimpleSAML\XML\SchemaValidatableElementTrait;
 
 use function array_merge;
 
@@ -15,8 +17,10 @@
  *
  * @package simplesamlphp/xml-security
  */
-final class KeyInfo extends AbstractKeyInfoType
+final class KeyInfo extends AbstractKeyInfoType implements SchemaValidatableElementInterface
 {
+    use SchemaValidatableElementTrait;
+
     /**
      * Convert XML into a KeyInfo
      *