Merged in md-fix (pull request #218)

temporary fix for whitelist filter Approved-by: Dmitriy Kopylenko <dkopylenko@unicon.net>
TIER · Oct 16, 2018 · 1cc1462 · 1cc1462
2 parents 8f96c5a + 18ee767
commit 1cc1462
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -205,7 +205,8 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                 'xmlns:md': 'urn:oasis:names:tc:SAML:2.0:metadata'
         ) {
             filter.retainedRoles.each {
-                markupBuilderDelegate.RetainedRole(it)
+                // TODO: fix
+                markupBuilderDelegate.RetainedRole(it.startsWith('md:') ? it : "md:${it}")
             }
         }
     }

diff --git a/backend/src/test/resources/conf/533.xml b/backend/src/test/resources/conf/533.xml
@@ -6,7 +6,7 @@
                   xsi:type="ChainingMetadataProvider"
                   xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd">
     <MetadataFilter xsi:type="EntityRoleWhiteList" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-        <RetainedRole>role1</RetainedRole>
-        <RetainedRole>role2</RetainedRole>
+        <RetainedRole>md:role1</RetainedRole>
+        <RetainedRole>md:role2</RetainedRole>
     </MetadataFilter>
 </MetadataProvider>