SHIBUI-532

TIER · Jun 11, 2018 · f940fc0 · f940fc0
1 parent 478c23e
commit f940fc0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 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
@@ -90,14 +90,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                     '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'
             ) {
                 metadataResolverRepository.findAll().each { edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver mr ->
-                    MetadataProvider(id: 'HTTPMetadata',
-                            'xsi:type': 'FileBackedHTTPMetadataProvider',
-                            backingFile: '%{idp.home}/metadata/incommonmd.xml',
-                            metadataURL: 'http://md.incommon.org/InCommon/InCommon-metadata.xml',
-                            minRefreshDelay: 'PT5M',
-                            maxRefreshDelay: 'PT1H',
-                            refreshDelayFactor: '0.75'
-                    ) {
+                    constructXmlNodeForResolver(mr, delegate) {
                         MetadataFilter(
                                 'xsi:type': 'SignatureValidation',
                                 'requireSignedRoot': 'true',
@@ -115,7 +108,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                         //TODO: enhance
                         mr.metadataFilters.each { edu.internet2.tier.shibboleth.admin.ui.domain.MetadataFilter filter ->
                             if (filter instanceof EntityAttributesFilter) {
-                                EntityAttributesFilter entityAttributesFilter = (EntityAttributesFilter)filter
+                                EntityAttributesFilter entityAttributesFilter = (EntityAttributesFilter) filter
                                 MetadataFilter('xsi:type': 'EntityAttributes') {
                                     // TODO: enhance. currently this does weird things with namespaces
                                     entityAttributesFilter.attributes.each { attribute ->
@@ -132,12 +125,11 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                     }
                 }
             }
-
             return DOMBuilder.newInstance().parseText(writer.toString())
         }
     }
 
-    void constructXmlNodeFor(FileBackedHttpMetadataResolver resolver, def markupBuilderDelegate) {
+    void constructXmlNodeForResolver(FileBackedHttpMetadataResolver resolver, def markupBuilderDelegate, Closure childNodes) {
         markupBuilderDelegate.MetadataProvider(id: resolver.name,
                 'xsi:type': 'FileBackedHTTPMetadataProvider',
                 backingFile: resolver.backingFile,
@@ -172,7 +164,10 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                 httpCaching: resolver.httpMetadataResolverAttributes?.httpCaching,
                 httpCacheDirectory: resolver.httpMetadataResolverAttributes?.httpCacheDirectory,
                 httpMaxCacheEntries: resolver.httpMetadataResolverAttributes?.httpMaxCacheEntries,
-                httpMaxCacheEntrySize: resolver.httpMetadataResolverAttributes?.httpMaxCacheEntrySize)
+                httpMaxCacheEntrySize: resolver.httpMetadataResolverAttributes?.httpMaxCacheEntrySize) {
+
+            childNodes()
+        }
     }
 
 }
diff --git a/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy b/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy
@@ -6,6 +6,7 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.EntityAttributesFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.EntityAttributesFilterTarget
 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
 import edu.internet2.tier.shibboleth.admin.util.AttributeUtility
 import org.opensaml.saml.metadata.resolver.ChainingMetadataResolver
 import org.opensaml.saml.metadata.resolver.MetadataResolver
@@ -82,6 +83,9 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
         @Autowired
         MetadataResolverRepository metadataResolverRepository
 
+        @Autowired
+        AttributeUtility attributeUtility
+
         @Bean
         MetadataResolver metadataResolver() {
             def resolver = new ChainingMetadataResolver().with {
@@ -97,8 +101,10 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
             }
 
             if (!metadataResolverRepository.findAll().iterator().hasNext()) {
-                edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver mr = new edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver()
-                mr.setName("incommonmd")
+                //Generate and test edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver. Add more as
+                // we implement them
+                def mr = new TestObjectGenerator(attributeUtility).fileBackedHttpMetadataResolver()
+                mr.setName("HTTPMetadata")
                 metadataResolverRepository.save(mr)
             }
 

diff --git a/...edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy b/...edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
@@ -134,7 +134,9 @@ class JPAMetadataResolverServiceImplTests extends Specification {
         def resolver = testObjectGenerator.fileBackedHttpMetadataResolver()
 
         when:
-        genXmlSnippet(markupBuilder) { JPAMetadataResolverServiceImpl.cast(metadataResolverService).constructXmlNodeFor(resolver, it) }
+        genXmlSnippet(markupBuilder) {
+            JPAMetadataResolverServiceImpl.cast(metadataResolverService).constructXmlNodeForResolver(resolver, it) {}
+        }
 
         then:
         assert generatedXmlIsTheSameAsExpectedXml('/conf/532.xml', domBuilder.parseText(writer.toString()))