SHIBUI-605: testing filter generation

TIER · Jun 18, 2018 · ca965ce · ca965ce
1 parent d0faa36
commit ca965ce
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy b/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy
@@ -4,6 +4,7 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfigurat
 import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityRoleWhiteListFilter
 import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository
 import edu.internet2.tier.shibboleth.admin.ui.util.TestObjectGenerator
@@ -41,6 +42,9 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
 
     def 'simple test generation of metadata-providers.xml'() {
         when:
+        def mr = metadataResolverRepository.findAll().iterator().next()
+        mr.metadataFilters << entityRoleWhiteListFilterForXmlGenerationTests()
+        metadataResolverRepository.save(mr)
         def output = metadataResolverService.generateConfiguration()
 
         then:
@@ -66,6 +70,7 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
             it.attributes = [attribute]
             it
         })
+        mr.metadataFilters << entityRoleWhiteListFilterForXmlGenerationTests()
         metadataResolverRepository.save(mr)
 
         def output = metadataResolverService.generateConfiguration()
@@ -74,6 +79,13 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
         assert generatedXmlIsTheSameAsExpectedXml('/conf/278.2.xml', output)
     }
 
+    EntityRoleWhiteListFilter entityRoleWhiteListFilterForXmlGenerationTests() {
+        new EntityRoleWhiteListFilter().with {
+            it.retainedRoles = ['md:SPSSODescriptor']
+            it
+        }
+    }
+
     //TODO: check that this configuration is sufficient
     @TestConfiguration
     static class TestConfig {

diff --git a/backend/src/test/resources/conf/278.2.xml b/backend/src/test/resources/conf/278.2.xml
@@ -24,6 +24,9 @@
             </saml:Attribute>
             <Entity>https://sp1.example.org</Entity>
         </MetadataFilter>
+        <MetadataFilter xsi:type="EntityRoleWhiteList" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+            <RetainedRole>md:SPSSODescriptor</RetainedRole>
+        </MetadataFilter>
     </MetadataProvider>
 
-</MetadataProvider>
+</MetadataProvider>
diff --git a/backend/src/test/resources/conf/278.xml b/backend/src/test/resources/conf/278.xml
@@ -18,6 +18,9 @@
         <MetadataFilter xsi:type="SignatureValidation" requireSignedRoot="true"
                         certificateFile="%{idp.home}/credentials/inc-md-cert.pem" />
         <MetadataFilter xsi:type="RequiredValidUntil" maxValidityInterval="P14D" />
+        <MetadataFilter xsi:type="EntityRoleWhiteList" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+            <RetainedRole>md:SPSSODescriptor</RetainedRole>
+        </MetadataFilter>
     </MetadataProvider>
 
-</MetadataProvider>
+</MetadataProvider>