[SHIBUI-518]

Added LocalDynamicMetadataResolver to resolver service tests.
TIER · Jun 13, 2018 · 16c9874 · 16c9874
1 parent 1b76b3b
commit 16c9874
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 1 deletion.
diff --git a/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -222,4 +222,36 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
             childNodes()
         }
     }
+
+    void constructXmlNodeForResolver(LocalDynamicMetadataResolver resolver, def markupBuilderDelegate, Closure childNodes) {
+        markupBuilderDelegate.MetadataProvider(sourceDirectory: resolver.sourceDirectory,
+                sourceManagerRef: resolver.sourceManagerRef,
+                sourceKeyGeneratorRef: resolver.sourceKeyGeneratorRef,
+
+                id: resolver.name,
+                'xsi:type': 'DynamicHttpMetadataProvider',
+                requireValidMetadata: !resolver.requireValidMetadata ?: null,
+                failFastInitialization: !resolver.failFastInitialization ?: null,
+                sortKey: resolver.sortKey,
+                criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef,
+                useDefaultPredicateRegistry: !resolver.useDefaultPredicateRegistry ?: null,
+                satisfyAnyPredicates: resolver.satisfyAnyPredicates ?: null,
+                parserPoolRef: resolver.dynamicMetadataResolverAttributes?.parserPoolRef,
+                taskTimerRef: resolver.dynamicMetadataResolverAttributes?.taskTimerRef,
+                refreshDelayFactor: resolver.dynamicMetadataResolverAttributes?.refreshDelayFactor,
+                minCacheDuration: resolver.dynamicMetadataResolverAttributes?.minCacheDuration,
+                maxCacheDuration: resolver.dynamicMetadataResolverAttributes?.maxCacheDuration,
+                maxIdleEntityData: resolver.dynamicMetadataResolverAttributes?.maxIdleEntityData,
+                removeIdleEntityData: !resolver.dynamicMetadataResolverAttributes?.removeIdleEntityData ?: null,
+                cleanupTaskInterval: resolver.dynamicMetadataResolverAttributes?.cleanupTaskInterval,
+                persistentCacheManagerRef: resolver.dynamicMetadataResolverAttributes?.persistentCacheManagerRef,
+                persistentCacheManagerDirectory: resolver.dynamicMetadataResolverAttributes?.persistentCacheManagerDirectory,
+                persistentCacheKeyGeneratorRef: resolver.dynamicMetadataResolverAttributes?.persistentCacheKeyGeneratorRef,
+                initializeFromPersistentCacheInBackground: !resolver.dynamicMetadataResolverAttributes?.initializeFromPersistentCacheInBackground ?: null,
+                backgroundInitializationFromCacheDelay: resolver.dynamicMetadataResolverAttributes?.backgroundInitializationFromCacheDelay,
+                initializationFromCachePredicateRef: resolver.dynamicMetadataResolverAttributes?.initializationFromCachePredicateRef) {
+
+            childNodes()
+        }
+    }
 }
diff --git a/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy b/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy
@@ -109,6 +109,9 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
 
                 // Generate and test edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver.
                 metadataResolverRepository.save(new TestObjectGenerator(attributeUtility).dynamicHttpMetadataResolver())
+
+                // Generate and test edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver.
+                metadataResolverRepository.save(new TestObjectGenerator(attributeUtility).localDynamicMetadataResolver())
             }
 
             return resolver

diff --git a/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
@@ -324,6 +324,13 @@ class TestObjectGenerator {
         }
     }
 
+    LocalDynamicMetadataResolver localDynamicMetadataResolver() {
+        new LocalDynamicMetadataResolver().with {
+            it.name = 'LocalDynamic'
+            it
+        }
+    }
+
     FileBackedHttpMetadataResolver buildFileBackedHttpMetadataResolver() {
         def resolver = new FileBackedHttpMetadataResolver()
         resolver.name = generator.randomString(10)

diff --git a/backend/src/test/resources/conf/278.2.xml b/backend/src/test/resources/conf/278.2.xml
@@ -50,5 +50,15 @@
             <RetainedRole>md:SPSSODescriptor</RetainedRole>
         </MetadataFilter>
     </MetadataProvider>
+    <MetadataProvider id="LocalDynamic"
+                      initializeFromPersistentCacheInBackground="true"
+                      removeIdleEntityData="true"
+                      xsi:type="DynamicHttpMetadataProvider">
+        <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" requireSignedRoot="true" xsi:type="SignatureValidation"/>
+        <MetadataFilter maxValidityInterval="P14D" xsi:type="RequiredValidUntil"/>
+        <MetadataFilter xsi:type="EntityRoleWhiteList">
+            <RetainedRole>md:SPSSODescriptor</RetainedRole>
+        </MetadataFilter>
+    </MetadataProvider>
 
 </MetadataProvider>
diff --git a/backend/src/test/resources/conf/278.xml b/backend/src/test/resources/conf/278.xml
@@ -43,5 +43,14 @@
             <RetainedRole>md:SPSSODescriptor</RetainedRole>
         </MetadataFilter>
     </MetadataProvider>
-
+    <MetadataProvider id="LocalDynamic"
+                      initializeFromPersistentCacheInBackground="true"
+                      removeIdleEntityData="true"
+                      xsi:type="DynamicHttpMetadataProvider">
+        <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" requireSignedRoot="true" xsi:type="SignatureValidation"/>
+        <MetadataFilter maxValidityInterval="P14D" xsi:type="RequiredValidUntil"/>
+        <MetadataFilter xsi:type="EntityRoleWhiteList">
+            <RetainedRole>md:SPSSODescriptor</RetainedRole>
+        </MetadataFilter>
+    </MetadataProvider>
 </MetadataProvider>