SHIBUI-1992

Bug fixes
TIER · Jul 30, 2021 · 67777a0 · 67777a0
1 parent 1f32b95
commit 67777a0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/...n/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java b/...n/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java
@@ -202,7 +202,7 @@ private static URI getResourceUriFor(MetadataResolver resolver) {
 
     private void doResolverInitialization(MetadataResolver persistedResolver) throws
             ComponentInitializationException, ResolverException, IOException {
-        if (persistedResolver.getDoInitialization()) {
+        if (persistedResolver.getDoInitialization() != null && persistedResolver.getDoInitialization()) {
             org.opensaml.saml.metadata.resolver.MetadataResolver openSamlRepresentation = null;
             try {
                 openSamlRepresentation = metadataResolverConverterService.convertToOpenSamlRepresentation(persistedResolver);

diff --git a/...t2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy b/...t2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy
@@ -206,6 +206,25 @@ class MetadataResolversControllerIntegrationTests extends Specification {
             'ResourceBacked' | _
             'Filesystem'     | _
     }
+
+    @DirtiesContext
+    def "SHIBUI-1992 - error creating FileBackedHTTPMetadata"() {
+        def resolver = new FileBackedHttpMetadataResolver().with {
+            it.name = 'FBHMR'
+            it.xmlId = '1'
+            it.backingFile = 'tmp/foo'
+            it.metadataURL = 'https://nexus.microsoftonline-p.com/federationmetadata/saml20/federationmetadata.xml'
+            it.backupFileInitNextRefreshDelay = 'PT4H'
+            it.enabled = Boolean.FALSE
+            it
+        }
+
+        when:
+        def result = this.restTemplate.postForEntity(BASE_URI, createRequestHttpEntityFor { mapper.writeValueAsString(resolver) }, String)
+
+        then:
+        result.statusCodeValue == 201
+    }
 
     @Unroll
     def "PUT concrete MetadataResolver of type #resolverType with updated changes -> /api/MetadataResolvers/{resourceId}"(String resolverType) {

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
@@ -507,6 +507,7 @@ class TestObjectGenerator {
             it.name = 'FilesystemMetadata'
             it.xmlId = 'FilesystemMetadata'
             it.metadataFile = 'metadata/metadata.xml'
+            it.doInitialization = Boolean.FALSE // Removed the default setting, added back to keep tests the same.
 
             it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes().with {
                 it