Merged in SHIBUI-938 (pull request #242)

[SHIBUI-938] Approved-by: Dmitriy Kopylenko <dkopylenko@unicon.net>
TIER · Nov 19, 2018 · 43ac72b · 43ac72b
2 parents a2cacf5 + d33b9be
commit 43ac72b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy b/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy
@@ -76,7 +76,7 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
                 it
             }
             def attribute = attributeUtility.createAttributeWithStringValues('here', null, 'there')
-            attribute.nameFormat = null
+            attribute.nameFormat = 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri'
             attribute.namespacePrefix = 'saml'
             attribute.attributeValues.each { val ->
                 ((XSString)val).namespacePrefix = 'saml'

diff --git a/backend/src/test/resources/conf/278.2.xml b/backend/src/test/resources/conf/278.2.xml
@@ -27,7 +27,7 @@
         <MetadataFilter maxValidityInterval="P14D" xsi:type="RequiredValidUntil"/>
         <MetadataFilter xsi:type="EntityAttributes">
             <saml:Attribute
-                    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="here">
+                    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="here" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
                 <saml:AttributeValue xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:type="xsd:string">there</saml:AttributeValue>
             </saml:Attribute>
             <Entity>https://sp1.example.org</Entity>