Merged in feature/shibui-2024 (pull request #513)

backend feature/shibui 2024
TIER · Aug 18, 2021 · b080885 · b080885
2 parents e911b7d + feb6e53
commit b080885
Show file tree

Hide file tree

Showing 31 changed files with 880 additions and 454 deletions.
diff --git a/...eth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy b/...eth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy
@@ -165,4 +165,4 @@ class EntityDescriptorControllerVersionEndpointsIntegrationTests extends Specifi
     private static resourceUriFor(String uriTemplate, String resourceId) {
         String.format(uriTemplate, resourceId)
     }
-}
+}
diff --git a/.../DurationMetadataResolverValidator.groovy → .../DurationMetadataResolverValidator.groovy b/.../DurationMetadataResolverValidator.groovy → .../DurationMetadataResolverValidator.groovy
@@ -1,8 +1,11 @@
-package edu.internet2.tier.shibboleth.admin.ui.domain.resolvers
+package edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.validator
 
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicMetadataResolverAttributes
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ReloadableMetadataResolverAttributes
 import edu.internet2.tier.shibboleth.admin.util.DurationUtility
 
-class DurationMetadataResolverValidator implements MetadataResolverValidator {
+class DurationMetadataResolverValidator implements IMetadataResolverValidator {
     boolean supports(MetadataResolver resolver) {
         return resolver.hasProperty('dynamicMetadataResolverAttributes') || resolver.hasProperty('reloadableMetadataResolverAttributes')
     }
@@ -27,4 +30,4 @@ class DurationMetadataResolverValidator implements MetadataResolverValidator {
         }
         return new ValidationResult()
     }
-}
+}
diff --git a/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -400,7 +400,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                 disregardTLSCertificate: resolver.httpMetadataResolverAttributes?.disregardTLSCertificate ?: null,
                 httpClientSecurityParametersRef: resolver.httpMetadataResolverAttributes?.httpClientSecurityParametersRef,
                 proxyHost: resolver.httpMetadataResolverAttributes?.proxyHost,
-                proxyPort: resolver.httpMetadataResolverAttributes?.proxyHost,
+                proxyPort: resolver.httpMetadataResolverAttributes?.proxyPort,
                 proxyUser: resolver.httpMetadataResolverAttributes?.proxyUser,
                 proxyPassword: resolver.httpMetadataResolverAttributes?.proxyPassword,
                 httpCaching: resolver.httpMetadataResolverAttributes?.httpCaching,
@@ -471,7 +471,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                 disregardTLSCertificate: resolver.httpMetadataResolverAttributes?.disregardTLSCertificate ?: null,
                 httpClientSecurityParametersRef: resolver.httpMetadataResolverAttributes?.httpClientSecurityParametersRef,
                 proxyHost: resolver.httpMetadataResolverAttributes?.proxyHost,
-                proxyPort: resolver.httpMetadataResolverAttributes?.proxyHost,
+                proxyPort: resolver.httpMetadataResolverAttributes?.proxyPort,
                 proxyUser: resolver.httpMetadataResolverAttributes?.proxyUser,
                 proxyPassword: resolver.httpMetadataResolverAttributes?.proxyPassword,
                 httpCaching: resolver.httpMetadataResolverAttributes?.httpCaching,
@@ -559,4 +559,4 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
 
     }
 
-}
+}
diff --git a/...rnet2/tier/shibboleth/admin/ui/configuration/MetadataResolverValidationConfiguration.java b/...rnet2/tier/shibboleth/admin/ui/configuration/MetadataResolverValidationConfiguration.java
@@ -1,9 +1,8 @@
 package edu.internet2.tier.shibboleth.admin.ui.configuration;
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DurationMetadataResolverValidator;
-import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolverValidationService;
-import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolverValidator;
-import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ResourceBackedMetadataResolverValidator;
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.validator.*;
+import edu.internet2.tier.shibboleth.admin.ui.security.service.IGroupService;
+import edu.internet2.tier.shibboleth.admin.ui.security.service.UserService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -12,19 +11,26 @@
 @Configuration
 public class MetadataResolverValidationConfiguration {
 
+    @Bean DurationMetadataResolverValidator durationMetadataResolverValidator() {
+        return new DurationMetadataResolverValidator();
+    }
+
+    @Bean DynamicHttpMetadataResolverValidator dynamicHttpMetadataResolverValidator(IGroupService groupService, UserService userService) {
+        return new DynamicHttpMetadataResolverValidator(groupService, userService);
+    }
+
     @Bean
-    ResourceBackedMetadataResolverValidator resourceBackedMetadataResolverValidator() {
-        return new ResourceBackedMetadataResolverValidator();
+    FileBackedHttpMetadataResolverValidator fileBackedHttpMetadataResolverValidator(IGroupService groupService, UserService userService) {
+        return new FileBackedHttpMetadataResolverValidator(groupService, userService);
     }
 
     @Bean
     @SuppressWarnings("Unchecked")
-    MetadataResolverValidationService metadataResolverValidationService(List<MetadataResolverValidator> metadataResolverValidators) {
-        return new MetadataResolverValidationService(metadataResolverValidators);
+    MetadataResolverValidationService metadataResolverValidationService(List<IMetadataResolverValidator> IMetadataResolverValidators) {
+        return new MetadataResolverValidationService(IMetadataResolverValidators);
     }
 
-    @Bean
-    DurationMetadataResolverValidator durationMetadataResolverValidator() {
-        return new DurationMetadataResolverValidator();
+    @Bean ResourceBackedIMetadataResolverValidator resourceBackedMetadataResolverValidator() {
+        return new ResourceBackedIMetadataResolverValidator();
     }
-}
+}
diff --git a/...in/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java b/...in/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java
@@ -2,28 +2,22 @@
 
 import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor;
 import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation;
-import edu.internet2.tier.shibboleth.admin.ui.domain.versioning.Version;
 import edu.internet2.tier.shibboleth.admin.ui.exception.EntityIdExistsException;
 import edu.internet2.tier.shibboleth.admin.ui.exception.EntityNotFoundException;
 import edu.internet2.tier.shibboleth.admin.ui.exception.ForbiddenException;
+import edu.internet2.tier.shibboleth.admin.ui.exception.InvalidPatternMatchException;
 import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects;
-import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository;
-import edu.internet2.tier.shibboleth.admin.ui.security.model.User;
-import edu.internet2.tier.shibboleth.admin.ui.security.service.UserService;
 import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService;
 import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorVersionService;
 import lombok.extern.slf4j.Slf4j;
 
 import org.opensaml.core.xml.io.MarshallingException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.client.RestTemplateBuilder;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -39,8 +33,6 @@
 
 import java.net.URI;
 import java.util.ConcurrentModificationException;
-import java.util.List;
-import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/api")
@@ -73,7 +65,8 @@ public EntityDescriptorController(EntityDescriptorVersionService versionService)
 
     @PostMapping("/EntityDescriptor")
     @Transactional
-    public ResponseEntity<?> create(@RequestBody EntityDescriptorRepresentation edRepresentation) throws ForbiddenException, EntityIdExistsException {
+    public ResponseEntity<?> create(@RequestBody EntityDescriptorRepresentation edRepresentation)
+                    throws ForbiddenException, EntityIdExistsException, InvalidPatternMatchException {
         EntityDescriptorRepresentation persistedEd = entityDescriptorService.createNew(edRepresentation);            
         return ResponseEntity.created(getResourceUriFor(persistedEd.getId())).body(persistedEd);
     }
@@ -145,7 +138,9 @@ public void initRestTemplate() {
 
     @PutMapping("/EntityDescriptor/{resourceId}")
     @Transactional
-    public ResponseEntity<?> update(@RequestBody EntityDescriptorRepresentation edRepresentation, @PathVariable String resourceId) throws ForbiddenException, ConcurrentModificationException, EntityNotFoundException {
+    public ResponseEntity<?> update(@RequestBody EntityDescriptorRepresentation edRepresentation, @PathVariable String resourceId)
+                    throws ForbiddenException, ConcurrentModificationException, EntityNotFoundException,
+                    InvalidPatternMatchException {
         edRepresentation.setId(resourceId); // This should be the same already, but just to be safe...
         EntityDescriptorRepresentation result = entityDescriptorService.update(edRepresentation);
         return ResponseEntity.ok().body(result);
@@ -171,4 +166,4 @@ public ResponseEntity<?> upload(@RequestParam String metadataUrl, @RequestParam
                     .body(String.format("Error fetching XML metadata from the provided URL. Error: %s", e.getMessage()));
         }
     }
-}
+}
diff --git a/...rnet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerExceptionHandler.java b/...rnet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerExceptionHandler.java
@@ -1,7 +1,9 @@
 package edu.internet2.tier.shibboleth.admin.ui.controller;
 
-import java.util.ConcurrentModificationException;
-
+import edu.internet2.tier.shibboleth.admin.ui.exception.EntityIdExistsException;
+import edu.internet2.tier.shibboleth.admin.ui.exception.EntityNotFoundException;
+import edu.internet2.tier.shibboleth.admin.ui.exception.ForbiddenException;
+import edu.internet2.tier.shibboleth.admin.ui.exception.InvalidPatternMatchException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -10,9 +12,7 @@
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
-import edu.internet2.tier.shibboleth.admin.ui.exception.EntityIdExistsException;
-import edu.internet2.tier.shibboleth.admin.ui.exception.EntityNotFoundException;
-import edu.internet2.tier.shibboleth.admin.ui.exception.ForbiddenException;
+import java.util.ConcurrentModificationException;
 
 @ControllerAdvice(assignableTypes = {EntityDescriptorController.class})
 public class EntityDescriptorControllerExceptionHandler extends ResponseEntityExceptionHandler {
@@ -21,24 +21,30 @@ public class EntityDescriptorControllerExceptionHandler extends ResponseEntityEx
     public ResponseEntity<?> handleConcurrentModificationException(ConcurrentModificationException e, WebRequest request) {
         return ResponseEntity.status(HttpStatus.CONFLICT).body(new ErrorResponse(HttpStatus.CONFLICT, e.getMessage()));
     }
-    
+
     @ExceptionHandler({ EntityIdExistsException.class })
     public ResponseEntity<?> handleEntityExistsException(EntityIdExistsException e, WebRequest request) {
         HttpHeaders headers = new HttpHeaders();
         headers.setLocation(EntityDescriptorController.getResourceUriFor(e.getMessage()));
-        return ResponseEntity.status(HttpStatus.CONFLICT).headers(headers).body(new ErrorResponse(
-                        String.valueOf(HttpStatus.CONFLICT.value()),
-                        String.format("The entity descriptor with entity id [%s] already exists.", e.getMessage())));
+        return ResponseEntity.status(HttpStatus.CONFLICT).headers(headers)
+                        .body(new ErrorResponse(String.valueOf(HttpStatus.CONFLICT.value()),
+                                        String.format("The entity descriptor with entity id [%s] already exists.",
+                                                        e.getMessage())));
 
     }
-    
+
     @ExceptionHandler({ EntityNotFoundException.class })
     public ResponseEntity<?> handleEntityNotFoundException(EntityNotFoundException e, WebRequest request) {
         return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse(HttpStatus.NOT_FOUND, e.getMessage()));
     }
-    
+
     @ExceptionHandler({ ForbiddenException.class })
     public ResponseEntity<?> handleForbiddenAccess(ForbiddenException e, WebRequest request) {
         return ResponseEntity.status(HttpStatus.FORBIDDEN).body(new ErrorResponse(HttpStatus.FORBIDDEN, e.getMessage()));
     }
-}
+
+    @ExceptionHandler({ InvalidPatternMatchException.class })
+    public ResponseEntity<?> handleInvalidUrlMatchException(InvalidPatternMatchException e, WebRequest request) {
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ErrorResponse(HttpStatus.BAD_REQUEST, e.getMessage()));
+    }
+}