[SHIBUI-920]

update tests
TIER · Oct 9, 2018 · 7aee901 · 7aee901
1 parent 174be84
commit 7aee901
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy b/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy
@@ -7,6 +7,7 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFil
 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.domain.filters.RequiredValidUntilFilter
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.SignatureValidationFilter
 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
@@ -48,6 +49,7 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
     def 'simple test generation of metadata-providers.xml'() {
         when:
         def mr = metadataResolverRepository.findAll().iterator().next()
+        mr.metadataFilters << new SignatureValidationFilter(requireSignedRoot: true, certificateFile: '%{idp.home}/credentials/inc-md-cert.pem')
         mr.metadataFilters << requiredValidUntilFilterForXmlGenerationTests()
         mr.metadataFilters << entityRoleWhiteListFilterForXmlGenerationTests()
         metadataResolverRepository.save(mr)
@@ -63,6 +65,7 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
         when:
         //TODO: this might break later
         def mr = metadataResolverRepository.findAll().iterator().next()
+        mr.metadataFilters << new SignatureValidationFilter(requireSignedRoot: true, certificateFile: '%{idp.home}/credentials/inc-md-cert.pem')
         mr.metadataFilters << requiredValidUntilFilterForXmlGenerationTests()
         mr.metadataFilters.add(new EntityAttributesFilter().with {
             it.entityAttributesFilterTarget = new EntityAttributesFilterTarget().with {

diff --git a/backend/src/test/resources/conf/278.2.xml b/backend/src/test/resources/conf/278.2.xml
@@ -23,7 +23,7 @@
                       socketTimeout="PT5S"
                       supportedContentTypes="[]"
                       xsi:type="DynamicHttpMetadataProvider">
-        <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" requireSignedRoot="true" xsi:type="SignatureValidation"/>
+        <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" xsi:type="SignatureValidation"/>
         <MetadataFilter maxValidityInterval="P14D" xsi:type="RequiredValidUntil"/>
         <MetadataFilter xsi:type="EntityAttributes">
             <saml:Attribute
@@ -42,8 +42,6 @@
                       metadataURL="https://idp.unicon.net/idp/shibboleth"
                       minRefreshDelay='PT0M'
                       maxRefreshDelay='P1D'>
-        <MetadataFilter xsi:type="SignatureValidation" requireSignedRoot="true"
-                        certificateFile="%{idp.home}/credentials/inc-md-cert.pem" />
     </MetadataProvider>
     <MetadataProvider id="LocalDynamic"
                       backgroundInitializationFromCacheDelay="PT2S"
@@ -55,15 +53,13 @@
                       removeIdleEntityData="true"
                       sourceDirectory="/tmp"
                       xsi:type="DynamicHttpMetadataProvider">
-        <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" requireSignedRoot="true" xsi:type="SignatureValidation"/>
     </MetadataProvider>
     <MetadataProvider id="ClasspathResourceMetadata"
                       refreshDelayFactor="0.3"
                       xsi:type="ResourceBackedMetadataProvider">
         <MetadataResource xmlns:resource="urn:mace:shibboleth:2.0:resource"
                           xsi:type="resource:ClasspathResource"
                           file="metadata/metadata.xml" />
-        <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" requireSignedRoot="true" xsi:type="SignatureValidation"/>
     </MetadataProvider>
 
 </MetadataProvider>
diff --git a/backend/src/test/resources/conf/278.xml b/backend/src/test/resources/conf/278.xml
@@ -23,7 +23,7 @@
                       socketTimeout="PT5S"
                       supportedContentTypes="[]"
                       xsi:type="DynamicHttpMetadataProvider">
-        <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" requireSignedRoot="true" xsi:type="SignatureValidation"/>
+        <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" xsi:type="SignatureValidation"/>
         <MetadataFilter maxValidityInterval="P14D" xsi:type="RequiredValidUntil"/>
         <MetadataFilter xsi:type="EntityRoleWhiteList" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
             <RetainedRole>md:SPSSODescriptor</RetainedRole>
@@ -35,8 +35,6 @@
                       metadataURL="https://idp.unicon.net/idp/shibboleth"
                       minRefreshDelay='PT0M'
                       maxRefreshDelay='P1D'>
-        <MetadataFilter xsi:type="SignatureValidation" requireSignedRoot="true"
-                        certificateFile="%{idp.home}/credentials/inc-md-cert.pem" />
     </MetadataProvider>
     <MetadataProvider id="LocalDynamic"
                       backgroundInitializationFromCacheDelay="PT2S"
@@ -48,14 +46,12 @@
                       removeIdleEntityData="true"
                       sourceDirectory="/tmp"
                       xsi:type="DynamicHttpMetadataProvider">
-        <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" requireSignedRoot="true" xsi:type="SignatureValidation"/>
     </MetadataProvider>
     <MetadataProvider id="ClasspathResourceMetadata"
                       refreshDelayFactor="0.3"
                       xsi:type="ResourceBackedMetadataProvider">
         <MetadataResource xmlns:resource="urn:mace:shibboleth:2.0:resource"
                           xsi:type="resource:ClasspathResource"
                           file="metadata/metadata.xml" />
-        <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" requireSignedRoot="true" xsi:type="SignatureValidation"/>
     </MetadataProvider>
 </MetadataProvider>