Merge branch 'master' into SHIBUI-619

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

@@ -46,12 +46,12 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
     // TODO: enhance
     @Override
     void reloadFilters(String metadataResolverName) {
-        ChainingMetadataResolver chainingMetadataResolver = (ChainingMetadataResolver)metadataResolver
+        ChainingMetadataResolver chainingMetadataResolver = (ChainingMetadataResolver) metadataResolver
         MetadataResolver targetMetadataResolver = chainingMetadataResolver.getResolvers().find { it.id == metadataResolverName }
         edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver jpaMetadataResolver = metadataResolverRepository.findByName(metadataResolverName)
 
         if (targetMetadataResolver && targetMetadataResolver.getMetadataFilter() instanceof MetadataFilterChain) {
-            MetadataFilterChain metadataFilterChain = (MetadataFilterChain)targetMetadataResolver.getMetadataFilter()
+            MetadataFilterChain metadataFilterChain = (MetadataFilterChain) targetMetadataResolver.getMetadataFilter()
 
             List<MetadataFilter> metadataFilters = new ArrayList<>()
 
@@ -64,7 +64,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                     if (entityAttributesFilter.getEntityAttributesFilterTarget().getEntityAttributesFilterTargetType() == EntityAttributesFilterTarget.EntityAttributesFilterTargetType.ENTITY) {
                         rules.put(
                                 new EntityIdPredicate(entityAttributesFilter.getEntityAttributesFilterTarget().getValue()),
-                                (List<Attribute>)(List<? extends Attribute>)entityAttributesFilter.getAttributes()
+                                (List<Attribute>) (List<? extends Attribute>) entityAttributesFilter.getAttributes()
                         )
                     }
                     target.setRules(rules)
@@ -76,7 +76,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
 
         if (metadataResolver instanceof RefreshableMetadataResolver) {
             try {
-                ((RefreshableMetadataResolver)metadataResolver).refresh()
+                ((RefreshableMetadataResolver) metadataResolver).refresh()
             } catch (ResolverException e) {
                 log.warn("error refreshing metadataResolver " + metadataResolverName, e)
             }
@@ -99,15 +99,18 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                     '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'
             ) {
                 metadataResolverRepository.findAll().each { edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver mr ->
-                    constructXmlNodeForResolver(mr, delegate) {
-                        MetadataFilter(
-                                'xsi:type': 'SignatureValidation',
-                                'requireSignedRoot': 'true',
-                                'certificateFile': '%{idp.home}/credentials/inc-md-cert.pem'
-                        )
-                        //TODO: enhance
-                        mr.metadataFilters.each { edu.internet2.tier.shibboleth.admin.ui.domain.filters.MetadataFilter filter ->
-                            constructXmlNodeForFilter(filter, delegate)
+                    //TODO: We cannot/do not currently have the code to marshall the internal incommon chaining resolver
+                    if ((mr.type != 'BaseMetadataResolver') && (mr.enabled)) {
+                        constructXmlNodeForResolver(mr, delegate) {
+                            MetadataFilter(
+                                    'xsi:type': 'SignatureValidation',
+                                    'requireSignedRoot': 'true',
+                                    'certificateFile': '%{idp.home}/credentials/inc-md-cert.pem'
+                            )
+                            //TODO: enhance
+                            mr.metadataFilters.each { edu.internet2.tier.shibboleth.admin.ui.domain.filters.MetadataFilter filter ->
+                                constructXmlNodeForFilter(filter, delegate)
+                            }
                         }
                     }
                 }
@@ -163,7 +166,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
     }
 
     void constructXmlNodeForResolver(FilesystemMetadataResolver resolver, def markupBuilderDelegate, Closure childNodes) {
-        markupBuilderDelegate.MetadataProvider(id: resolver.name,
+        markupBuilderDelegate.MetadataProvider(id: resolver.xmlId,
                 'xsi:type': 'FilesystemMetadataProvider',
                 metadataFile: resolver.metadataFile,
 
@@ -187,7 +190,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
     }
 
     void constructXmlNodeForResolver(DynamicHttpMetadataResolver resolver, def markupBuilderDelegate, Closure childNodes) {
-        markupBuilderDelegate.MetadataProvider(id: resolver.name,
+        markupBuilderDelegate.MetadataProvider(id: resolver.xmlId,
                 'xsi:type': 'DynamicHttpMetadataProvider',
                 requireValidMetadata: !resolver.requireValidMetadata ?: null,
                 failFastInitialization: !resolver.failFastInitialization ?: null,
@@ -234,7 +237,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
     }
 
     void constructXmlNodeForResolver(FileBackedHttpMetadataResolver resolver, def markupBuilderDelegate, Closure childNodes) {
-        markupBuilderDelegate.MetadataProvider(id: resolver.name,
+        markupBuilderDelegate.MetadataProvider(id: resolver.xmlId,
                 'xsi:type': 'FileBackedHTTPMetadataProvider',
                 backingFile: resolver.backingFile,
                 metadataURL: resolver.metadataURL,
@@ -279,7 +282,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                 sourceManagerRef: resolver.sourceManagerRef,
                 sourceKeyGeneratorRef: resolver.sourceKeyGeneratorRef,
 
-                id: resolver.name,
+                id: resolver.xmlId,
                 'xsi:type': 'DynamicHttpMetadataProvider',
                 requireValidMetadata: !resolver.requireValidMetadata ?: null,
                 failFastInitialization: !resolver.failFastInitialization ?: null,
@@ -314,7 +317,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
         def resourceType = resolver.validateAndDetermineResourceType()
 
         markupBuilderDelegate.MetadataProvider(
-                id: resolver.name,
+                id: resolver.xmlId,
                 'xsi:type': 'ResourceBackedMetadataProvider',
                 parserPoolRef: resolver.reloadableMetadataResolverAttributes?.parserPoolRef,
                 minRefreshDelay: resolver.reloadableMetadataResolverAttributes?.minRefreshDelay,
@@ -324,7 +327,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                 resolveViaPredicatesOnly: resolver.reloadableMetadataResolverAttributes?.resolveViaPredicatesOnly ?: null,
                 expirationWarningThreshold: resolver.reloadableMetadataResolverAttributes?.expirationWarningThreshold) {
 
-            if(resourceType == SVN) {
+            if (resourceType == SVN) {
                 MetadataResource(
                         'xmlns:resource': 'urn:mace:shibboleth:2.0:resource',
                         'xsi:type': 'resource:SVNResource',
@@ -338,8 +341,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                         'proxyUserName': resolver.svnMetadataResource.proxyUserName,
                         'proxyPassword': resolver.svnMetadataResource.proxyPassword)
 
-            }
-            else if (resourceType == CLASSPATH) {
+            } else if (resourceType == CLASSPATH) {
                 MetadataResource(
                         'xmlns:resource': 'urn:mace:shibboleth:2.0:resource',
                         'xsi:type': 'resource:ClasspathResource',

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java

@@ -21,8 +21,12 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.ResourceBundleMessageSource;
+import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.util.UrlPathHelper;
 
 import javax.servlet.http.HttpServletRequest;
@@ -78,6 +82,11 @@ public AttributeUtility attributeUtility() {
     @Autowired
     Directory directory;
 
+    @Autowired
+    LocaleResolver localeResolver;
+
+    @Autowired
+    ResourceBundleMessageSource messageSource;
 
     @Bean
     public EntityDescriptorFilesScheduledTasks entityDescriptorFilesScheduledTasks(EntityDescriptorRepository entityDescriptorRepository) {
@@ -103,6 +112,13 @@ public EntityIdsSearchService entityIdsSearchService() {
         };
     }
 
+    @Bean
+    public LocaleChangeInterceptor localeChangeInterceptor() {
+        LocaleChangeInterceptor localeChangeInterceptor = new LocaleChangeInterceptor();
+        localeChangeInterceptor.setParamName("lang");
+        return localeChangeInterceptor;
+    }
+
     /**
      * A WebMvcConfigurer that won't mangle the path for the entities endpoint.
      *
@@ -139,6 +155,11 @@ public String getOriginatingServletPath(HttpServletRequest request) {
                 helper.setUrlDecode(false);
                 configurer.setUrlPathHelper(helper);
             }
+
+            @Override
+            public void addInterceptors(InterceptorRegistry registry) {
+                registry.addInterceptor(localeChangeInterceptor());
+            }
         };
     }
 }

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/InternationalizationConfiguration.java

@@ -0,0 +1,25 @@
+package edu.internet2.tier.shibboleth.admin.ui.configuration;
+
+import edu.internet2.tier.shibboleth.admin.ui.i18n.MappedResourceBundleMessageSource;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.i18n.SessionLocaleResolver;
+
+@Configuration
+public class InternationalizationConfiguration {
+    @Bean
+    public LocaleResolver localeResolver() {
+        // TODO if we want to control the order, we can implement our own locale resolver instead of using the SessionLocaleResolver.
+        SessionLocaleResolver sessionLocaleResolver = new SessionLocaleResolver();
+        return sessionLocaleResolver;
+    }
+
+    @Bean
+    public MappedResourceBundleMessageSource messageSource() {
+        MappedResourceBundleMessageSource source = new MappedResourceBundleMessageSource();
+        source.setBasenames("i18n/messages");
+        source.setUseCodeAsDefaultMessage(true);
+        return source;
+    }
+}

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

@@ -0,0 +1,25 @@
+package edu.internet2.tier.shibboleth.admin.ui.controller;
+
+import edu.internet2.tier.shibboleth.admin.ui.i18n.MappedResourceBundleMessageSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.Locale;
+
+/**
+ * @author Bill Smith (wsmith@unicon.net)
+ */
+@Controller
+@RequestMapping(value = "/api/messages")
+public class InternationalizationMessagesController {
+    @Autowired
+    MappedResourceBundleMessageSource messageSource;
+
+    @GetMapping
+    public ResponseEntity<?> getAll(Locale locale) {
+        return ResponseEntity.ok(messageSource.getMessagesMap(locale));
+    }
+}

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

@@ -4,6 +4,7 @@
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver;
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolverValidationService;
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository;
+import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolverService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -20,7 +21,14 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 import java.io.IOException;
+import java.io.StringWriter;
 import java.net.URI;
 
 import static edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolverValidator.ValidationResult;
@@ -36,6 +44,9 @@ public class MetadataResolversController {
     @Autowired
     MetadataResolverValidationService metadataResolverValidationService;
 
+    @Autowired
+    MetadataResolverService metadataResolverService;
+
     @ExceptionHandler({InvalidTypeIdException.class, IOException.class, HttpMessageNotReadableException.class})
     public ResponseEntity<?> unableToParseJson(Exception ex) {
         return ResponseEntity.badRequest().body(new ErrorResponse(HttpStatus.BAD_REQUEST.toString(), ex.getMessage()));
@@ -49,6 +60,20 @@ public ResponseEntity<?> getAll() {
         return ResponseEntity.ok(resolvers);
     }
 
+    @GetMapping(value = "/MetadataResolvers", produces = "application/xml")
+    @Transactional(readOnly = true)
+    public ResponseEntity<?> getXml() throws IOException, TransformerException {
+        // TODO: externalize
+        try (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.generateConfiguration()), new StreamResult(writer));
+            return ResponseEntity.ok(writer.toString());
+        }
+    }
+
     @GetMapping("/MetadataResolvers/{resourceId}")
     @Transactional(readOnly = true)
     public ResponseEntity<?> getOne(@PathVariable String resourceId) {
@@ -67,18 +92,16 @@ public ResponseEntity<?> create(@RequestBody MetadataResolver newResolver) {
             return ResponseEntity.status(HttpStatus.CONFLICT).build();
         }
 
-        //TODO: we are disregarding attached filters if any sent from UI.
-        //Only deal with filters via filters endpoints?
-        newResolver.clearAllFilters();
-
         ResponseEntity<?> validationErrorResponse = validate(newResolver);
         if(validationErrorResponse != null) {
             return validationErrorResponse;
         }
 
+        newResolver.convertFiltersFromTransientRepresentationIfNecessary();
         MetadataResolver persistedResolver = resolverRepository.save(newResolver);
         persistedResolver.updateVersion();
 
+        persistedResolver.convertFiltersIntoTransientRepresentationIfNecessary();
         return ResponseEntity.created(getResourceUriFor(persistedResolver)).body(persistedResolver);
     }
 
@@ -102,8 +125,7 @@ public ResponseEntity<?> update(@PathVariable String resourceId, @RequestBody Me
 
         updatedResolver.setAudId(existingResolver.getAudId());
 
-        //TODO: we are disregarding attached filters if any sent from UI.
-        //Only deal with filters via filters endpoints?
+        //If one needs to update filters, it should be dealt with via filters endpoints
         updatedResolver.setMetadataFilters(existingResolver.getMetadataFilters());
 
         MetadataResolver persistedResolver = resolverRepository.save(updatedResolver);