Fix xenc:KeySize

Author: tvdijen

src/XML/xenc/KeySize.php

@@ -4,9 +4,10 @@
 
 namespace SimpleSAML\XMLSecurity\XML\xenc;
 
+use DOMElement;
 use SimpleSAML\Assert\Assert;
+use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
-use SimpleSAML\XML\StringElementTrait;
 
 /**
  * Class representing a xenc:KeySize element.
@@ -16,30 +17,68 @@
  */
 final class KeySize extends AbstractXencElement
 {
-    use StringElementTrait;
+    /** @var int */
+    protected int $keySize;
 
 
     /**
-     * @param string $content
+     * @param int $keySize
      */
-    public function __construct(string $content)
+    public function __construct(int $keySize)
     {
-        $this->setContent($content);
+        $this->setKeySize($keySize);
     }
 
 
     /**
-     * Validate the content of the element.
+     * @param int $keySize
+     */
+    protected function setKeySize(int $keySize): void
+    {
+        Assert::positiveInteger($keySize, SchemaViolationException::class);
+        $this->keySize = $keySize;
+    }
+
+
+    /**
+     * @return int
+     */
+    public function getKeySize(): int
+    {
+        return $this->keySize;
+    }
+
+
+    /**
+     * Convert XML into a class instance
+     *
+     * @param \DOMElement $xml The XML element we should load
+     * @return static
      *
-     * @param string $content  The value to go in the XML textContent
-     * @throws \Exception on failure
-     * @return void
+     * @throws \SimpleSAML\XML\Exception\InvalidDOMElementException
+     *   If the qualified name of the supplied element is wrong
      */
-    protected function validateContent(string $content): void
+    public static function fromXML(DOMElement $xml): static
     {
-        Assert::positiveInteger(
-            intval($content),
-            SchemaViolationException::class
-        );
+        Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class);
+        Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
+        Assert::numeric($xml->textContent);
+
+        return new static(intval($xml->textContent));
+    }
+
+
+    /**
+     * Convert this element to XML.
+     *
+     * @param \DOMElement|null $parent The element we should append this element to.
+     * @return \DOMElement
+     */
+    public function toXML(DOMElement $parent = null): DOMElement
+    {
+        $e = $this->instantiateParentElement($parent);
+        $e->textContent = strval($this->getKeySize());
+
+        return $e;
     }
 }

tests/XML/xenc/EncryptionMethodTest.php

@@ -54,7 +54,7 @@ public function testMarshalling(): void
         $chunkXml = DOMDocumentFactory::fromString('<other:Element xmlns:other="urn:other:enc">Value</other:Element>');
         $chunk = Chunk::fromXML($chunkXml->documentElement);
 
-        $em = new EncryptionMethod($alg, new KeySize('10'), new OAEPparams('9lWu3Q=='), [$chunk]);
+        $em = new EncryptionMethod($alg, new KeySize(10), new OAEPparams('9lWu3Q=='), [$chunk]);
 
         $this->assertEquals(
             $this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement),
@@ -90,7 +90,7 @@ public function testMarshallingElementOrdering(): void
         $chunkXml = DOMDocumentFactory::fromString('<other:Element xmlns:other="urn:other:enc">Value</other:Element>');
         $chunk = Chunk::fromXML($chunkXml->documentElement);
 
-        $em = new EncryptionMethod($alg, new KeySize('10'), new OAEPparams('9lWu3Q=='), [$chunk]);
+        $em = new EncryptionMethod($alg, new KeySize(10), new OAEPparams('9lWu3Q=='), [$chunk]);
 
         // Marshall it to a \DOMElement
         $emElement = $em->toXML();

tests/XML/xenc/KeySizeTest.php

@@ -40,7 +40,7 @@ protected function setUp(): void
      */
     public function testMarshalling(): void
     {
-        $keySize = new KeySize('10');
+        $keySize = new KeySize(10);
 
         $this->assertEquals(
             $this->xmlRepresentation->saveXML($this->xmlRepresentation->documentElement),