Fix a few cases where the attribute-name didn't match the specified f…

…ormat
simplesamlphp · Jul 23, 2024 · d926eb0 · d926eb0
1 parent cda6610
commit d926eb0
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/tests/SAML2/XML/md/RequestedAttributeTest.php b/tests/SAML2/XML/md/RequestedAttributeTest.php
@@ -58,7 +58,7 @@ public function testMarshalling(): void
         $ra = new RequestedAttribute(
             'attr',
             true,
-            C::NAMEFORMAT_URI,
+            C::NAMEFORMAT_BASIC,
             'Attribute',
             [new AttributeValue('value1')],
         );

diff --git a/tests/SAML2/XML/mdattr/EntityAttributesTest.php b/tests/SAML2/XML/mdattr/EntityAttributesTest.php
@@ -64,7 +64,7 @@ public function testMarshalling(): void
     {
         $attribute1 = new Attribute(
             name: 'attrib1',
-            nameFormat: C::NAMEFORMAT_URI,
+            nameFormat: C::NAMEFORMAT_BASIC,
             attributeValue: [
                 new AttributeValue('is'),
                 new AttributeValue('really'),

diff --git a/tests/SAML2/XML/saml/AttributeTest.php b/tests/SAML2/XML/saml/AttributeTest.php
@@ -83,7 +83,7 @@ public function testMarshalling(): void
 
         $attribute = new Attribute(
             'TheName',
-            C::NAMEFORMAT_URI,
+            C::NAMEFORMAT_BASIC,
             'TheFriendlyName',
             [
                 new AttributeValue('FirstValue'),

diff --git a/tests/SAML2/XML/samlp/AttributeQueryTest.php b/tests/SAML2/XML/samlp/AttributeQueryTest.php
@@ -130,15 +130,15 @@ public function testAttributeNameFormat(): void
             attributes: [
                 new Attribute(
                     name: 'test1',
-                    nameFormat: C::NAMEFORMAT_URI,
+                    nameFormat: C::NAMEFORMAT_BASIC,
                     attributeValue: [
                         new AttributeValue('test1_attrv1'),
                         new AttributeValue('test1_attrv2'),
                     ],
                 ),
                 new Attribute(
                     name: 'test2',
-                    nameFormat: C::NAMEFORMAT_URI,
+                    nameFormat: C::NAMEFORMAT_BASIC,
                     attributeValue: [
                         new AttributeValue('test2_attrv1'),
                         new AttributeValue('test2_attrv2'),
@@ -147,7 +147,7 @@ public function testAttributeNameFormat(): void
                 ),
                 new Attribute(
                     name: 'test3',
-                    nameFormat: C::NAMEFORMAT_URI,
+                    nameFormat: C::NAMEFORMAT_BASIC,
                 ),
             ],
         );
@@ -159,11 +159,11 @@ public function testAttributeNameFormat(): void
         $attributes = XPath::xpQuery($attributeQueryElement, './saml_assertion:Attribute', $xpCache);
         $this->assertCount(3, $attributes);
         $this->assertEquals('test1', $attributes[0]->getAttribute('Name'));
-        $this->assertEquals(C::NAMEFORMAT_URI, $attributes[0]->getAttribute('NameFormat'));
+        $this->assertEquals(C::NAMEFORMAT_BASIC, $attributes[0]->getAttribute('NameFormat'));
         $this->assertEquals('test2', $attributes[1]->getAttribute('Name'));
-        $this->assertEquals(C::NAMEFORMAT_URI, $attributes[1]->getAttribute('NameFormat'));
+        $this->assertEquals(C::NAMEFORMAT_BASIC, $attributes[1]->getAttribute('NameFormat'));
         $this->assertEquals('test3', $attributes[2]->getAttribute('Name'));
-        $this->assertEquals(C::NAMEFORMAT_URI, $attributes[2]->getAttribute('NameFormat'));
+        $this->assertEquals(C::NAMEFORMAT_BASIC, $attributes[2]->getAttribute('NameFormat'));
 
         // Sanity check: test if values are still ok
         $av1 = XPath::xpQuery($attributes[0], './saml_assertion:AttributeValue', $xpCache);

diff --git a/tests/resources/xml/md_RequestedAttribute.xml b/tests/resources/xml/md_RequestedAttribute.xml
@@ -1,3 +1,3 @@
-<md:RequestedAttribute xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Name="attr" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Attribute" isRequired="true">
+<md:RequestedAttribute xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Name="attr" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" FriendlyName="Attribute" isRequired="true">
   <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">value1</saml:AttributeValue>
 </md:RequestedAttribute>
diff --git a/tests/resources/xml/mdattr_EntityAttributes.xml b/tests/resources/xml/mdattr_EntityAttributes.xml
@@ -1,5 +1,5 @@
 <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-  <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="attrib1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+  <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="attrib1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic">
     <saml:AttributeValue>is</saml:AttributeValue>
     <saml:AttributeValue>really</saml:AttributeValue>
     <saml:AttributeValue>cool</saml:AttributeValue>

diff --git a/tests/resources/xml/saml_Attribute.xml b/tests/resources/xml/saml_Attribute.xml
@@ -1,4 +1,4 @@
-<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="TheName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="TheFriendlyName" test:attr1="testval1" test:attr2="testval2" xmlns:test="urn:test:something">
+<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="TheName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" FriendlyName="TheFriendlyName" test:attr1="testval1" test:attr2="testval2" xmlns:test="urn:test:something">
   <saml:AttributeValue>FirstValue</saml:AttributeValue>
   <saml:AttributeValue>SecondValue</saml:AttributeValue>
 </saml:Attribute>