From f1215823fd575aa7b224dda2d140a3b1fe808bc1 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 27 Jul 2021 12:46:57 -0700
Subject: [PATCH] SHIBUI-1992 Removed defaults: metadataresolver.enabled:true

---
 .../ui/domain/resolvers/MetadataResolver.java |  2 +-
 ...JPAMetadataResolverServiceImplTests.groovy | 23 +++++++++++++++++--
 .../src/test/resources/conf/1059-disabled.xml | 11 +++++++++
 .../conf/{1059.xml => 1059-enabled.xml}       |  0
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 backend/src/test/resources/conf/1059-disabled.xml
 rename backend/src/test/resources/conf/{1059.xml => 1059-enabled.xml} (100%)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java
index d24cd3638..a6d5950ec 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java
@@ -58,7 +58,7 @@ public class MetadataResolver extends AbstractAuditable {
     @Column(unique = true)
     private String xmlId;
 
-    private Boolean enabled = true;
+    private Boolean enabled;
 
     private Boolean requireValidMetadata = true;
 
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
index 3ab2154ea..0214b6ff8 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
@@ -397,6 +397,7 @@ class JPAMetadataResolverServiceImplTests extends Specification {
                 it.content = 'http://mdq-beta.incommon.org/global'
                 it
             }
+            it.enabled = Boolean.TRUE
             it
         }
         metadataResolverRepository.save(resolver)
@@ -411,12 +412,13 @@ class JPAMetadataResolverServiceImplTests extends Specification {
     }
 
     @DirtiesContext(methodMode = DirtiesContext.MethodMode.AFTER_METHOD)
-    def 'test namespace protection in nonURL resolver'() {
+    def 'test namespace protection in nonURL resolver with resolver setting enabled=true'() {
         setup:
         shibUIConfiguration.protectedAttributeNamespaces = ['http://shibboleth.net/ns/profiles']
         def resolver = new LocalDynamicMetadataResolver().with {
             it.xmlId = 'LocalDynamic'
             it.sourceDirectory = '/tmp'
+            it.enabled = Boolean.TRUE
             it
         }
 
@@ -424,7 +426,24 @@ class JPAMetadataResolverServiceImplTests extends Specification {
         metadataResolverRepository.save(resolver)
 
         then:
-        generatedXmlIsTheSameAsExpectedXml('/conf/1059.xml', metadataResolverService.generateConfiguration())
+        generatedXmlIsTheSameAsExpectedXml('/conf/1059-enabled.xml', metadataResolverService.generateConfiguration())
+    }
+    
+    @DirtiesContext(methodMode = DirtiesContext.MethodMode.AFTER_METHOD)
+    def 'test namespace protection in nonURL resolver with resolver setting enabled not set'() {
+        setup:
+        shibUIConfiguration.protectedAttributeNamespaces = ['http://shibboleth.net/ns/profiles']
+        def resolver = new LocalDynamicMetadataResolver().with {
+            it.xmlId = 'LocalDynamic'
+            it.sourceDirectory = '/tmp'
+            it
+        }
+
+        when:
+        metadataResolverRepository.save(resolver)
+
+        then:
+        generatedXmlIsTheSameAsExpectedXml('/conf/1059-disabled.xml', metadataResolverService.generateConfiguration())
     }
 
     @Ignore('there is a bug in org.opensaml.saml.metadata.resolver.filter.impl.EntityAttributesFilter.applyFilter')
diff --git a/backend/src/test/resources/conf/1059-disabled.xml b/backend/src/test/resources/conf/1059-disabled.xml
new file mode 100644
index 000000000..952c86ee6
--- /dev/null
+++ b/backend/src/test/resources/conf/1059-disabled.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is an EXAMPLE metadata configuration file. -->
+<MetadataProvider id="ShibbolethMetadata" xsi:type="ChainingMetadataProvider"
+                  xmlns="urn:mace:shibboleth:2.0:metadata"
+                  xmlns:resource="urn:mace:shibboleth:2.0:resource"
+                  xmlns:security="urn:mace:shibboleth:2.0:security"
+                  xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+                  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">
+</MetadataProvider>
\ No newline at end of file
diff --git a/backend/src/test/resources/conf/1059.xml b/backend/src/test/resources/conf/1059-enabled.xml
similarity index 100%
rename from backend/src/test/resources/conf/1059.xml
rename to backend/src/test/resources/conf/1059-enabled.xml