Fix several issues

Author: tvdijen

src/Type/AnyURIListValue.php

@@ -6,6 +6,7 @@
 
 use SimpleSAML\SAML2\Assert\Assert;
 use SimpleSAML\SAML2\Constants as C;
+use SimpleSAML\SAML2\Exception\ProtocolViolationException;
 use SimpleSAML\SAML2\Type\SAMLAnyURIValue;
 use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
 use SimpleSAML\XMLSchema\Type\Interface\ListTypeInterface;
@@ -33,8 +34,10 @@ class AnyURIListValue extends SAMLAnyURIValue implements ListTypeInterface
      */
     protected function validateValue(string $value): void
     {
-        $uris = preg_split('/[\s]+/', $this->sanitizeValue($value), C::UNBOUNDED_LIMIT);
+        $sanitized = $this->sanitizeValue($value);
+        Assert::stringNotEmpty($sanitized, ProtocolViolationException::class);
 
+        $uris = preg_split('/[\s]+/', $sanitized, C::UNBOUNDED_LIMIT);
         Assert::allValidAnyURI($uris, SchemaViolationException::class);
     }
 

src/XML/EncryptedElementTrait.php

@@ -31,13 +31,14 @@ trait EncryptedElementTrait
      * Constructor for encrypted elements.
      *
      * @param \SimpleSAML\XMLSecurity\XML\xenc\EncryptedData $encryptedData The EncryptedData object.
-     * @param \SimpleSAML\XMLSecurity\XML\xenc\EncryptedKey[] $decryptionKeys The EncryptedKey objects.
+     * @param \SimpleSAML\XMLSecurity\XML\xenc\EncryptedKey[] $encryptedKey The EncryptedKey objects.
      */
     final public function __construct(
         protected EncryptedData $encryptedData,
-        protected array $decryptionKeys = [],
+        array $encryptedKey = [],
     ) {
-        Assert::allIsInstanceOf($decryptionKeys, EncryptedKey::class, ProtocolViolationException::class);
+        Assert::allIsInstanceOf($encryptedKey, EncryptedKey::class, ProtocolViolationException::class);
+        $this->encryptedKey = $encryptedKey;
 
         /**
          * 6.2: The <EncryptedData> element's Type attribute SHOULD be used and, if it is
@@ -74,9 +75,9 @@ public function getEncryptionBackend(): ?EncryptionBackend
     }
 
 
-    public function getDecryptionKeys(): array
+    public function getEncryptedKeys(): array
     {
-        return $this->decryptionKeys;
+        return $this->encryptedKey;
     }
 
 
@@ -118,7 +119,7 @@ public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $this->encryptedData->toXML($e);
-        foreach ($this->getDecryptionKeys() as $key) {
+        foreach ($this->getEncryptedKeys() as $key) {
             $key->toXML($e);
         }
         return $e;

tests/SAML2/Type/AnyURIListValueTest.php

@@ -8,6 +8,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\SAML2\Exception\ProtocolViolationException;
 use SimpleSAML\SAML2\Type\AnyURIListValue;
 use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
 
@@ -30,7 +31,7 @@ public function testAnyURIList(bool $shouldPass, string $anyURIList): void
         try {
             AnyURIListValue::fromString($anyURIList);
             $this->assertTrue($shouldPass);
-        } catch (SchemaViolationException $e) {
+        } catch (ProtocolViolationException|SchemaViolationException $e) {
             $this->assertFalse($shouldPass);
         }
     }
@@ -55,7 +56,7 @@ public static function provideAnyURIList(): array
             'single' => [true, "urn:x-simplesamlphp:namespace"],
             'multiple' => [true, 'urn:x-simplesamlphp:namespace urn:x-ssp:ns'],
             'normalization' => [true, "urn:x-simplesamlphp:namespace \n   urn:x-ssp:ns"],
-            'empty' => [true, ''],
+            'empty' => [false, ''],
         ];
     }
 }

tests/SAML2/XML/md/IDPSSODescriptorTest.php

@@ -217,10 +217,6 @@ public function testMarshallingWithEmptySingleSignOnService(): void
     public function testMarshallingWithoutProtocolSupportThrowsException(): void
     {
         $this->expectException(ProtocolViolationException::class);
-        $this->expectExceptionMessage(
-            'SAML v2.0 entities MUST include the SAML protocol namespace URI '
-            . 'in their protocolSupportEnumeration attribute',
-        );
 
         new IDPSSODescriptor(
             [

tests/resources/xml/saml_EncryptedID.xml

@@ -18,9 +18,5 @@
     <xenc:CipherData>
       <xenc:CipherValue>he5ZBjtfp/1/Y3PgE/CWspDPADig9vuZ7yZyYXDQ1wA/HBTPCldtL/p6UT5RCAFYUwN6kp3jnHkhK1yMjrI1SMw0n5NEc2wO9N5inQIeQOZ8XD9yD9M5fHvWz2ByNMGlB35RWMnBRHzDi1PRV7Irwcs9WoiODh3i6j2vYXP7cAo=</xenc:CipherValue>
     </xenc:CipherData>
-    <xenc:ReferenceList>
-      <xenc:DataReference URI="#Encrypted_DATA_ID"/>
-    </xenc:ReferenceList>
-    <xenc:CarriedKeyName>Name of the key</xenc:CarriedKeyName>
   </xenc:EncryptedKey>
 </saml:EncryptedID>