SHIBUI-2268

Resolving XML issue seeing a single resolver in XML

backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy

@@ -550,6 +550,45 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
         }
     }
 
+    @Override
+    Document generateSingleMetadataConfiguration(edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver mr) {
+        new StringWriter().withCloseable { writer ->
+            def xml = new MarkupBuilder(writer)
+            xml.omitEmptyAttributes = true
+            xml.omitNullAttributes = true
+
+            xml.MetadataProvider(id: 'ShibbolethIdPUIGeneratedMetadata',
+                    xmlns: 'urn:mace:shibboleth:2.0:metadata',
+                    'xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
+                    'xsi:type': 'ChainingMetadataProvider',
+                    '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'
+            ) {
+                // We do not currently marshall the internal incommon chaining resolver (with BaseMetadataResolver type)
+                // We do not want to include the custom type: ExternalMetadataResolver
+                if ((mr.type != 'BaseMetadataResolver') && (mr.type != 'ExternalMetadataResolver') && (mr.enabled)) {
+                    constructXmlNodeForResolver(mr, delegate) {
+                        //TODO: enhance
+                        def didNamespaceProtectionFilter = !(shibUIConfiguration.protectedAttributeNamespaces && shibUIConfiguration.protectedAttributeNamespaces.size() > 0)
+                        def doNamespaceProtectionFilter = { def filter ->
+                            if (mr.type in ['FileBackedMetadataResolver', 'DynamicHttpMetadataResolver'] && (filter == null || filter instanceof EntityAttributesFilter) && !didNamespaceProtectionFilter) {
+                                constructXmlNodeForEntityAttributeNamespaceProtection(delegate)
+                                didNamespaceProtectionFilter = true
+                            }
+                        }
+                        mr.metadataFilters.each { edu.internet2.tier.shibboleth.admin.ui.domain.filters.MetadataFilter filter ->
+                            if (filter.isFilterEnabled()) {
+                                doNamespaceProtectionFilter()
+                                constructXmlNodeForFilter(filter, delegate)
+                            }
+                        }
+                        doNamespaceProtectionFilter()
+                    }
+                }
+            }
+            return DOMBuilder.newInstance().parseText(writer.toString())
+        }
+    }
+
     @Override
     Document generateExternalMetadataFilterConfiguration() {
         // TODO: this can probably be a better writer

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java

@@ -35,6 +35,7 @@
 
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
@@ -102,6 +103,22 @@ public ResponseEntity<?> getXml() throws IOException, TransformerException {
         }
     }
 
+    @GetMapping(value = "/MetadataResolvers/{resourceId}", produces = "application/xml")
+    @Transactional(readOnly = true)
+    public ResponseEntity<?> getOneXml(@PathVariable String resourceId) throws TransformerException {
+        MetadataResolver resolver = resolverRepository.findByResourceId(resourceId);
+        if (resolver == null) {
+            return ResponseEntity.notFound().build();
+        }
+        StringWriter writer = new StringWriter();
+        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
+
+        transformer.transform(new DOMSource(metadataResolverService.generateSingleMetadataConfiguration(resolver)), new StreamResult(writer));
+        return ResponseEntity.ok(writer.toString());
+    }
+
     @GetMapping(value = "/MetadataResolvers/External", produces = "application/xml")
     @Transactional(readOnly = true)
     public ResponseEntity<?> getExternalXml() throws IOException, TransformerException {

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverService.java

@@ -14,6 +14,8 @@ public interface MetadataResolverService {
 
     public Document generateConfiguration();
 
+    public Document generateSingleMetadataConfiguration(MetadataResolver mr);
+
     public void reloadFilters(String metadataResolverName);
 
     public MetadataResolver updateMetadataResolverEnabledStatus(MetadataResolver existingResolver) throws ForbiddenException, MetadataFileNotFoundException, InitializationException;