Add testable CustomSignable and CustomSigned

Author: tvdijen

bin/generate_CustomSignable.php

@@ -13,4 +13,5 @@
 
 $privateKey = PEMCertificatesMock::getPrivateKey(XMLSecurityKey::RSA_SHA256, PEMCertificatesMock::SELFSIGNED_PRIVATE_KEY);
 $x = $signable->sign($privateKey);
-echo $x->ownerDocument->saveXML();
+echo $x;
+//var_dump($x);

src/XML/AbstractSignedXMLElement.php

@@ -38,14 +38,25 @@ abstract class AbstractSignedXMLElement implements SignedElementInterface
      * @param \SimpleSAML\XMLSecurity\XML\SignableElementInterface $elt
      * @param \SimpleSAML\XMLSecurity\XML\ds\Signature $signature
      */
-    private function __construct(DOMElement $xml, SignableElementInterface $elt, Signature $signature)
+    protected function __construct(DOMElement $xml, SignableElementInterface $elt, Signature $signature)
     {
         $this->setStructure($xml);
         $this->setElement($elt);
         $this->setSignature($signature);
     }
 
 
+    /**
+     * Output the class as an XML-formatted string
+     *
+     * @return string
+     */
+    public function __toString(): string
+    {
+        return $this->structure->ownerDocument->saveXML();
+    }
+
+
     /**
      * Collect the value of the unsigned element
      *

src/XML/SignableElementTrait.php

@@ -7,10 +7,10 @@
 use DOMElement;
 use DOMNode;
 use SimpleSAML\Assert\Assert;
+use SimpleSAML\XML\Utils as XMLUtils;
 use SimpleSAML\XMLSecurity\Utils\Security as XMLSecurityUtils;
 use SimpleSAML\XMLSecurity\XML\ds\Signature;
 use SimpleSAML\XMLSecurity\XMLSecurityKey;
-use SimpleSAML\XML\Utils as XMLUtils;
 
 /**
  * Helper trait for processing signed elements.

tests/XML/CustomSignable.php

@@ -5,9 +5,11 @@
 namespace SimpleSAML\XMLSecurity\Test\XML;
 
 use DOMElement;
+use SimpleSAML\Assert\Assert;
 use SimpleSAML\XML\AbstractXMLElement;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
+use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 use SimpleSAML\XMLSecurity\XML\SignableElementInterface;
 use SimpleSAML\XMLSecurity\XML\SignableElementTrait;
@@ -110,7 +112,8 @@ public static function fromXML(DOMElement $xml): object
         Assert::same($xml->localName, 'CustomSignable', InvalidDOMElementException::class);
         Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
 
-        Assert::count($xml->childNodes, 1, TooManyElementsException);
+        Assert::minCount($xml->childNodes, 1, MissingElementException::class);
+        Assert::maxCount($xml->childNodes, 2, TooManyElementsException::class);
         $element = new Chunk($xml->childNodes[0]);
 
         return new self($element);

tests/XML/CustomSigned.php

@@ -6,6 +6,8 @@
 
 use DOMElement;
 use SimpleSAML\Assert\Assert;
+use SimpleSAML\XML\Chunk;
+use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 use SimpleSAML\XML\Utils as XMLUtils;
 use SimpleSAML\XMLSecurity\XML\ds\Signature;
@@ -29,20 +31,17 @@ final class CustomSigned extends AbstractSignedXMLElement
      */
     public static function fromXML(DOMElement $xml): object
     {
-// Empty array
-$s = XMLUtils::xpQuery($xml, './ssp:CustomSignable/ds:Signature');
-var_dump($s);
-
-// Also empty array
+        Assert::same($xml->localName, 'CustomSignable', InvalidDOMElementException::class);
+        Assert::same($xml->namespaceURI, CustomSignable::NS, InvalidDOMElementException::class);
+        $element = CustomSignable::fromXML($xml);
         $signature = Signature::getChildrenOfClass($xml);
-        Assert::count($signature, 1, TooManyElementsException::class);
 
-        $element = CustomSignable::getChildrenOfClass($xml);
-        Assert::count($element, 1, TooManyElementsException::class);
+        Assert::minCount($signature, 1, MissingElementException::class);
+        Assert::minCount($signature, 1, TooManyElementsException::class);
 
         return new self(
             $xml,
-            array_pop($element),
+            $element,
             array_pop($signature)
         );
     }