From 67777a092b8b4cd3699f6036f3c4a12438737201 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Fri, 30 Jul 2021 15:01:12 -0700
Subject: [PATCH] SHIBUI-1992

Bug fixes
---
 .../MetadataResolversController.java          |  2 +-
 ...ResolversControllerIntegrationTests.groovy | 19 +++++++++++++++++++
 .../admin/ui/util/TestObjectGenerator.groovy  |  1 +
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java
index 96906980b..6bce7af7b 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java
+++ b/backend/src/main/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/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy
index fda3a547c..b8487c9c8 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/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/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
index 472b20694..e28220cc6 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
+++ b/backend/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