Use local versions of StringElementTrait and URIElementTrait to compl…

…y with stricter SAML 2.0 specs

src/Assert/CustomAssertionTrait.php

@@ -63,8 +63,6 @@ private static function validURI(string $value, string $message = ''): void
         }
 
         try {
-            BaseAssert::notWhitespaceOnly($value, $message ?: '%s is not a SAML2-compliant URI');
-
             // If it doesn't have a scheme, it's not an absolute URI
             BaseAssert::regex($value, self::$scheme_regex, $message ?: '%s is not a SAML2-compliant URI');
         } catch (AssertionFailedException $e) {
@@ -82,6 +80,7 @@ private static function validEntityID(string $value, string $message = ''): void
         static::validURI($value);
 
         try {
+            BaseAssert::notWhitespaceOnly($value);
             BaseAssert::maxLength(
                 $value,
                 C::ENTITYID_MAX_LENGTH,

src/XML/StringElementTrait.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\SAML2\XML;
+
+use SimpleSAML\Assert\Assert;
+use SimpleSAML\SAML2\Exception\ProtocolViolationException;
+use SimpleSAML\XML\StringElementTrait as BaseStringElementTrait;
+
+/**
+ * Trait extending the default StringElementTrait to comply with the restrictions added by the SAML 2.0 specifications.
+ *
+ * @package simplesamlphp/saml2
+ */
+trait StringElementTrait
+{
+    use BaseStringElementTrait;
+
+    /**
+     * Validate the content of the element.
+     *
+     * @param string $content  The value to go in the XML textContent
+     * @throws \Exception on failure
+     * @return void
+     */
+    protected function validateContent(/** @scrutinizer ignore-unused */ string $content): void
+    {
+        /**
+         * 1.3.1 String Values
+         *
+         * All SAML string values have the type xs:string, which is built in to the W3C XML Schema Datatypes
+         * specification [Schema2]. Unless otherwise noted in this specification or particular profiles, all strings in
+         * SAML messages MUST consist of at least one non-whitespace character (whitespace is defined in the
+         * XML Recommendation [XML] Section 2.3).
+         */
+        Assert::notWhitespaceOnly($content, ProtocolViolationException::class);
+    }
+}

src/XML/URIElementTrait.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\SAML2\XML;
+
+use SimpleSAML\Assert\Assert;
+use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
+use SimpleSAML\SAML2\Exception\ProtocolViolationException;
+use SimpleSAML\XML\Exception\SchemaViolationException;
+use SimpleSAML\XML\URIElementTrait as BaseURIElementTrait;
+
+/**
+ * Trait extending the default URIElementTrait to comply with the restrictions added by the SAML 2.0 specifications.
+ *
+ * @package simplesamlphp/saml2
+ */
+trait URIElementTrait
+{
+    use BaseURIElementTrait;
+
+    /**
+     * Validate the content of the element.
+     *
+     * @param string $content  The value to go in the XML textContent
+     * @throws \Exception on failure
+     * @return void
+     */
+    protected function validateContent(string $content): void
+    {
+        /**
+         * 1.3.2 URI Values
+         *
+         * Unless otherwise indicated in this specification, all URI reference values used within SAML-defined
+         * elements or attributes MUST consist of at least one non-whitespace character, and are REQUIRED to be
+         * absolute [RFC 2396].
+         */
+        Assert::notWhitespaceOnly($content, ProtocolViolationException::class);
+        SAMLAssert::validURI($content, SchemaViolationException::class);
+    }
+}

src/XML/ecp/RelayState.php

@@ -7,12 +7,12 @@
 use DOMElement;
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\Exception\ProtocolViolationException;
+use SimpleSAML\SAML2\XML\StringElementTrait;
 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.

src/XML/emd/RepublishTarget.php

@@ -5,8 +5,7 @@
 namespace SimpleSAML\SAML2\XML\emd;
 
 use SimpleSAML\Assert\Assert;
-use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
-use SimpleSAML\XML\StringElementTrait;
+use SimpleSAML\SAML2\XML\URIElementTrait;
 
 /**
  * Class implementing RepublishTarget.
@@ -15,7 +14,9 @@
  */
 final class RepublishTarget extends AbstractEmdElement
 {
-    use StringElementTrait;
+    use URIElementTrait {
+        URIElementTrait::validateContent as baseValidateContent;
+    }
 
 
     /**
@@ -36,7 +37,7 @@ public function __construct(string $content)
      */
     protected function validateContent(string $content): void
     {
-        SAMLAssert::validURI($content);
+        $this->baseValidateContent($content);
         Assert::same($content, 'http://edugain.org/');
     }
 }

src/XML/md/AbstractLocalizedName.php

@@ -7,11 +7,12 @@
 use DOMElement;
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\Exception\ArrayValidationException;
+use SimpleSAML\SAML2\Exception\ProtocolViolationException;
+use SimpleSAML\SAML2\XML\StringElementTrait;
 use SimpleSAML\XML\ArrayizableElementInterface;
 use SimpleSAML\XML\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingAttributeException;
-use SimpleSAML\XML\StringElementTrait;
 
 use function array_key_first;
 
@@ -35,25 +36,12 @@ final public function __construct(
         protected string $language,
         string $value,
     ) {
-        Assert::notEmpty($language, 'xml:lang cannot be empty.');
+        Assert::notWhitespaceOnly($language, ProtocolViolationException::class);
 
         $this->setContent($value);
     }
 
 
-    /**
-     * Validate the content of the element.
-     *
-     * @param string $content  The value to go in the XML textContent
-     * @throws \Exception on failure
-     * @return void
-     */
-    protected function validateContent(string $content): void
-    {
-        Assert::notEmpty($content);
-    }
-
-
     /**
      * Get the language this string is localized in.
      *

src/XML/md/AdditionalMetadataLocation.php

@@ -7,11 +7,11 @@
 use DOMElement;
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
+use SimpleSAML\SAML2\XML\URIElementTrait;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\SchemaValidatableElementInterface;
 use SimpleSAML\XML\SchemaValidatableElementTrait;
-use SimpleSAML\XML\StringElementTrait;
 
 use function trim;
 
@@ -23,7 +23,7 @@
 final class AdditionalMetadataLocation extends AbstractMdElement implements SchemaValidatableElementInterface
 {
     use SchemaValidatableElementTrait;
-    use StringElementTrait;
+    use URIElementTrait;
 
 
     /**
@@ -52,19 +52,6 @@ public function getNamespace(): string
     }
 
 
-    /**
-     * Validate the content of the element.
-     *
-     * @param string $content  The value to go in the XML textContent
-     * @throws \Exception on failure
-     * @return void
-     */
-    protected function validateContent(string $content): void
-    {
-        SAMLAssert::validURI($content, SchemaViolationException::class); // Covers the empty string
-    }
-
-
     /**
      * Initialize an AdditionalMetadataLocation element.
      *

src/XML/md/AffiliateMember.php

@@ -5,9 +5,9 @@
 namespace SimpleSAML\SAML2\XML\md;
 
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
+use SimpleSAML\SAML2\XML\StringElementTrait;
 use SimpleSAML\XML\SchemaValidatableElementInterface;
 use SimpleSAML\XML\SchemaValidatableElementTrait;
-use SimpleSAML\XML\StringElementTrait;
 
 /**
  * Class implementing AffiliateMember.

src/XML/md/AttributeProfile.php

@@ -7,10 +7,10 @@
 use DOMElement;
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
+use SimpleSAML\SAML2\XML\StringElementTrait;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\SchemaValidatableElementInterface;
 use SimpleSAML\XML\SchemaValidatableElementTrait;
-use SimpleSAML\XML\StringElementTrait;
 
 /**
  * Class implementing AttributeProfile.
@@ -30,35 +30,4 @@ public function __construct(string $content)
     {
         $this->setContent($content);
     }
-
-
-    /**
-     * Validate the content of the element.
-     *
-     * @param string $content  The value to go in the XML textContent
-     * @throws \Exception on failure
-     * @return void
-     */
-    protected function validateContent(string $content): void
-    {
-        SAMLAssert::validURI($content);
-    }
-
-
-    /**
-     * Convert XML into a AttributeProfile
-     *
-     * @param \DOMElement $xml The XML element we should load
-     * @return static
-     *
-     * @throws \SimpleSAML\XML\Exception\InvalidDOMElementException
-     *   If the qualified name of the supplied element is wrong
-     */
-    public static function fromXML(DOMElement $xml): static
-    {
-        Assert::same($xml->localName, 'AttributeProfile', InvalidDOMElementException::class);
-        Assert::same($xml->namespaceURI, AttributeProfile::NS, InvalidDOMElementException::class);
-
-        return new static($xml->textContent);
-    }
 }

src/XML/md/Company.php

@@ -5,9 +5,9 @@
 namespace SimpleSAML\SAML2\XML\md;
 
 use SimpleSAML\Assert\Assert;
+use SimpleSAML\SAML2\XML\StringElementTrait;
 use SimpleSAML\XML\SchemaValidatableElementInterface;
 use SimpleSAML\XML\SchemaValidatableElementTrait;
-use SimpleSAML\XML\StringElementTrait;
 
 /**
  * Class implementing Company.
@@ -27,17 +27,4 @@ public function __construct(string $content)
     {
         $this->setContent($content);
     }
-
-
-    /**
-     * Validate the content of the element.
-     *
-     * @param string $content  The value to go in the XML textContent
-     * @throws \Exception on failure
-     * @return void
-     */
-    protected function validateContent(string $content): void
-    {
-        Assert::notEmpty($content, 'Company cannot be empty');
-    }
 }

src/XML/md/EmailAddress.php

@@ -6,10 +6,10 @@
 
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\Exception\ArrayValidationException;
+use SimpleSAML\SAML2\XML\StringElementTrait;
 use SimpleSAML\XML\ArrayizableElementInterface;
 use SimpleSAML\XML\SchemaValidatableElementInterface;
 use SimpleSAML\XML\SchemaValidatableElementTrait;
-use SimpleSAML\XML\StringElementTrait;
 
 use function array_key_first;
 use function preg_filter;
@@ -26,7 +26,9 @@ final class EmailAddress extends AbstractMdElement implements
     SchemaValidatableElementInterface
 {
     use SchemaValidatableElementTrait;
-    use StringElementTrait;
+    use StringElementTrait {
+        StringElementTrait::validateContent as baseValidateContent;
+    }
 
 
     /**
@@ -47,7 +49,7 @@ public function __construct(string $content)
      */
     protected function validateContent(string $content): void
     {
-        Assert::notEmpty($content, 'EmailAddress cannot be empty');
+        $this->baseValidateContent($content);
         Assert::email($content);
     }
 

src/XML/md/GivenName.php

@@ -5,9 +5,9 @@
 namespace SimpleSAML\SAML2\XML\md;
 
 use SimpleSAML\Assert\Assert;
+use SimpleSAML\SAML2\XML\StringElementTrait;
 use SimpleSAML\XML\SchemaValidatableElementInterface;
 use SimpleSAML\XML\SchemaValidatableElementTrait;
-use SimpleSAML\XML\StringElementTrait;
 
 /**
  * Class implementing GivenName.
@@ -27,17 +27,4 @@ public function __construct(string $content)
     {
         $this->setContent($content);
     }
-
-
-    /**
-     * Validate the content of the element.
-     *
-     * @param string $content  The value to go in the XML textContent
-     * @throws \Exception on failure
-     * @return void
-     */
-    protected function validateContent(string $content): void
-    {
-        Assert::notEmpty($content, 'GivenName cannot be empty');
-    }
 }