From 043a8860ec058fc189cbbd5865caca791864c373 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 20 May 2019 16:11:19 -0400 Subject: [PATCH 001/112] SHIBUI-1262: 1304 --- .../admin/ui/domain/versioning/Version.java | 32 ++++++++++++++++ .../EntityDescriptorVersionService.java | 17 +++++++++ .../VersionJsonSerializationBasicTests.groovy | 37 +++++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/Version.java create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java create mode 100644 backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/Version.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/Version.java new file mode 100644 index 000000000..ce3687507 --- /dev/null +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/Version.java @@ -0,0 +1,32 @@ +package edu.internet2.tier.shibboleth.admin.ui.domain.versioning; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * Represents version information of any versioned entity in the system. + */ +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@ToString +@EqualsAndHashCode +public class Version implements Serializable { + + private String id; + + private String creator; + + private LocalDateTime date; + + private static final long serialVersionUID = 3429591830989243421L; + +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java new file mode 100644 index 000000000..44e1bb9d8 --- /dev/null +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java @@ -0,0 +1,17 @@ +package edu.internet2.tier.shibboleth.admin.ui.service; + +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 java.util.List; + +/** + * API containing operations pertaining to {@link EntityDescriptor} versioning. + */ +public interface EntityDescriptorVersionService { + + List findVersionsForEntityDescriptor(String resourceId); + + EntityDescriptorRepresentation findSpecificVersionOfEntityDescriptor(String resourceId, String versionToken); +} diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy new file mode 100644 index 000000000..07c37a55c --- /dev/null +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy @@ -0,0 +1,37 @@ +package edu.internet2.tier.shibboleth.admin.ui.domain.versioning + +import com.fasterxml.jackson.databind.ObjectMapper +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule +import spock.lang.Specification + +import java.time.LocalDateTime +import java.time.Month + +class VersionJsonSerializationBasicTests extends Specification { + + ObjectMapper mapper + + def setup() { + mapper = new ObjectMapper() + mapper.registerModule(new JavaTimeModule()) + } + + def "Verify basic Version JSON serialization"() { + given: + def staticDate = LocalDateTime.of(2019, Month.MAY,20,15,0,0) + def version = new Version('2', 'kramer', staticDate) + def expectedJson = """ + { + "id": "2", + "creator": "kramer", + "date": "${staticDate.toString()}" + } + """ + + when: + def deSerialized = mapper.readValue(expectedJson, Version) + + then: + deSerialized == version + } +} From 729af5225f1220139968709dc3906efae8abe2dc Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 21 May 2019 11:29:28 -0400 Subject: [PATCH 002/112] SHIBUI-1262 [1303] --- .../EntityDescriptorController.java | 55 ++++++++++++++++--- .../EntityDescriptorVersionService.java | 2 +- .../EntityDescriptorControllerTests.groovy | 4 +- 3 files changed, 52 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java index 80213f5cd..b3ea0fb62 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java @@ -2,6 +2,7 @@ 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.opensaml.OpenSamlObjects; import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository; import edu.internet2.tier.shibboleth.admin.ui.security.model.User; @@ -9,6 +10,7 @@ import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository; 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 org.opensaml.core.xml.io.MarshallingException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,6 +36,7 @@ import javax.annotation.PostConstruct; import javax.xml.ws.Response; import java.net.URI; +import java.util.List; import java.util.stream.Collectors; @RestController @@ -52,20 +55,17 @@ public class EntityDescriptorController { @Autowired RestTemplateBuilder restTemplateBuilder; - private UserRepository userRepository; - - private RoleRepository roleRepository; - private UserService userService; private RestTemplate restTemplate; + private EntityDescriptorVersionService versionService; + private static Logger LOGGER = LoggerFactory.getLogger(EntityDescriptorController.class); - public EntityDescriptorController(UserRepository userRepository, RoleRepository roleRepository, UserService userService) { - this.userRepository = userRepository; - this.roleRepository = roleRepository; + public EntityDescriptorController(UserService userService, EntityDescriptorVersionService versionService) { this.userService = userService; + this.versionService = versionService; } @PostConstruct @@ -220,6 +220,40 @@ public ResponseEntity deleteOne(@PathVariable String resourceId) { } } + //Versioning endpoints + + @GetMapping("/EntityDescriptor/{resourceId}/Versions") + public ResponseEntity getAllVersions(@PathVariable String resourceId) { + EntityDescriptor ed = entityDescriptorRepository.findByResourceId(resourceId); + if (ed == null) { + return ResponseEntity.notFound().build(); + } + List versions = versionService.findVersionsForEntityDescriptor(resourceId); + if (versions.isEmpty()) { + return ResponseEntity.notFound().build(); + } + if(isAuthorizedFor(ed.getCreatedBy())) { + return ResponseEntity.ok(versions); + } + return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); + } + + @GetMapping("/EntityDescriptor/{resourceId}/Versions/{versionId}") + public ResponseEntity getSpecificVersion(@PathVariable String resourceId, @PathVariable String versionId) { + EntityDescriptorRepresentation edRepresentation = + versionService.findSpecificVersionOfEntityDescriptor(resourceId, versionId); + + if (edRepresentation == null) { + return ResponseEntity.notFound().build(); + } + if(isAuthorizedFor(edRepresentation.getCreatedBy())) { + return ResponseEntity.ok(edRepresentation); + } + return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); + } + + //Private methods + private static URI getResourceUriFor(EntityDescriptor ed) { return ServletUriComponentsBuilder .fromCurrentServletMapping().path("/api/EntityDescriptor") @@ -267,4 +301,11 @@ private ResponseEntity handleUploadingEntityDescriptorXml(byte[] rawXmlBytes, .body(entityDescriptorService.createRepresentationFromDescriptor(persistedEd)); } + private boolean isAuthorizedFor(String username) { + User u = userService.getCurrentUser(); + return (u != null) && + (u.getRole().equals("ROLE_ADMIN") + || (u.getUsername().equals(username))); + } + } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java index 44e1bb9d8..5e1542ea2 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java @@ -13,5 +13,5 @@ public interface EntityDescriptorVersionService { List findVersionsForEntityDescriptor(String resourceId); - EntityDescriptorRepresentation findSpecificVersionOfEntityDescriptor(String resourceId, String versionToken); + EntityDescriptorRepresentation findSpecificVersionOfEntityDescriptor(String resourceId, String versionId); } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerTests.groovy index 928cd18ec..89cb89d54 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerTests.groovy @@ -11,6 +11,7 @@ import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorReposit import edu.internet2.tier.shibboleth.admin.ui.security.repository.RoleRepository import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository import edu.internet2.tier.shibboleth.admin.ui.security.service.UserService +import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorVersionService import edu.internet2.tier.shibboleth.admin.ui.service.JPAEntityDescriptorServiceImpl import edu.internet2.tier.shibboleth.admin.ui.service.JPAEntityServiceImpl import edu.internet2.tier.shibboleth.admin.ui.util.RandomGenerator @@ -69,6 +70,7 @@ class EntityDescriptorControllerTests extends Specification { RoleRepository roleRepository = Mock() UserService userService + EntityDescriptorVersionService versionService = Mock() def setup() { generator = new TestObjectGenerator() @@ -78,7 +80,7 @@ class EntityDescriptorControllerTests extends Specification { userService = new UserService(roleRepository, userRepository) service = new JPAEntityDescriptorServiceImpl(openSamlObjects, new JPAEntityServiceImpl(openSamlObjects), userService) - controller = new EntityDescriptorController(userRepository, roleRepository, userService) + controller = new EntityDescriptorController(userService, versionService) controller.entityDescriptorRepository = entityDescriptorRepository controller.openSamlObjects = openSamlObjects controller.entityDescriptorService = service From acc9ce502a4076c3f96647459dd4f35232d54baf Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 21 May 2019 15:27:01 -0400 Subject: [PATCH 003/112] SHIBUI-1262 [1305] --- .../admin/ui/configuration/DevConfig.groovy | 8 +++++ .../EntitiesVersioningConfiguration.java | 15 ++++++++ .../EntityDescriptorVersionService.java | 25 +++++++++++++ ...tyDescriptorVersioningConfiguration.groovy | 36 +++++++++++++++++++ ...JPAEntityDescriptorServiceImplTests.groovy | 3 +- 5 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java create mode 100644 backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestEntityDescriptorVersioningConfiguration.groovy diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy index 8db64fd67..2ed81b941 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy @@ -15,6 +15,8 @@ import edu.internet2.tier.shibboleth.admin.ui.security.model.Role import edu.internet2.tier.shibboleth.admin.ui.security.model.User import edu.internet2.tier.shibboleth.admin.ui.security.repository.RoleRepository import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository +import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService +import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorVersionService import edu.internet2.tier.shibboleth.admin.util.ModelRepresentationConversions import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Profile @@ -156,4 +158,10 @@ class DevConfig { it }) } + + @Profile('dev-ed-versioning') + @Bean + EntityDescriptorVersionService stubEntityDescriptorVersionService(EntityDescriptorService entityDescriptorService) { + return EntityDescriptorVersionService.stubImpl(entityDescriptorService) + } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java new file mode 100644 index 000000000..5f1b64b46 --- /dev/null +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java @@ -0,0 +1,15 @@ +package edu.internet2.tier.shibboleth.admin.ui.configuration; + +import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService; +import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorVersionService; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class EntitiesVersioningConfiguration { + + //@Bean + EntityDescriptorVersionService entityDescriptorVersionService(EntityDescriptorService entityDescriptorService) { + //TODO create real impl when available + return null; + } +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java index 5e1542ea2..da2910834 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java @@ -4,6 +4,8 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation; import edu.internet2.tier.shibboleth.admin.ui.domain.versioning.Version; +import java.time.LocalDateTime; +import java.util.Arrays; import java.util.List; /** @@ -14,4 +16,27 @@ public interface EntityDescriptorVersionService { List findVersionsForEntityDescriptor(String resourceId); EntityDescriptorRepresentation findSpecificVersionOfEntityDescriptor(String resourceId, String versionId); + + /* Factory method to return stub impl for dev and testing purposes */ + static EntityDescriptorVersionService stubImpl(final EntityDescriptorService entityDescriptorService) { + return new EntityDescriptorVersionService() { + @Override + public List findVersionsForEntityDescriptor(String resourceId) { + return Arrays.asList( + new Version("1", "kramer", LocalDateTime.now().minusDays(10)), + new Version("2", "newman", LocalDateTime.now().minusDays(5)) + ); + } + + @Override + public EntityDescriptorRepresentation findSpecificVersionOfEntityDescriptor(String resourceId, String versionId) { + EntityDescriptor ed = new EntityDescriptor(); + ed.setID("1"); + ed.setEntityID("http://versioning/stub"); + ed.setCreatedBy("kramer"); + ed.setCreatedDate(LocalDateTime.now().minusDays(10)); + return entityDescriptorService.createRepresentationFromDescriptor(ed); + } + }; + } } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestEntityDescriptorVersioningConfiguration.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestEntityDescriptorVersioningConfiguration.groovy new file mode 100644 index 000000000..f3d1346e0 --- /dev/null +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestEntityDescriptorVersioningConfiguration.groovy @@ -0,0 +1,36 @@ +package edu.internet2.tier.shibboleth.admin.ui.configuration + +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.service.EntityDescriptorService +import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorVersionService +import edu.internet2.tier.shibboleth.admin.ui.util.TestObjectGenerator +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration + +import java.time.LocalDateTime + +@Configuration +class TestEntityDescriptorVersioningConfiguration { + + @Autowired + EntityDescriptorService entityDescriptorService + + @Bean + EntityDescriptorVersionService stubEntityDescriptorVersionService() { + return new EntityDescriptorVersionService() { + @Override + List findVersionsForEntityDescriptor(String resourceId) { + return [new Version(id: '1', creator: 'kramer', date: LocalDateTime.now().minusDays(3)), + new Version(id: '2', creator: 'newman', date: LocalDateTime.now())] + } + + @Override + EntityDescriptorRepresentation findSpecificVersionOfEntityDescriptor(String resourceId, String versionId) { + return entityDescriptorService.createRepresentationFromDescriptor(new TestObjectGenerator().buildEntityDescriptor()) + } + } + } + +} diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests.groovy index b0626d431..eeb22048e 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests.groovy @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper import edu.internet2.tier.shibboleth.admin.ui.ShibbolethUiApplication import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.CustomPropertiesConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.TestEntityDescriptorVersioningConfiguration import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor import edu.internet2.tier.shibboleth.admin.ui.domain.SPSSODescriptor import edu.internet2.tier.shibboleth.admin.ui.domain.XSAny @@ -40,7 +41,7 @@ import org.xmlunit.diff.ElementSelectors import spock.lang.Ignore import spock.lang.Specification -@ContextConfiguration(classes=[CoreShibUiConfiguration, CustomPropertiesConfiguration]) +@ContextConfiguration(classes=[CoreShibUiConfiguration, CustomPropertiesConfiguration, TestEntityDescriptorVersioningConfiguration]) @SpringBootTest(classes = ShibbolethUiApplication.class, webEnvironment = SpringBootTest.WebEnvironment.NONE) @PropertySource("classpath:application.yml") class JPAEntityDescriptorServiceImplTests extends Specification { From 115c53ec899710f29953b71b9ea35b4a3e8b7b93 Mon Sep 17 00:00:00 2001 From: Jj! Date: Wed, 22 May 2019 14:52:41 -0500 Subject: [PATCH 004/112] [SHIBUI-1253] file writing service implementation that checks the file before writing --- .../CoreShibUiConfiguration.java | 9 +++- .../EntityDescriptorFilesScheduledTasks.java | 9 +++- .../FileCheckingFileWritingService.java | 51 ++++++++++++++++++ .../admin/ui/service/FileWritingService.java | 19 +++++++ ...yDescriptorFilesScheduledTasksTests.groovy | 3 +- ...FileCheckingFileWritingServiceTests.groovy | 53 +++++++++++++++++++ 6 files changed, 140 insertions(+), 4 deletions(-) create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/FileCheckingFileWritingService.java create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/FileWritingService.java create mode 100644 backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/FileCheckingFileWritingServiceTests.groovy diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java index 8f964b96a..a339e90ee 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java @@ -17,6 +17,8 @@ import edu.internet2.tier.shibboleth.admin.ui.service.EntityIdsSearchService; import edu.internet2.tier.shibboleth.admin.ui.service.EntityIdsSearchServiceImpl; import edu.internet2.tier.shibboleth.admin.ui.service.EntityService; +import edu.internet2.tier.shibboleth.admin.ui.service.FileCheckingFileWritingService; +import edu.internet2.tier.shibboleth.admin.ui.service.FileWritingService; import edu.internet2.tier.shibboleth.admin.ui.service.FilterService; import edu.internet2.tier.shibboleth.admin.ui.service.FilterTargetService; import edu.internet2.tier.shibboleth.admin.ui.service.JPAEntityDescriptorServiceImpl; @@ -98,7 +100,7 @@ public AttributeUtility attributeUtility() { @Bean @ConditionalOnProperty(name = "shibui.metadata-dir") public EntityDescriptorFilesScheduledTasks entityDescriptorFilesScheduledTasks(EntityDescriptorRepository entityDescriptorRepository, @Value("${shibui.metadata-dir}") final String metadataDir) { - return new EntityDescriptorFilesScheduledTasks(metadataDir, entityDescriptorRepository, openSamlObjects()); + return new EntityDescriptorFilesScheduledTasks(metadataDir, entityDescriptorRepository, openSamlObjects(), fileWritingService()); } @Bean @@ -202,4 +204,9 @@ public ModelRepresentationConversions modelRepresentationConversions() { public UserService userService(RoleRepository roleRepository, UserRepository userRepository) { return new UserService(roleRepository, userRepository); } + + @Bean + public FileWritingService fileWritingService() { + return new FileCheckingFileWritingService(); + } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/scheduled/EntityDescriptorFilesScheduledTasks.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/scheduled/EntityDescriptorFilesScheduledTasks.java index d7bb02282..e6cb670f2 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/scheduled/EntityDescriptorFilesScheduledTasks.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/scheduled/EntityDescriptorFilesScheduledTasks.java @@ -4,6 +4,7 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor; 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.service.FileWritingService; import org.bouncycastle.util.encoders.Hex; import org.opensaml.core.xml.io.MarshallingException; import org.slf4j.Logger; @@ -49,12 +50,16 @@ public class EntityDescriptorFilesScheduledTasks { private static final String TARGET_FILE_TEMPLATE = "%s/%s"; + private final FileWritingService fileWritingService; + public EntityDescriptorFilesScheduledTasks(String metadataDirName, EntityDescriptorRepository entityDescriptorRepository, - OpenSamlObjects openSamlObjects) { + OpenSamlObjects openSamlObjects, + FileWritingService fileWritingService) { this.metadataDirName = metadataDirName; this.entityDescriptorRepository = entityDescriptorRepository; this.openSamlObjects = openSamlObjects; + this.fileWritingService = fileWritingService; } @Scheduled(fixedRateString = "${shibui.taskRunRate:30000}") @@ -71,7 +76,7 @@ public void generateEntityDescriptorFiles() throws MarshallingException { try { String xmlContent = this.openSamlObjects.marshalToXmlString(ed); - Files.write(targetFilePath, xmlContent.getBytes()); + fileWritingService.write(targetFilePath, xmlContent); } catch (MarshallingException | IOException e) { //TODO: any other better way to handle it? LOGGER.error("Error marshalling entity descriptor into a file {} - {}", ed.getEntityID(), e.getMessage()); diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/FileCheckingFileWritingService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/FileCheckingFileWritingService.java new file mode 100644 index 000000000..a520be60a --- /dev/null +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/FileCheckingFileWritingService.java @@ -0,0 +1,51 @@ +package edu.internet2.tier.shibboleth.admin.ui.service; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.security.DigestInputStream; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Arrays; + +public class FileCheckingFileWritingService implements FileWritingService { + private static final String DEFAULT_ALGORITHM = "MD5"; + private final String algorithm; + + public FileCheckingFileWritingService() { + this(DEFAULT_ALGORITHM); + } + + public FileCheckingFileWritingService(String algorithm) { + this.algorithm = algorithm; + } + + @Override + public void write(Path path, String content) throws IOException { + if (Files.exists(path)) { + try { + MessageDigest md = MessageDigest.getInstance(this.algorithm); + try ( + InputStream is = Files.newInputStream(path); + DigestInputStream dis = new DigestInputStream(is, md) + ) { + byte[] buf = new byte[4096]; + while (dis.read(buf) > -1){} + } + byte[] fileDigest = md.digest(); + byte[] contentDigest = md.digest(content.getBytes()); + if (Arrays.equals(fileDigest, contentDigest)) { + return; + } + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException(e); + } + } + writeContent(path, content.getBytes()); + } + + void writeContent(Path path, byte[] bytes) throws IOException { + Files.write(path, bytes); + } +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/FileWritingService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/FileWritingService.java new file mode 100644 index 000000000..93de34da6 --- /dev/null +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/FileWritingService.java @@ -0,0 +1,19 @@ +package edu.internet2.tier.shibboleth.admin.ui.service; + +import java.io.IOException; +import java.nio.file.Path; + +/** + * Service interface for writing files. Implementations may perform various tasks + * before or after writing the file. + */ +public interface FileWritingService { + /** + * write the file + * + * @param path target file Path + * @param content content to write + * @throws IOException + */ + void write(Path path, String content) throws IOException; +} diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/scheduled/EntityDescriptorFilesScheduledTasksTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/scheduled/EntityDescriptorFilesScheduledTasksTests.groovy index 117c0fbd4..f47928082 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/scheduled/EntityDescriptorFilesScheduledTasksTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/scheduled/EntityDescriptorFilesScheduledTasksTests.groovy @@ -11,6 +11,7 @@ import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorReposit import edu.internet2.tier.shibboleth.admin.ui.security.repository.RoleRepository import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository import edu.internet2.tier.shibboleth.admin.ui.security.service.UserService +import edu.internet2.tier.shibboleth.admin.ui.service.FileCheckingFileWritingService import edu.internet2.tier.shibboleth.admin.ui.service.JPAEntityDescriptorServiceImpl import edu.internet2.tier.shibboleth.admin.ui.service.JPAEntityServiceImpl import edu.internet2.tier.shibboleth.admin.ui.util.RandomGenerator @@ -57,7 +58,7 @@ class EntityDescriptorFilesScheduledTasksTests extends Specification { randomGenerator = new RandomGenerator() tempPath = tempPath + randomGenerator.randomRangeInt(10000, 20000) service = new JPAEntityDescriptorServiceImpl(openSamlObjects, new JPAEntityServiceImpl(openSamlObjects), new UserService(roleRepository, userRepository)) - entityDescriptorFilesScheduledTasks = new EntityDescriptorFilesScheduledTasks(tempPath, entityDescriptorRepository, openSamlObjects) + entityDescriptorFilesScheduledTasks = new EntityDescriptorFilesScheduledTasks(tempPath, entityDescriptorRepository, openSamlObjects, new FileCheckingFileWritingService()) directory = new File(tempPath) directory.mkdir() } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/FileCheckingFileWritingServiceTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/FileCheckingFileWritingServiceTests.groovy new file mode 100644 index 000000000..3d88836d7 --- /dev/null +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/FileCheckingFileWritingServiceTests.groovy @@ -0,0 +1,53 @@ +package edu.internet2.tier.shibboleth.admin.ui.service + +import spock.lang.Specification + +import java.nio.file.Files +import java.security.NoSuchAlgorithmException + +class FileCheckingFileWritingServiceTests extends Specification { + def writer = Spy(FileCheckingFileWritingService) + + def file1 = Files.createTempFile('test1', '.txt') + def file2 = Files.createTempFile('test2', '.txt') + + def "test bad algorithm"() { + setup: + def badWriter = new FileCheckingFileWritingService('badAlGoreRhythm') + + when: + badWriter.write(Files.createTempFile('testbadalgorithm', '.txt'), 'bad') + + then: + RuntimeException ex = thrown() + assert ex.cause instanceof NoSuchAlgorithmException + } + + def "test a single write"() { + when: + writer.write(file1, 'testme') + + then: + 1 * writer.writeContent(file1, 'testme'.bytes) + } + + def "test writes with changed content"() { + when: + writer.write(file2, 'testme') + writer.write(file2, 'anothertest') + + then: + 1 * writer.writeContent(file2, 'testme'.bytes) + 1 * writer.writeContent(file2, 'anothertest'.bytes) + } + + def "test writes with unchanged content, should only write once"() { + when: + (1..5).each { + writer.write(file1, 'testme') + } + + then: + 1 * writer.writeContent(file1, 'testme'.bytes) + } +} From c1a55bf79b9c3148927f2cd10a0d06fd585febd5 Mon Sep 17 00:00:00 2001 From: Jj! Date: Thu, 23 May 2019 12:50:43 -0500 Subject: [PATCH 005/112] [SHIBUI-1253] use file writing service for metadata providers refactor tests --- .../CoreShibUiConfiguration.java | 2 +- .../MetadataProvidersScheduledTasks.java | 5 +- .../FileCheckingFileWritingService.java | 52 ++++++++++---- .../admin/ui/service/FileWritingService.java | 13 +++- ...FileCheckingFileWritingServiceTests.groovy | 71 +++++++++++++++---- 5 files changed, 112 insertions(+), 31 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java index a339e90ee..da33c53f8 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java @@ -106,7 +106,7 @@ public EntityDescriptorFilesScheduledTasks entityDescriptorFilesScheduledTasks(E @Bean @ConditionalOnProperty(name = "shibui.metadataProviders.target") public MetadataProvidersScheduledTasks metadataProvidersScheduledTasks(@Value("${shibui.metadataProviders.target}") final Resource resource, final MetadataResolverService metadataResolverService) { - return new MetadataProvidersScheduledTasks(resource, metadataResolverService); + return new MetadataProvidersScheduledTasks(resource, metadataResolverService, fileWritingService()); } @Bean diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/scheduled/MetadataProvidersScheduledTasks.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/scheduled/MetadataProvidersScheduledTasks.java index 49048f39b..1f6ce7e69 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/scheduled/MetadataProvidersScheduledTasks.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/scheduled/MetadataProvidersScheduledTasks.java @@ -1,5 +1,6 @@ package edu.internet2.tier.shibboleth.admin.ui.scheduled; +import edu.internet2.tier.shibboleth.admin.ui.service.FileWritingService; import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolverService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,10 +27,12 @@ public class MetadataProvidersScheduledTasks { private final Resource target; private final MetadataResolverService metadataResolverService; + private final FileWritingService fileWritingService; - public MetadataProvidersScheduledTasks(Resource target, MetadataResolverService metadataResolverService) { + public MetadataProvidersScheduledTasks(Resource target, MetadataResolverService metadataResolverService, FileWritingService fileWritingService) { this.target = target; this.metadataResolverService = metadataResolverService; + this.fileWritingService = fileWritingService; } @Scheduled(fixedRateString = "${shibui.metadataProviders.taskRunRate:30000}") diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/FileCheckingFileWritingService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/FileCheckingFileWritingService.java index a520be60a..6c05fa987 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/FileCheckingFileWritingService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/FileCheckingFileWritingService.java @@ -1,7 +1,10 @@ package edu.internet2.tier.shibboleth.admin.ui.service; +import org.springframework.core.io.WritableResource; + import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.Path; import java.security.DigestInputStream; @@ -24,28 +27,49 @@ public FileCheckingFileWritingService(String algorithm) { @Override public void write(Path path, String content) throws IOException { if (Files.exists(path)) { - try { - MessageDigest md = MessageDigest.getInstance(this.algorithm); - try ( - InputStream is = Files.newInputStream(path); - DigestInputStream dis = new DigestInputStream(is, md) - ) { - byte[] buf = new byte[4096]; - while (dis.read(buf) > -1){} + try (InputStream is = Files.newInputStream(path)) { + if (checkContentMatches(is, content)) { + return; } - byte[] fileDigest = md.digest(); - byte[] contentDigest = md.digest(content.getBytes()); - if (Arrays.equals(fileDigest, contentDigest)) { + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException(e); + } + } + writeContent(path, content); + } + + @Override + public void write(WritableResource resource, String content) throws IOException { + if (resource.exists()) { + try (InputStream is = resource.getInputStream()) { + if (checkContentMatches(is, content)) { return; } } catch (NoSuchAlgorithmException e) { throw new RuntimeException(e); } } - writeContent(path, content.getBytes()); + writeContent(resource, content); + } + + private boolean checkContentMatches(InputStream inputStream, String content) throws NoSuchAlgorithmException, IOException { + MessageDigest md = MessageDigest.getInstance(this.algorithm); + try (DigestInputStream dis = new DigestInputStream(inputStream, md)) { + byte[] buf = new byte[4096]; + while (dis.read(buf) > -1) {} + } + byte[] fileDigest = md.digest(); + byte[] contentDigest = md.digest(content.getBytes()); + return Arrays.equals(fileDigest, contentDigest); } - void writeContent(Path path, byte[] bytes) throws IOException { - Files.write(path, bytes); + void writeContent(Path path, String content) throws IOException { + Files.write(path, content.getBytes()); + } + + void writeContent(WritableResource resource, String content) throws IOException { + try (OutputStream os = resource.getOutputStream()) { + os.write(content.getBytes()); + } } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/FileWritingService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/FileWritingService.java index 93de34da6..80493c4c0 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/FileWritingService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/FileWritingService.java @@ -1,5 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.service; +import org.springframework.core.io.WritableResource; + import java.io.IOException; import java.nio.file.Path; @@ -9,11 +11,20 @@ */ public interface FileWritingService { /** - * write the file + * Write content to a file * * @param path target file Path * @param content content to write * @throws IOException */ void write(Path path, String content) throws IOException; + + /** + * Write content to a writeable resource + * + * @param resource + * @param content + * @throws IOException + */ + void write(WritableResource resource, String content) throws IOException; } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/FileCheckingFileWritingServiceTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/FileCheckingFileWritingServiceTests.groovy index 3d88836d7..45465475a 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/FileCheckingFileWritingServiceTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/FileCheckingFileWritingServiceTests.groovy @@ -1,17 +1,26 @@ package edu.internet2.tier.shibboleth.admin.ui.service +import org.springframework.core.io.PathResource +import org.springframework.core.io.WritableResource import spock.lang.Specification import java.nio.file.Files +import java.nio.file.Path import java.security.NoSuchAlgorithmException class FileCheckingFileWritingServiceTests extends Specification { def writer = Spy(FileCheckingFileWritingService) - def file1 = Files.createTempFile('test1', '.txt') - def file2 = Files.createTempFile('test2', '.txt') + Path file - def "test bad algorithm"() { + WritableResource resource + + def setup() { + file = Files.createTempFile('test1', '.txt') + resource = new PathResource(file) + } + + def 'test bad algorithm'() { setup: def badWriter = new FileCheckingFileWritingService('badAlGoreRhythm') @@ -23,31 +32,65 @@ class FileCheckingFileWritingServiceTests extends Specification { assert ex.cause instanceof NoSuchAlgorithmException } - def "test a single write"() { + def 'test a single write to a Path'() { + when: + writer.write(file, 'testme') + + then: + 1 * writer.writeContent(file, 'testme') + assert file.text == 'testme' + } + + def 'test writes with changed content to a Path'() { + when: + writer.write(file, 'testme') + writer.write(file, 'anothertest') + + then: + 1 * writer.writeContent(file, 'testme') + 1 * writer.writeContent(file, 'anothertest') + assert file.text == 'anothertest' + } + + def 'test writes with unchanged content, should only write once to a Path'() { + when: + (1..5).each { + writer.write(file, 'testme2') + } + + then: + 1 * writer.writeContent(file, 'testme2') + assert file.text == 'testme2' + } + + def 'test a single write to a WriteableResource'() { when: - writer.write(file1, 'testme') + writer.write(resource, 'testme') then: - 1 * writer.writeContent(file1, 'testme'.bytes) + 1 * writer.writeContent(resource, 'testme') + assert resource.getFile().text == 'testme' } - def "test writes with changed content"() { + def 'test write with changed content to a WritableResource'() { when: - writer.write(file2, 'testme') - writer.write(file2, 'anothertest') + writer.write(resource, 'testme') + writer.write(resource, 'anothertest') then: - 1 * writer.writeContent(file2, 'testme'.bytes) - 1 * writer.writeContent(file2, 'anothertest'.bytes) + 1 * writer.writeContent(resource, 'testme') + 1 * writer.writeContent(resource, 'anothertest') + assert resource.getFile().text == 'anothertest' } - def "test writes with unchanged content, should only write once"() { + def 'test writes with unchanged content, should only write once to a WriteableResource'() { when: (1..5).each { - writer.write(file1, 'testme') + writer.write(resource, 'testme2') } then: - 1 * writer.writeContent(file1, 'testme'.bytes) + 1 * writer.writeContent(resource, 'testme2') + assert resource.getFile().text == 'testme2' } } From b3c4b1fd10743e1b6adaebc4df5c132e7ad13e65 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Fri, 24 May 2019 12:07:11 -0400 Subject: [PATCH 006/112] SHIBUI-1262 [1307 WIP] --- .../admin/ui/configuration/DevConfig.groovy | 30 +++++++++++++- .../EntityDescriptors.groovy | 40 +++++++++++++++++++ .../EntityDescriptorController.java | 1 + .../admin/ui/domain/AbstractXMLObject.java | 2 + .../admin/ui/domain/EntityDescriptor.java | 13 ++++++ .../FileBackedHttpMetadataResolver.java | 2 - .../ui/domain/resolvers/MetadataResolver.java | 2 + .../EntityDescriptorVersionService.java | 4 +- 8 files changed, 89 insertions(+), 5 deletions(-) create mode 100644 backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/util/entitydescriptors/EntityDescriptors.groovy diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy index 2ed81b941..4887be48e 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy @@ -1,6 +1,15 @@ package edu.internet2.tier.shibboleth.admin.ui.configuration +import edu.internet2.tier.shibboleth.admin.ui.domain.AffiliateMember +import edu.internet2.tier.shibboleth.admin.ui.domain.AffiliationDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.ContactPerson +import edu.internet2.tier.shibboleth.admin.ui.domain.EncryptionMethod import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.Extensions +import edu.internet2.tier.shibboleth.admin.ui.domain.KeyDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.Organization +import edu.internet2.tier.shibboleth.admin.ui.domain.OrganizationDisplayName +import edu.internet2.tier.shibboleth.admin.ui.domain.OrganizationName import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver @@ -9,6 +18,8 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.HttpMetadataResol import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataQueryProtocolScheme 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.ui.domain.util.entitydescriptors.EntityDescriptors +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.repository.MetadataResolverRepository import edu.internet2.tier.shibboleth.admin.ui.security.model.Role @@ -18,8 +29,11 @@ import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorVersionService import edu.internet2.tier.shibboleth.admin.util.ModelRepresentationConversions +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.context.event.ApplicationStartedEvent import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Profile +import org.springframework.context.event.EventListener import org.springframework.stereotype.Component import org.springframework.transaction.annotation.Transactional @@ -34,6 +48,9 @@ class DevConfig { private final MetadataResolverRepository metadataResolverRepository private final EntityDescriptorRepository entityDescriptorRepository + @Autowired + private OpenSamlObjects openSamlObjects + DevConfig(UserRepository adminUserRepository, MetadataResolverRepository metadataResolverRepository, RoleRepository roleRepository, EntityDescriptorRepository entityDescriptorRepository) { this.adminUserRepository = adminUserRepository this.metadataResolverRepository = metadataResolverRepository @@ -161,7 +178,16 @@ class DevConfig { @Profile('dev-ed-versioning') @Bean - EntityDescriptorVersionService stubEntityDescriptorVersionService(EntityDescriptorService entityDescriptorService) { - return EntityDescriptorVersionService.stubImpl(entityDescriptorService) + EntityDescriptorVersionService stubEntityDescriptorVersionService(EntityDescriptorService entityDescriptorService, + EntityDescriptorRepository entityDescriptorRepository) { + return EntityDescriptorVersionService.stubImpl(entityDescriptorService, entityDescriptorRepository) + } + + @Transactional + @EventListener + void edForVersioningDev(ApplicationStartedEvent e) { + if (e.applicationContext.environment.activeProfiles.contains('dev-ed-versioning')) { + this.entityDescriptorRepository.save(EntityDescriptors.prebakedEntityDescriptor(openSamlObjects)) + } } } diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/util/entitydescriptors/EntityDescriptors.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/util/entitydescriptors/EntityDescriptors.groovy new file mode 100644 index 000000000..b7514e2c0 --- /dev/null +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/util/entitydescriptors/EntityDescriptors.groovy @@ -0,0 +1,40 @@ +package edu.internet2.tier.shibboleth.admin.ui.domain.util.entitydescriptors + +import edu.internet2.tier.shibboleth.admin.ui.domain.ContactPerson +import edu.internet2.tier.shibboleth.admin.ui.domain.EmailAddress +import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.GivenName +import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects +import org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration + +/** + * Utility class to statically construct a graph of EntityDescriptor objects useful for dev and testing. + */ +final class EntityDescriptors { + + private EntityDescriptors() { + } + + static EntityDescriptor prebakedEntityDescriptor(OpenSamlObjects openSamlObjects) { + openSamlObjects.buildDefaultInstanceOfType(EntityDescriptor.class).with { + it.contactPersons = [openSamlObjects.buildDefaultInstanceOfType(ContactPerson.class).with { + it.type = ContactPersonTypeEnumeration.ADMINISTRATIVE + it.givenName = openSamlObjects.buildDefaultInstanceOfType(GivenName.class).with { + it.name = 'name' + it + } + it.emailAddresses.add(openSamlObjects.buildDefaultInstanceOfType(EmailAddress.class).with { + it.address = 'test@test' + it + }) + it + }] + + + //Main ed + it + } + } + + +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java index b3ea0fb62..6690d4520 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java @@ -38,6 +38,7 @@ import java.net.URI; import java.util.List; import java.util.stream.Collectors; +import java.util.stream.Stream; @RestController @RequestMapping("/api") diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractXMLObject.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractXMLObject.java index 1e8f4c2a0..5d28825fd 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractXMLObject.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractXMLObject.java @@ -3,6 +3,7 @@ import lombok.EqualsAndHashCode; import net.shibboleth.utilities.java.support.collection.LockableClassToInstanceMultiMap; import net.shibboleth.utilities.java.support.xml.QNameSupport; +import org.hibernate.envers.Audited; import org.opensaml.core.config.ConfigurationService; import org.opensaml.core.xml.Namespace; import org.opensaml.core.xml.NamespaceManager; @@ -30,6 +31,7 @@ @Entity @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) @EqualsAndHashCode(callSuper = true) +@Audited public abstract class AbstractXMLObject extends AbstractAuditable implements XMLObject { private String namespaceURI; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java index 2f53e5cc8..b2b2d885c 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java @@ -4,6 +4,9 @@ import com.google.common.collect.Lists; import lombok.EqualsAndHashCode; +import org.hibernate.envers.AuditOverride; +import org.hibernate.envers.Audited; +import org.hibernate.envers.NotAudited; import org.opensaml.core.config.ConfigurationService; import org.opensaml.core.xml.XMLObject; import org.opensaml.core.xml.config.XMLObjectProviderRegistry; @@ -33,6 +36,8 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited +@AuditOverride(forClass = AbstractAuditable.class) public class EntityDescriptor extends AbstractDescriptor implements org.opensaml.saml.saml2.metadata.EntityDescriptor { private String localId; @@ -45,31 +50,39 @@ public class EntityDescriptor extends AbstractDescriptor implements org.opensaml private String resourceId; @OneToOne(cascade = CascadeType.ALL) + @NotAudited private Organization organization; @OneToMany(cascade = CascadeType.ALL) @OrderColumn + @NotAudited private List contactPersons = new ArrayList<>(); @OneToMany(cascade = CascadeType.ALL) @OrderColumn + @NotAudited private List roleDescriptors; @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "entitydesc_addlmetdatlocations_id") @OrderColumn + @NotAudited private List additionalMetadataLocations = new ArrayList<>(); @OneToOne(cascade = CascadeType.ALL) + @NotAudited private AuthnAuthorityDescriptor authnAuthorityDescriptor; @OneToOne(cascade = CascadeType.ALL) + @NotAudited private AttributeAuthorityDescriptor attributeAuthorityDescriptor; @OneToOne(cascade = CascadeType.ALL) + @NotAudited private PDPDescriptor pdpDescriptor; @OneToOne(cascade = CascadeType.ALL) + @NotAudited private AffiliationDescriptor affiliationDescriptor; public EntityDescriptor() { diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/FileBackedHttpMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/FileBackedHttpMetadataResolver.java index 4ffadae52..b80b8190f 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/FileBackedHttpMetadataResolver.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/FileBackedHttpMetadataResolver.java @@ -16,8 +16,6 @@ @Getter @Setter @ToString -@Audited -@AuditOverride(forClass = AbstractAuditable.class) public class FileBackedHttpMetadataResolver extends MetadataResolver { public FileBackedHttpMetadataResolver() { type = "FileBackedHttpMetadataResolver"; 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 ec639ba38..11300c3b7 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 @@ -11,6 +11,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.ToString; +import org.hibernate.envers.AuditOverride; import org.hibernate.envers.Audited; import javax.persistence.CascadeType; @@ -39,6 +40,7 @@ @JsonSubTypes.Type(value = FilesystemMetadataResolver.class, name = "FilesystemMetadataResolver"), @JsonSubTypes.Type(value = ResourceBackedMetadataResolver.class, name = "ResourceBackedMetadataResolver")}) @Audited +@AuditOverride(forClass = AbstractAuditable.class) public class MetadataResolver extends AbstractAuditable { @JsonProperty("@type") diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java index da2910834..e53072f99 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java @@ -3,6 +3,7 @@ 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.repository.EntityDescriptorRepository; import java.time.LocalDateTime; import java.util.Arrays; @@ -18,7 +19,8 @@ public interface EntityDescriptorVersionService { EntityDescriptorRepresentation findSpecificVersionOfEntityDescriptor(String resourceId, String versionId); /* Factory method to return stub impl for dev and testing purposes */ - static EntityDescriptorVersionService stubImpl(final EntityDescriptorService entityDescriptorService) { + static EntityDescriptorVersionService stubImpl(final EntityDescriptorService entityDescriptorService, + final EntityDescriptorRepository entityDescriptorRepository) { return new EntityDescriptorVersionService() { @Override public List findVersionsForEntityDescriptor(String resourceId) { From c69d412a8af8f17268b5fe35d8d00f725fe0c72e Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 28 May 2019 10:05:04 -0400 Subject: [PATCH 007/112] SHIBUI-1262 [1307 WIP] --- ...sonSchemaValidatingControllerAdvice.groovy | 2 +- .../admin/ui/domain/AbstractXMLObject.java | 2 + .../admin/ui/domain/ContactPerson.java | 7 ++ .../admin/ui/domain/EmailAddress.java | 3 + .../admin/ui/domain/EntityDescriptor.java | 2 - .../shibboleth/admin/ui/domain/GivenName.java | 3 + ...tityDescriptorEnversVersioningTests.groovy | 65 +++++++++++++++++++ .../envers/EnversTestsSupport.groovy | 20 ++++++ 8 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy create mode 100644 backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/RelyingPartyOverridesJsonSchemaValidatingControllerAdvice.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/RelyingPartyOverridesJsonSchemaValidatingControllerAdvice.groovy index 9151e4ef4..bd3050cfd 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/RelyingPartyOverridesJsonSchemaValidatingControllerAdvice.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/RelyingPartyOverridesJsonSchemaValidatingControllerAdvice.groovy @@ -24,7 +24,7 @@ import static edu.internet2.tier.shibboleth.admin.ui.jsonschema.JsonSchemaLocati * * @author Dmitriy Kopylenko */ -@ControllerAdvice +//@ControllerAdvice class RelyingPartyOverridesJsonSchemaValidatingControllerAdvice extends RequestBodyAdviceAdapter { @Autowired diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractXMLObject.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractXMLObject.java index 5d28825fd..3b4ac0d92 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractXMLObject.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractXMLObject.java @@ -3,6 +3,7 @@ import lombok.EqualsAndHashCode; import net.shibboleth.utilities.java.support.collection.LockableClassToInstanceMultiMap; import net.shibboleth.utilities.java.support.xml.QNameSupport; +import org.hibernate.envers.AuditOverride; import org.hibernate.envers.Audited; import org.opensaml.core.config.ConfigurationService; import org.opensaml.core.xml.Namespace; @@ -32,6 +33,7 @@ @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) @EqualsAndHashCode(callSuper = true) @Audited +@AuditOverride(forClass = AbstractAuditable.class) public abstract class AbstractXMLObject extends AbstractAuditable implements XMLObject { private String namespaceURI; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ContactPerson.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ContactPerson.java index 104dc076f..ca0400f32 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ContactPerson.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ContactPerson.java @@ -1,6 +1,8 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; +import org.hibernate.envers.NotAudited; import org.opensaml.core.xml.XMLObject; import org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration; @@ -12,20 +14,24 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class ContactPerson extends AbstractAttributeExtensibleXMLObject implements org.opensaml.saml.saml2.metadata.ContactPerson { private String contactPersonType; @OneToOne(cascade = CascadeType.ALL) + @NotAudited private Extensions extensions; @OneToOne(cascade = CascadeType.ALL) + @NotAudited private Company company; @OneToOne(cascade = CascadeType.ALL) private GivenName givenName; @OneToOne(cascade = CascadeType.ALL) + @NotAudited private SurName surName; @OneToMany(cascade = CascadeType.ALL) @@ -36,6 +42,7 @@ public class ContactPerson extends AbstractAttributeExtensibleXMLObject implemen @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "contactpersn_telenmbr_id") @OrderColumn + @NotAudited private List telephoneNumbers = new ArrayList<>(); @Override diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EmailAddress.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EmailAddress.java index 313ebd65e..2cf346579 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EmailAddress.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EmailAddress.java @@ -1,11 +1,14 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.AuditOverride; +import org.hibernate.envers.Audited; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class EmailAddress extends AbstractXMLObject implements org.opensaml.saml.saml2.metadata.EmailAddress { private String address; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java index b2b2d885c..c9b7d207d 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java @@ -37,7 +37,6 @@ @Entity @EqualsAndHashCode(callSuper = true) @Audited -@AuditOverride(forClass = AbstractAuditable.class) public class EntityDescriptor extends AbstractDescriptor implements org.opensaml.saml.saml2.metadata.EntityDescriptor { private String localId; @@ -55,7 +54,6 @@ public class EntityDescriptor extends AbstractDescriptor implements org.opensaml @OneToMany(cascade = CascadeType.ALL) @OrderColumn - @NotAudited private List contactPersons = new ArrayList<>(); @OneToMany(cascade = CascadeType.ALL) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/GivenName.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/GivenName.java index 785b60804..612733fc4 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/GivenName.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/GivenName.java @@ -1,11 +1,14 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.AuditOverride; +import org.hibernate.envers.Audited; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class GivenName extends AbstractXMLObject implements org.opensaml.saml.saml2.metadata.GivenName { private String name; diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy new file mode 100644 index 000000000..424eff552 --- /dev/null +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -0,0 +1,65 @@ +package edu.internet2.tier.shibboleth.admin.ui.repository.envers + +import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration +import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects +import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository +import org.hibernate.envers.AuditReaderFactory +import org.hibernate.envers.query.AuditQuery +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.autoconfigure.domain.EntityScan +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest +import org.springframework.data.jpa.repository.config.EnableJpaRepositories +import org.springframework.test.context.ContextConfiguration +import org.springframework.transaction.PlatformTransactionManager +import spock.lang.Specification + +import javax.persistence.EntityManager + +import static edu.internet2.tier.shibboleth.admin.ui.domain.util.entitydescriptors.EntityDescriptors.prebakedEntityDescriptor +import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction + +/** + * Testing entity descriptor envers versioning + */ +@DataJpaTest +@ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration]) +@EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) +@EntityScan("edu.internet2.tier.shibboleth.admin.ui") +class EntityDescriptorEnversVersioningTests extends Specification { + + @Autowired + EntityDescriptorRepository entityDescriptorRepository + + @Autowired + EntityManager entityManager + + @Autowired + PlatformTransactionManager txMgr + + @Autowired + OpenSamlObjects openSamlObjects + + def "test versioning with contact persons"() { + when: + EntityDescriptor ed = doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(prebakedEntityDescriptor(openSamlObjects)) + } + def entityDescriptorHistory = resolverHistory() + + then: + entityDescriptorHistory.size() == 1 + } + + private resolverHistory() { + def auditReader = AuditReaderFactory.get(entityManager) + AuditQuery auditQuery = auditReader + .createQuery() + .forRevisionsOfEntity(EntityDescriptor, false, false) + auditQuery.resultList + + } +} diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy new file mode 100644 index 000000000..cbeb93c9b --- /dev/null +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy @@ -0,0 +1,20 @@ +package edu.internet2.tier.shibboleth.admin.ui.repository.envers + +import org.springframework.transaction.PlatformTransactionManager +import org.springframework.transaction.support.DefaultTransactionDefinition + +import static org.springframework.transaction.TransactionDefinition.PROPAGATION_REQUIRES_NEW + +class EnversTestsSupport { + + //This explicit low level transaction dance is required in order to verify history/version data that envers + //writes out only after the explicit transaction is committed, therefore making it impossible to verify within the main tx + //boundary of the test method which commits tx only after an execution of the test method. This let's us explicitly + //start/commit transaction making envers data written out and verifiable + static doInExplicitTransaction(PlatformTransactionManager txMgr, Closure uow) { + def txStatus = txMgr.getTransaction(new DefaultTransactionDefinition(PROPAGATION_REQUIRES_NEW)) + def entity = uow() + txMgr.commit(txStatus) + entity + } +} From a328e514adfb5baefbc00fb3010396744028c8e6 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 28 May 2019 11:30:28 -0400 Subject: [PATCH 008/112] SHIBUI-1262 [1307 WIP] --- ...tityDescriptorEnversVersioningTests.groovy | 59 ++++++++++++++++++- 1 file changed, 56 insertions(+), 3 deletions(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 424eff552..73d857bb6 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -5,8 +5,11 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.Internationalization import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation 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.service.EntityDescriptorService import org.hibernate.envers.AuditReaderFactory import org.hibernate.envers.query.AuditQuery import org.springframework.beans.factory.annotation.Autowired @@ -21,6 +24,8 @@ import javax.persistence.EntityManager import static edu.internet2.tier.shibboleth.admin.ui.domain.util.entitydescriptors.EntityDescriptors.prebakedEntityDescriptor import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction +import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE +import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHER /** * Testing entity descriptor envers versioning @@ -34,6 +39,9 @@ class EntityDescriptorEnversVersioningTests extends Specification { @Autowired EntityDescriptorRepository entityDescriptorRepository + @Autowired + EntityDescriptorService entityDescriptorService + @Autowired EntityManager entityManager @@ -48,18 +56,63 @@ class EntityDescriptorEnversVersioningTests extends Specification { EntityDescriptor ed = doInExplicitTransaction(txMgr) { entityDescriptorRepository.save(prebakedEntityDescriptor(openSamlObjects)) } - def entityDescriptorHistory = resolverHistory() + def entityDescriptorHistory = getRevisionHistory() then: entityDescriptorHistory.size() == 1 + + when: + def representation = new EntityDescriptorRepresentation().with { + it.contacts = [new ContactRepresentation(type: 'administrative', name: 'nameUPDATED', emailAddress: 'test@test')] + it + } + entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation) + + then: + entityDescriptorHistory.size() == 2 + entityDescriptorHistory[1][0].contactPersons[0].givenName.name == 'nameUPDATED' + entityDescriptorHistory[1][0].contactPersons[0].type == ADMINISTRATIVE + entityDescriptorHistory[1][1].principalUserName == 'anonymous' + entityDescriptorHistory[1][1].timestamp > 0L + + when: + representation = new EntityDescriptorRepresentation().with { + it.contacts = [new ContactRepresentation(type: 'other', name: 'nameUPDATED', emailAddress: 'test@test.com')] + it + } + entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation) + + ed.contactPersons[0].emailAddresses[0].address + then: + entityDescriptorHistory.size() == 3 + entityDescriptorHistory[2][0].contactPersons[0].givenName.name == 'nameUPDATED' + entityDescriptorHistory[2][0].contactPersons[0].type == OTHER + entityDescriptorHistory[2][0].contactPersons[0].emailAddresses[0].address == 'test@test.com' + entityDescriptorHistory[2][1].principalUserName == 'anonymous' + entityDescriptorHistory[2][1].timestamp > 0L + + //Also make sure we have our original revision + entityDescriptorHistory[0][0].contactPersons[0].givenName.name == 'name' + entityDescriptorHistory[0][0].contactPersons[0].type == ADMINISTRATIVE + entityDescriptorHistory[0][0].contactPersons[0].emailAddresses[0].address == 'test@test' + entityDescriptorHistory[0][1].principalUserName == 'anonymous' + entityDescriptorHistory[0][1].timestamp > 0L + } - private resolverHistory() { + private updateAndGetRevisionHistory(ed, representation) { + entityDescriptorService.updateDescriptorFromRepresentation(ed, representation) + doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(ed) + } + getRevisionHistory() + } + + private getRevisionHistory() { def auditReader = AuditReaderFactory.get(entityManager) AuditQuery auditQuery = auditReader .createQuery() .forRevisionsOfEntity(EntityDescriptor, false, false) auditQuery.resultList - } } From be74f0b1ff97e0c01b831c54ce85f4945eaabcc0 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 28 May 2019 11:37:25 -0400 Subject: [PATCH 009/112] SHIBUI-1262 [1307 WIP] --- .../envers/EntityDescriptorEnversVersioningTests.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 73d857bb6..6c0305c57 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -82,7 +82,6 @@ class EntityDescriptorEnversVersioningTests extends Specification { } entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation) - ed.contactPersons[0].emailAddresses[0].address then: entityDescriptorHistory.size() == 3 entityDescriptorHistory[2][0].contactPersons[0].givenName.name == 'nameUPDATED' From 0d4a43d356b7ca056882152260b93f04b08d1bca Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 28 May 2019 12:07:57 -0400 Subject: [PATCH 010/112] SHIBUI-1262 [1307 WIP] --- ...tityDescriptorEnversVersioningTests.groovy | 33 +++++++------------ .../envers/EnversTestsSupport.groovy | 27 +++++++++++++++ 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 6c0305c57..db54aa66a 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -10,8 +10,6 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRe 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.service.EntityDescriptorService -import org.hibernate.envers.AuditReaderFactory -import org.hibernate.envers.query.AuditQuery import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.domain.EntityScan import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest @@ -24,6 +22,8 @@ import javax.persistence.EntityManager import static edu.internet2.tier.shibboleth.admin.ui.domain.util.entitydescriptors.EntityDescriptors.prebakedEntityDescriptor import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction +import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionHistory +import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistory import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHER @@ -56,7 +56,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { EntityDescriptor ed = doInExplicitTransaction(txMgr) { entityDescriptorRepository.save(prebakedEntityDescriptor(openSamlObjects)) } - def entityDescriptorHistory = getRevisionHistory() + def entityDescriptorHistory = getRevisionHistory(entityManager) then: entityDescriptorHistory.size() == 1 @@ -66,7 +66,10 @@ class EntityDescriptorEnversVersioningTests extends Specification { it.contacts = [new ContactRepresentation(type: 'administrative', name: 'nameUPDATED', emailAddress: 'test@test')] it } - entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation) + entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) then: entityDescriptorHistory.size() == 2 @@ -80,7 +83,11 @@ class EntityDescriptorEnversVersioningTests extends Specification { it.contacts = [new ContactRepresentation(type: 'other', name: 'nameUPDATED', emailAddress: 'test@test.com')] it } - entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation) + entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, + entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) then: entityDescriptorHistory.size() == 3 @@ -98,20 +105,4 @@ class EntityDescriptorEnversVersioningTests extends Specification { entityDescriptorHistory[0][1].timestamp > 0L } - - private updateAndGetRevisionHistory(ed, representation) { - entityDescriptorService.updateDescriptorFromRepresentation(ed, representation) - doInExplicitTransaction(txMgr) { - entityDescriptorRepository.save(ed) - } - getRevisionHistory() - } - - private getRevisionHistory() { - def auditReader = AuditReaderFactory.get(entityManager) - AuditQuery auditQuery = auditReader - .createQuery() - .forRevisionsOfEntity(EntityDescriptor, false, false) - auditQuery.resultList - } } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy index cbeb93c9b..93fc12c1f 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy @@ -1,8 +1,15 @@ package edu.internet2.tier.shibboleth.admin.ui.repository.envers +import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository +import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService +import org.hibernate.envers.AuditReaderFactory +import org.hibernate.envers.query.AuditQuery import org.springframework.transaction.PlatformTransactionManager import org.springframework.transaction.support.DefaultTransactionDefinition +import javax.persistence.EntityManager + import static org.springframework.transaction.TransactionDefinition.PROPAGATION_REQUIRES_NEW class EnversTestsSupport { @@ -17,4 +24,24 @@ class EnversTestsSupport { txMgr.commit(txStatus) entity } + + static updateAndGetRevisionHistory(ed, representation, + EntityDescriptorService eds, + EntityDescriptorRepository edr, + PlatformTransactionManager txMgr, + EntityManager em) { + eds.updateDescriptorFromRepresentation(ed, representation) + doInExplicitTransaction(txMgr) { + edr.save(ed) + } + getRevisionHistory(em) + } + + static getRevisionHistory(EntityManager em) { + def auditReader = AuditReaderFactory.get(em) + AuditQuery auditQuery = auditReader + .createQuery() + .forRevisionsOfEntity(EntityDescriptor, false, false) + auditQuery.resultList + } } From aa26d56f2e5534e0733d581d2d50872bcac2300f Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 28 May 2019 16:03:34 -0400 Subject: [PATCH 011/112] SHIBUI-1262 [1307 WIP] --- ...tityDescriptorEnversVersioningTests.groovy | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index db54aa66a..9e5b47f70 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -4,18 +4,23 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfigurat import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration +import edu.internet2.tier.shibboleth.admin.ui.domain.ContactPerson +import edu.internet2.tier.shibboleth.admin.ui.domain.EmailAddress import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.GivenName import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation 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.service.EntityDescriptorService +import org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.domain.EntityScan import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest import org.springframework.data.jpa.repository.config.EnableJpaRepositories import org.springframework.test.context.ContextConfiguration import org.springframework.transaction.PlatformTransactionManager +import spock.lang.Shared import spock.lang.Specification import javax.persistence.EntityManager @@ -51,18 +56,30 @@ class EntityDescriptorEnversVersioningTests extends Specification { @Autowired OpenSamlObjects openSamlObjects + @Shared + EntityDescriptor ed = new EntityDescriptor() + def "test versioning with contact persons"() { when: - EntityDescriptor ed = doInExplicitTransaction(txMgr) { - entityDescriptorRepository.save(prebakedEntityDescriptor(openSamlObjects)) + def representation = new EntityDescriptorRepresentation().with { + it.contacts = [new ContactRepresentation(type: 'administrative', name: 'name', emailAddress: 'test@test')] + it } - def entityDescriptorHistory = getRevisionHistory(entityManager) + def entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) then: entityDescriptorHistory.size() == 1 + entityDescriptorHistory[0][0].contactPersons[0].givenName.name == 'name' + entityDescriptorHistory[0][0].contactPersons[0].type == ADMINISTRATIVE + entityDescriptorHistory[0][0].contactPersons[0].emailAddresses[0].address == 'test@test' + entityDescriptorHistory[0][1].principalUserName == 'anonymous' + entityDescriptorHistory[0][1].timestamp > 0L when: - def representation = new EntityDescriptorRepresentation().with { + representation = new EntityDescriptorRepresentation().with { it.contacts = [new ContactRepresentation(type: 'administrative', name: 'nameUPDATED', emailAddress: 'test@test')] it } @@ -75,12 +92,13 @@ class EntityDescriptorEnversVersioningTests extends Specification { entityDescriptorHistory.size() == 2 entityDescriptorHistory[1][0].contactPersons[0].givenName.name == 'nameUPDATED' entityDescriptorHistory[1][0].contactPersons[0].type == ADMINISTRATIVE + entityDescriptorHistory[1][0].contactPersons[0].emailAddresses[0].address == 'test@test' entityDescriptorHistory[1][1].principalUserName == 'anonymous' entityDescriptorHistory[1][1].timestamp > 0L when: representation = new EntityDescriptorRepresentation().with { - it.contacts = [new ContactRepresentation(type: 'other', name: 'nameUPDATED', emailAddress: 'test@test.com')] + it.contacts = [new ContactRepresentation(type: 'other', name: 'nameUPDATED2', emailAddress: 'test@test.com')] it } entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, @@ -91,7 +109,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { then: entityDescriptorHistory.size() == 3 - entityDescriptorHistory[2][0].contactPersons[0].givenName.name == 'nameUPDATED' + entityDescriptorHistory[2][0].contactPersons[0].givenName.name == 'nameUPDATED2' entityDescriptorHistory[2][0].contactPersons[0].type == OTHER entityDescriptorHistory[2][0].contactPersons[0].emailAddresses[0].address == 'test@test.com' entityDescriptorHistory[2][1].principalUserName == 'anonymous' From 77e3f60e0e2cf71c3e6f734bc7f7bf85ca0bcde6 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 28 May 2019 16:04:25 -0400 Subject: [PATCH 012/112] SHIBUI-1262 [1307 WIP] --- .../envers/EntityDescriptorEnversVersioningTests.groovy | 7 ------- 1 file changed, 7 deletions(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 9e5b47f70..7ef59d0c7 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -4,16 +4,12 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfigurat import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration -import edu.internet2.tier.shibboleth.admin.ui.domain.ContactPerson -import edu.internet2.tier.shibboleth.admin.ui.domain.EmailAddress import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor -import edu.internet2.tier.shibboleth.admin.ui.domain.GivenName import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation 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.service.EntityDescriptorService -import org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.domain.EntityScan import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest @@ -25,9 +21,6 @@ import spock.lang.Specification import javax.persistence.EntityManager -import static edu.internet2.tier.shibboleth.admin.ui.domain.util.entitydescriptors.EntityDescriptors.prebakedEntityDescriptor -import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction -import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionHistory import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistory import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHER From a57d648716b0c76bcfbe87ed6d3c12aea2c761e2 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 28 May 2019 16:06:40 -0400 Subject: [PATCH 013/112] SHIBUI-1262 [1307 WIP] --- .../admin/ui/configuration/DevConfig.groovy | 1 - .../EntityDescriptors.groovy | 40 ------------------- 2 files changed, 41 deletions(-) delete mode 100644 backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/util/entitydescriptors/EntityDescriptors.groovy diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy index 4887be48e..582624141 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy @@ -18,7 +18,6 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.HttpMetadataResol import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataQueryProtocolScheme 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.ui.domain.util.entitydescriptors.EntityDescriptors 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.repository.MetadataResolverRepository diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/util/entitydescriptors/EntityDescriptors.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/util/entitydescriptors/EntityDescriptors.groovy deleted file mode 100644 index b7514e2c0..000000000 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/util/entitydescriptors/EntityDescriptors.groovy +++ /dev/null @@ -1,40 +0,0 @@ -package edu.internet2.tier.shibboleth.admin.ui.domain.util.entitydescriptors - -import edu.internet2.tier.shibboleth.admin.ui.domain.ContactPerson -import edu.internet2.tier.shibboleth.admin.ui.domain.EmailAddress -import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor -import edu.internet2.tier.shibboleth.admin.ui.domain.GivenName -import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects -import org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration - -/** - * Utility class to statically construct a graph of EntityDescriptor objects useful for dev and testing. - */ -final class EntityDescriptors { - - private EntityDescriptors() { - } - - static EntityDescriptor prebakedEntityDescriptor(OpenSamlObjects openSamlObjects) { - openSamlObjects.buildDefaultInstanceOfType(EntityDescriptor.class).with { - it.contactPersons = [openSamlObjects.buildDefaultInstanceOfType(ContactPerson.class).with { - it.type = ContactPersonTypeEnumeration.ADMINISTRATIVE - it.givenName = openSamlObjects.buildDefaultInstanceOfType(GivenName.class).with { - it.name = 'name' - it - } - it.emailAddresses.add(openSamlObjects.buildDefaultInstanceOfType(EmailAddress.class).with { - it.address = 'test@test' - it - }) - it - }] - - - //Main ed - it - } - } - - -} From 7d876571b15f5378a7a2efe727ff9e0a233765b4 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 28 May 2019 16:06:53 -0400 Subject: [PATCH 014/112] SHIBUI-1262 [1307 WIP] --- .../admin/ui/configuration/DevConfig.groovy | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy index 582624141..1c2dc4cd1 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy @@ -1,23 +1,10 @@ package edu.internet2.tier.shibboleth.admin.ui.configuration -import edu.internet2.tier.shibboleth.admin.ui.domain.AffiliateMember -import edu.internet2.tier.shibboleth.admin.ui.domain.AffiliationDescriptor -import edu.internet2.tier.shibboleth.admin.ui.domain.ContactPerson -import edu.internet2.tier.shibboleth.admin.ui.domain.EncryptionMethod + import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor -import edu.internet2.tier.shibboleth.admin.ui.domain.Extensions -import edu.internet2.tier.shibboleth.admin.ui.domain.KeyDescriptor -import edu.internet2.tier.shibboleth.admin.ui.domain.Organization -import edu.internet2.tier.shibboleth.admin.ui.domain.OrganizationDisplayName -import edu.internet2.tier.shibboleth.admin.ui.domain.OrganizationName import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget -import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver -import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver -import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.HttpMetadataResolverAttributes -import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataQueryProtocolScheme -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.ui.domain.resolvers.* 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.repository.MetadataResolverRepository From dcf2ec2759294ae38cefccc5e061a68db6eb2ab4 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 28 May 2019 16:11:02 -0400 Subject: [PATCH 015/112] SHIBUI-1262 [1307 WIP] --- .../shibboleth/admin/ui/configuration/DevConfig.groovy | 8 -------- 1 file changed, 8 deletions(-) diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy index 1c2dc4cd1..6f853e089 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy @@ -168,12 +168,4 @@ class DevConfig { EntityDescriptorRepository entityDescriptorRepository) { return EntityDescriptorVersionService.stubImpl(entityDescriptorService, entityDescriptorRepository) } - - @Transactional - @EventListener - void edForVersioningDev(ApplicationStartedEvent e) { - if (e.applicationContext.environment.activeProfiles.contains('dev-ed-versioning')) { - this.entityDescriptorRepository.save(EntityDescriptors.prebakedEntityDescriptor(openSamlObjects)) - } - } } From 7527e8ebbcd17fa9e16c3d93f85c792895f38da3 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Wed, 29 May 2019 13:10:56 -0700 Subject: [PATCH 016/112] initial commit for SHIBUI-1267 --- .../action/configuration.action.ts | 61 +++++++++++++++ .../metadata-configuration.component.html | 10 +++ .../metadata-configuration.component.spec.ts | 0 .../metadata-configuration.component.ts | 16 ++++ .../configuration/configuration.module.ts | 45 +++++++++++ .../configuration/configuration.routing.ts | 9 +++ .../container/configuration.component.html | 17 +++++ .../container/configuration.component.spec.ts | 0 .../container/configuration.component.ts | 44 +++++++++++ .../effect/configuration.effect.ts | 48 ++++++++++++ .../model/metadata-configuration.ts | 5 ++ .../metadata/configuration/model/schema.ts | 3 + .../metadata/configuration/model/section.ts | 11 +++ .../reducer/configuration.reducer.ts | 51 +++++++++++++ .../metadata/configuration/reducer/index.ts | 75 +++++++++++++++++++ .../service/configuration.service.ts | 35 +++++++++ .../metadata/configuration/service/utility.ts | 40 ++++++++++ .../model/wizards/metadata-source-editor.ts | 2 +- .../dashboard-resolvers-list.component.html | 2 +- .../dashboard-resolvers-list.component.ts | 4 +- ui/src/app/metadata/metadata.module.ts | 3 +- ui/src/app/metadata/metadata.routing.ts | 4 +- 22 files changed, 479 insertions(+), 6 deletions(-) create mode 100644 ui/src/app/metadata/configuration/action/configuration.action.ts create mode 100644 ui/src/app/metadata/configuration/component/metadata-configuration.component.html create mode 100644 ui/src/app/metadata/configuration/component/metadata-configuration.component.spec.ts create mode 100644 ui/src/app/metadata/configuration/component/metadata-configuration.component.ts create mode 100644 ui/src/app/metadata/configuration/configuration.module.ts create mode 100644 ui/src/app/metadata/configuration/configuration.routing.ts create mode 100644 ui/src/app/metadata/configuration/container/configuration.component.html create mode 100644 ui/src/app/metadata/configuration/container/configuration.component.spec.ts create mode 100644 ui/src/app/metadata/configuration/container/configuration.component.ts create mode 100644 ui/src/app/metadata/configuration/effect/configuration.effect.ts create mode 100644 ui/src/app/metadata/configuration/model/metadata-configuration.ts create mode 100644 ui/src/app/metadata/configuration/model/schema.ts create mode 100644 ui/src/app/metadata/configuration/model/section.ts create mode 100644 ui/src/app/metadata/configuration/reducer/configuration.reducer.ts create mode 100644 ui/src/app/metadata/configuration/reducer/index.ts create mode 100644 ui/src/app/metadata/configuration/service/configuration.service.ts create mode 100644 ui/src/app/metadata/configuration/service/utility.ts diff --git a/ui/src/app/metadata/configuration/action/configuration.action.ts b/ui/src/app/metadata/configuration/action/configuration.action.ts new file mode 100644 index 000000000..42d1dddaa --- /dev/null +++ b/ui/src/app/metadata/configuration/action/configuration.action.ts @@ -0,0 +1,61 @@ +import { Action } from '@ngrx/store'; +import { Metadata } from '../../domain/domain.type'; +import { Schema } from '../model/schema'; +import { Wizard } from '../../../wizard/model'; + +export enum ConfigurationActionTypes { + LOAD_METADATA_REQUEST = '[Metadata Configuration] Load Metadata Request', + LOAD_METADATA_SUCCESS = '[Metadata Configuration] Load Metadata Success', + LOAD_METADATA_ERROR = '[Metadata Configuration] Load Metadata Error', + + SET_METADATA = '[Metadata Configuration] Set Metadata Model', + SET_DEFINITION = '[Metadata Configuration] Set Metadata Definition', + SET_SCHEMA = '[Metadata Configuration] Set Metadata Schema', + CLEAR = '[Metadata Configuration] Clear' +} + +export class LoadMetadataRequest implements Action { + readonly type = ConfigurationActionTypes.LOAD_METADATA_REQUEST; + + constructor(public payload: { id: string, type: string }) { } +} + +export class LoadMetadataSuccess implements Action { + readonly type = ConfigurationActionTypes.LOAD_METADATA_SUCCESS; + + constructor(public payload: Metadata) { } +} + +export class LoadMetadataError implements Action { + readonly type = ConfigurationActionTypes.LOAD_METADATA_ERROR; + + constructor(public payload: any) { } +} + +export class SetMetadata implements Action { + readonly type = ConfigurationActionTypes.SET_METADATA; + + constructor(public payload: Metadata) { } +} + +export class SetDefinition implements Action { + readonly type = ConfigurationActionTypes.SET_DEFINITION; + + constructor(public payload: Wizard) { } +} + +export class SetSchema implements Action { + readonly type = ConfigurationActionTypes.SET_SCHEMA; + + constructor(public payload: Schema) { } +} + +export class ClearConfiguration implements Action { + readonly type = ConfigurationActionTypes.CLEAR; +} + +export type ConfigurationActionsUnion = + | SetMetadata + | SetDefinition + | SetSchema + | ClearConfiguration; diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html new file mode 100644 index 000000000..f2034d06b --- /dev/null +++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html @@ -0,0 +1,10 @@ +
+
+
+ {{ i + 1 }}: {{ section.label }} + + {{ prop | json }} + +
+
+
\ No newline at end of file diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.spec.ts b/ui/src/app/metadata/configuration/component/metadata-configuration.component.spec.ts new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts b/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts new file mode 100644 index 000000000..578b7abd3 --- /dev/null +++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts @@ -0,0 +1,16 @@ +import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; +import { WizardStep } from '../../../wizard/model'; +import Section from '../model/section'; +import { MetadataConfiguration } from '../model/metadata-configuration'; + +@Component({ + selector: 'metadata-configuration', + changeDetection: ChangeDetectionStrategy.OnPush, + templateUrl: './metadata-configuration.component.html', + styleUrls: [] +}) +export class MetadataConfigurationComponent { + @Input() configuration: MetadataConfiguration; + + constructor() { } +} diff --git a/ui/src/app/metadata/configuration/configuration.module.ts b/ui/src/app/metadata/configuration/configuration.module.ts new file mode 100644 index 000000000..c04ab7add --- /dev/null +++ b/ui/src/app/metadata/configuration/configuration.module.ts @@ -0,0 +1,45 @@ +import { NgModule, ModuleWithProviders } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { StoreModule } from '@ngrx/store'; +import { EffectsModule } from '@ngrx/effects'; + +import { I18nModule } from '../../i18n/i18n.module'; +import { MetadataConfigurationComponent } from './component/metadata-configuration.component'; +import { ConfigurationComponent } from './container/configuration.component'; +import { MetadataConfigurationService } from './service/configuration.service'; +import * as fromConfig from './reducer'; +import { MetadataConfigurationEffects } from './effect/configuration.effect'; + +@NgModule({ + declarations: [ + MetadataConfigurationComponent, + ConfigurationComponent + ], + entryComponents: [], + imports: [ + CommonModule, + I18nModule + ], + exports: [], + providers: [] +}) +export class MetadataConfigurationModule { + static forRoot(): ModuleWithProviders { + return { + ngModule: RootMetadataConfigurationModule, + providers: [ + MetadataConfigurationService + ] + }; + } +} + +@NgModule({ + imports: [ + MetadataConfigurationModule, + StoreModule.forFeature('metadata-configuration', fromConfig.reducers), + EffectsModule.forFeature([MetadataConfigurationEffects]) + ], + providers: [] +}) +export class RootMetadataConfigurationModule { } diff --git a/ui/src/app/metadata/configuration/configuration.routing.ts b/ui/src/app/metadata/configuration/configuration.routing.ts new file mode 100644 index 000000000..c1e6e138d --- /dev/null +++ b/ui/src/app/metadata/configuration/configuration.routing.ts @@ -0,0 +1,9 @@ +import { Routes } from '@angular/router'; +import { ConfigurationComponent } from './container/configuration.component'; + +export const ConfigurationRoutes: Routes = [ + { + path: ':type/:id/configuration', + component: ConfigurationComponent + } +]; diff --git a/ui/src/app/metadata/configuration/container/configuration.component.html b/ui/src/app/metadata/configuration/container/configuration.component.html new file mode 100644 index 000000000..21e8a3311 --- /dev/null +++ b/ui/src/app/metadata/configuration/container/configuration.component.html @@ -0,0 +1,17 @@ +
+
+
+
+
+ + + Metadata resolver history + +
+
+
+
+ +
+
+
\ No newline at end of file diff --git a/ui/src/app/metadata/configuration/container/configuration.component.spec.ts b/ui/src/app/metadata/configuration/container/configuration.component.spec.ts new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/app/metadata/configuration/container/configuration.component.ts b/ui/src/app/metadata/configuration/container/configuration.component.ts new file mode 100644 index 000000000..3c47e0b93 --- /dev/null +++ b/ui/src/app/metadata/configuration/container/configuration.component.ts @@ -0,0 +1,44 @@ +import { Store } from '@ngrx/store'; +import { Component, ChangeDetectionStrategy, OnDestroy } from '@angular/core'; +import { Observable, Subject } from 'rxjs'; +import { ActivatedRoute } from '@angular/router'; + +import * as fromConfiguration from '../reducer'; +import { MetadataConfiguration } from '../model/metadata-configuration'; +import { METADATA_SOURCE_EDITOR } from '../../resolver/wizard-definition'; +import { takeUntil, map } from 'rxjs/operators'; +import { LoadMetadataRequest, ClearConfiguration } from '../action/configuration.action'; + +@Component({ + selector: 'configuration-page', + changeDetection: ChangeDetectionStrategy.OnPush, + templateUrl: './configuration.component.html', + styleUrls: [] +}) +export class ConfigurationComponent implements OnDestroy { + private ngUnsubscribe: Subject = new Subject(); + + configuration$: Observable; + + constructor( + private store: Store, + private routerState: ActivatedRoute + ) { + this.configuration$ = this.store.select(fromConfiguration.getConfigurationColumns); + + this.routerState.params.pipe( + takeUntil(this.ngUnsubscribe), + map(params => new LoadMetadataRequest({id: params.id, type: params.type})) + ).subscribe(store); + + this.configuration$.subscribe(c => console.log(c)); + + // this.resolver$ = this.store.select(fromResolvers.getSelectedResolver).pipe(skipWhile(p => !p)); + } + + ngOnDestroy() { + this.ngUnsubscribe.next(); + this.ngUnsubscribe.complete(); + this.store.dispatch(new ClearConfiguration()); + } +} diff --git a/ui/src/app/metadata/configuration/effect/configuration.effect.ts b/ui/src/app/metadata/configuration/effect/configuration.effect.ts new file mode 100644 index 000000000..b3c8f0515 --- /dev/null +++ b/ui/src/app/metadata/configuration/effect/configuration.effect.ts @@ -0,0 +1,48 @@ +import { Injectable } from '@angular/core'; +import { Effect, Actions, ofType } from '@ngrx/effects'; +import { switchMap, catchError, map } from 'rxjs/operators'; +import { of } from 'rxjs'; + +import { MetadataConfigurationService } from '../service/configuration.service'; +import { + LoadMetadataRequest, + LoadMetadataSuccess, + LoadMetadataError, + ConfigurationActionTypes, + SetMetadata, + SetDefinition +} from '../action/configuration.action'; + +@Injectable() +export class MetadataConfigurationEffects { + + @Effect() + loadMetadata$ = this.actions$.pipe( + ofType(ConfigurationActionTypes.LOAD_METADATA_REQUEST), + switchMap(action => + this.configService + .find(action.payload.id, action.payload.type) + .pipe( + map(md => new LoadMetadataSuccess(md)), + catchError(error => of(new LoadMetadataError(error))) + ) + ) + ); + + @Effect() + setMetadataOnLoad$ = this.actions$.pipe( + ofType(ConfigurationActionTypes.LOAD_METADATA_SUCCESS), + map(action => new SetMetadata(action.payload)) + ); + + @Effect() + setDefinitionOnMetadataSet$ = this.actions$.pipe( + ofType(ConfigurationActionTypes.SET_METADATA), + map(action => new SetDefinition(this.configService.getDefinition(action.payload))) + ); + + constructor( + private configService: MetadataConfigurationService, + private actions$: Actions + ) { } +} diff --git a/ui/src/app/metadata/configuration/model/metadata-configuration.ts b/ui/src/app/metadata/configuration/model/metadata-configuration.ts new file mode 100644 index 000000000..10768f14e --- /dev/null +++ b/ui/src/app/metadata/configuration/model/metadata-configuration.ts @@ -0,0 +1,5 @@ +import Section from './section'; + +export interface MetadataConfiguration { + columns: Array
[]; +} diff --git a/ui/src/app/metadata/configuration/model/schema.ts b/ui/src/app/metadata/configuration/model/schema.ts new file mode 100644 index 000000000..469650111 --- /dev/null +++ b/ui/src/app/metadata/configuration/model/schema.ts @@ -0,0 +1,3 @@ +export interface Schema { + [prop: string]: any; +} diff --git a/ui/src/app/metadata/configuration/model/section.ts b/ui/src/app/metadata/configuration/model/section.ts new file mode 100644 index 000000000..089a1953a --- /dev/null +++ b/ui/src/app/metadata/configuration/model/section.ts @@ -0,0 +1,11 @@ +import { Property } from '../../domain/model/property'; + +export interface Section { + id: string; + index: number; + label: string; + pageNumber: number; + properties: Property[]; +} + +export default Section; diff --git a/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts b/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts new file mode 100644 index 000000000..3acc42338 --- /dev/null +++ b/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts @@ -0,0 +1,51 @@ +import { ConfigurationActionTypes, ConfigurationActionsUnion } from '../action/configuration.action'; +import { Metadata } from '../../domain/domain.type'; +import { Wizard, WizardStep } from '../../../wizard/model'; +import { Schema } from '../model/schema'; + +export interface State { + model: Metadata; + schema: Schema; + definition: Wizard; +} + +export const initialState: State = { + model: null, + schema: null, + definition: null +}; + +export function reducer(state = initialState, action: ConfigurationActionsUnion): State { + switch (action.type) { + case ConfigurationActionTypes.SET_SCHEMA: + return { + ...state, + schema: action.payload + }; + break; + case ConfigurationActionTypes.SET_DEFINITION: + return { + ...state, + definition: action.payload + }; + break; + case ConfigurationActionTypes.SET_METADATA: + return { + ...state, + model: action.payload + }; + break; + case ConfigurationActionTypes.CLEAR: + return { + ...initialState + }; + break; + default: { + return state; + } + } +} + +export const getModel = (state: State) => state.model; +export const getDefinition = (state: State) => state.definition; +export const getSchema = (state: State) => state.schema; diff --git a/ui/src/app/metadata/configuration/reducer/index.ts b/ui/src/app/metadata/configuration/reducer/index.ts new file mode 100644 index 000000000..13b5c627f --- /dev/null +++ b/ui/src/app/metadata/configuration/reducer/index.ts @@ -0,0 +1,75 @@ +import { createSelector, createFeatureSelector } from '@ngrx/store'; +import merge from 'deepmerge'; + +import * as fromRoot from '../../../app.reducer'; +import * as fromConfiguration from './configuration.reducer'; +import { WizardStep } from '../../../wizard/model'; + +import * as utils from '../service/utility'; +import { getSplitSchema } from '../../../wizard/reducer'; + +export interface ConfigurationState { + configuration: fromConfiguration.State; +} + +export const reducers = { + configuration: fromConfiguration.reducer +}; + +export interface State extends fromRoot.State { + 'metadata-configuration': ConfigurationState; +} + +export const getState = createFeatureSelector('metadata-configuration'); + +export const getConfigurationStateFn = (state: ConfigurationState) => state.configuration; + +export const getConfigurationState = createSelector(getState, getConfigurationStateFn); +export const getConfigurationModel = createSelector(getConfigurationState, fromConfiguration.getModel); +export const getConfigurationDefinition = createSelector(getConfigurationState, fromConfiguration.getDefinition); +export const getConfigurationSchema = createSelector(getConfigurationState, fromConfiguration.getSchema); + +export const mergedSchema = createSelector(getConfigurationSchema, schema => !schema ? null : Object.keys(schema).reduce((coll, key) => ({ + ...merge(coll, schema[key]) +}), {} as any)); + +export const getConfigurationSectionsFn = (model, definition, schema) => !definition || !schema ? null : + definition.steps + .filter(step => step.id !== 'summary') + .map( + (step: WizardStep, num: number) => { + return ({ + id: step.id, + pageNumber: num + 1, + index: step.index, + label: step.label, + properties: utils.getStepProperties( + getSplitSchema(schema, step), + definition.formatter(model), + schema.definitions || {} + ) + }); + } + ); + +export const getConfigurationColumnsFn = sections => !sections ? null : + sections.reduce((resultArray, item, index) => { + const chunkIndex = Math.floor(index / Math.round(this.sections.length / 2)); + + if (!resultArray[chunkIndex]) { + resultArray[chunkIndex] = []; + } + + resultArray[chunkIndex].push(item); + + return resultArray; + }, []); + +export const getConfigurationSections = createSelector( + getConfigurationModel, + getConfigurationDefinition, + mergedSchema, + getConfigurationSectionsFn +); + +export const getConfigurationColumns = createSelector(getConfigurationSections, getConfigurationColumnsFn); diff --git a/ui/src/app/metadata/configuration/service/configuration.service.ts b/ui/src/app/metadata/configuration/service/configuration.service.ts new file mode 100644 index 000000000..9ea95a79a --- /dev/null +++ b/ui/src/app/metadata/configuration/service/configuration.service.ts @@ -0,0 +1,35 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { Observable, of } from 'rxjs'; +import { Metadata } from '../../domain/domain.type'; +import { Wizard } from '../../../wizard/model'; +import { MetadataSourceEditor } from '../../domain/model/wizards/metadata-source-editor'; +import { MetadataProviderEditorTypes } from '../../provider/model'; + +export enum PATHS { + resolver = 'EntityDescriptor', + provider = 'MetadataResolvers' +} + +export const DEFINITIONS = { + resolver: MetadataSourceEditor +}; + +@Injectable() +export class MetadataConfigurationService { + + readonly base = '/api'; + + constructor( + private http: HttpClient + ) {} + + find(id: string, type: string): Observable { + return this.http.get(`${this.base}/${PATHS[type]}/${id}`); + } + + getDefinition(model: Metadata): Wizard { + return MetadataProviderEditorTypes.find(def => def.type === model['@type']) || new MetadataSourceEditor(); + } +} + diff --git a/ui/src/app/metadata/configuration/service/utility.ts b/ui/src/app/metadata/configuration/service/utility.ts new file mode 100644 index 000000000..ee329c3b1 --- /dev/null +++ b/ui/src/app/metadata/configuration/service/utility.ts @@ -0,0 +1,40 @@ +import { Property } from '../../domain/model/property'; + +export function getDefinition(path: string, definitions: any): any { + let def = path.split('/').pop(); + return definitions[def]; +} +export function getPropertyItemSchema(items: any, definitions: any): any { + if (!items) { return null; } + return items.$ref ? getDefinition(items.$ref, definitions) : items; +} + +export function getStepProperty(property, model, definitions): Property { + if (!property) { return null; } + property = property.$ref ? { ...property, ...getDefinition(property.$ref, definitions) } : property; + return { + name: property.title, + value: model, + type: property.type, + items: getPropertyItemSchema(property.items, definitions), + properties: getStepProperties( + property, + model, + definitions + ), + widget: property.widget instanceof String ? { id: property.widget } : { ...property.widget } + }; +} + +export function getStepProperties(schema: any, model: any, definitions: any = {}): Property[] { + if (!schema || !schema.properties) { return []; } + return Object + .keys(schema.properties) + .map(property => { + return getStepProperty( + schema.properties[property], + model && model.hasOwnProperty(property) ? model[property] : null, + definitions + ); + }); +} diff --git a/ui/src/app/metadata/domain/model/wizards/metadata-source-editor.ts b/ui/src/app/metadata/domain/model/wizards/metadata-source-editor.ts index cbe98d5de..2c5c66a59 100644 --- a/ui/src/app/metadata/domain/model/wizards/metadata-source-editor.ts +++ b/ui/src/app/metadata/domain/model/wizards/metadata-source-editor.ts @@ -2,7 +2,7 @@ import { Wizard, WizardStep } from '../../../../wizard/model'; import { MetadataResolver } from '../metadata-resolver'; import { MetadataSourceBase } from './metadata-source-base'; -export class MetadataSourceEditor extends MetadataSourceBase implements Wizard { +export class MetadataSourceEditor extends MetadataSourceBase implements Wizard { steps: WizardStep[] = [ { index: 1, diff --git a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.html b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.html index e2136c4a1..e9aea1c2b 100644 --- a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.html +++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.html @@ -24,7 +24,7 @@ [isOpen]="(entitiesOpen$ | async)[resolver.getId()]" (select)="edit(resolver)" (toggle)="toggleEntity(resolver)" - (preview)="openPreviewDialog(resolver)" + (preview)="viewConfiguration(resolver)" (delete)="deleteResolver(resolver)" (history)="viewMetadataHistory(resolver)" [allowDelete]="resolver.isDraft()"> diff --git a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts index 540d5b694..0c20310c7 100644 --- a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts +++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts @@ -86,8 +86,8 @@ export class DashboardResolversListComponent implements OnInit { this.store.dispatch(new ToggleEntityDisplay(entity.getId())); } - openPreviewDialog(entity: MetadataEntity): void { - this.store.dispatch(new PreviewEntity({ id: entity.getId(), entity })); + viewConfiguration(entity: MetadataEntity): void { + this.router.navigate(['metadata', 'resolver', entity.getId(), 'configuration']); } viewMetadataHistory(entity: MetadataEntity): void { diff --git a/ui/src/app/metadata/metadata.module.ts b/ui/src/app/metadata/metadata.module.ts index 80f663b2a..231f39f5f 100644 --- a/ui/src/app/metadata/metadata.module.ts +++ b/ui/src/app/metadata/metadata.module.ts @@ -12,7 +12,7 @@ import { CustomWidgetRegistry } from '../schema-form/registry'; import { WidgetRegistry, SchemaValidatorFactory } from 'ngx-schema-form'; import { CustomSchemaValidatorFactory } from '../schema-form/service/schema-validator'; import { MetadataVersionModule } from './version/version.module'; - +import { MetadataConfigurationModule } from './configuration/configuration.module'; @NgModule({ imports: [ @@ -22,6 +22,7 @@ import { MetadataVersionModule } from './version/version.module'; ManagerModule.forRoot(), ProviderModule.forRoot(), MetadataVersionModule.forRoot(), + MetadataConfigurationModule.forRoot(), MetadataRoutingModule, I18nModule ], diff --git a/ui/src/app/metadata/metadata.routing.ts b/ui/src/app/metadata/metadata.routing.ts index a1d8964f2..35902415c 100644 --- a/ui/src/app/metadata/metadata.routing.ts +++ b/ui/src/app/metadata/metadata.routing.ts @@ -6,6 +6,7 @@ import { ResolverRoutes } from './resolver/resolver.routing'; import { ProviderRoutes } from './provider/provider.routing'; import { ManagerRoutes } from './manager/manager.routing'; import { VersionRoutes } from './version/version.routing'; +import { ConfigurationRoutes } from './configuration/configuration.routing'; const routes: Routes = [ { @@ -15,7 +16,8 @@ const routes: Routes = [ ...ManagerRoutes, ...ResolverRoutes, ...ProviderRoutes, - ...VersionRoutes + ...VersionRoutes, + ...ConfigurationRoutes ], }, ]; From a8e82ba8c603d1fc76d45cf0f4da82ecb461c051 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Wed, 29 May 2019 16:46:17 -0400 Subject: [PATCH 017/112] SHIBUI-1262 [1307 WIP] --- .../AbstractElementExtensibleXMLObject.java | 2 + .../admin/ui/domain/EncryptionMethod.java | 2 + .../shibboleth/admin/ui/domain/Endpoint.java | 4 +- .../admin/ui/domain/EntityDescriptor.java | 13 +---- .../admin/ui/domain/Extensions.java | 2 + .../admin/ui/domain/KeyDescriptor.java | 2 + .../shibboleth/admin/ui/domain/KeyInfo.java | 2 + .../admin/ui/domain/LocalizedName.java | 3 ++ .../admin/ui/domain/Organization.java | 2 + .../ui/domain/OrganizationDisplayName.java | 2 + .../admin/ui/domain/OrganizationName.java | 2 + .../admin/ui/domain/OrganizationURL.java | 2 + .../admin/ui/domain/RoleDescriptor.java | 2 + ...tityDescriptorEnversVersioningTests.groovy | 50 +++++++++++++++++-- 14 files changed, 73 insertions(+), 17 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractElementExtensibleXMLObject.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractElementExtensibleXMLObject.java index d406e8256..03a91e284 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractElementExtensibleXMLObject.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractElementExtensibleXMLObject.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.ElementExtensibleXMLObject; import org.opensaml.core.xml.XMLObject; @@ -20,6 +21,7 @@ @Entity @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) @EqualsAndHashCode(callSuper = true) +@Audited public abstract class AbstractElementExtensibleXMLObject extends AbstractXMLObject implements ElementExtensibleXMLObject { @OneToMany(cascade = CascadeType.ALL) @OrderColumn diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EncryptionMethod.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EncryptionMethod.java index 688dea31d..06a47da63 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EncryptionMethod.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EncryptionMethod.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.xmlsec.encryption.KeySize; import org.opensaml.xmlsec.encryption.OAEPparams; @@ -10,6 +11,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class EncryptionMethod extends AbstractElementExtensibleXMLObject implements org.opensaml.saml.saml2.metadata.EncryptionMethod { private String algorithm; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Endpoint.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Endpoint.java index 97094187a..2699895a0 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Endpoint.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Endpoint.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.XMLObject; import javax.annotation.Nonnull; @@ -14,6 +15,7 @@ */ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class Endpoint extends AbstractAttributeExtensibleXMLObject implements org.opensaml.saml.saml2.metadata.Endpoint { private String binding; @@ -72,4 +74,4 @@ public List getUnknownXMLObjects() { public List getUnknownXMLObjects(@Nonnull QName qName) { return null; //TODO } -} \ No newline at end of file +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java index c9b7d207d..b2054d362 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java @@ -2,30 +2,21 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.Lists; - import lombok.EqualsAndHashCode; -import org.hibernate.envers.AuditOverride; import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; -import org.opensaml.core.config.ConfigurationService; import org.opensaml.core.xml.XMLObject; -import org.opensaml.core.xml.config.XMLObjectProviderRegistry; -import org.opensaml.core.xml.io.MarshallingException; import org.springframework.util.StringUtils; -import org.w3c.dom.Element; import javax.annotation.Nullable; - -import javax.persistence.JoinColumn; import javax.persistence.CascadeType; import javax.persistence.Entity; +import javax.persistence.JoinColumn; import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.OrderColumn; import javax.persistence.Transient; - import javax.xml.namespace.QName; - import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -49,7 +40,6 @@ public class EntityDescriptor extends AbstractDescriptor implements org.opensaml private String resourceId; @OneToOne(cascade = CascadeType.ALL) - @NotAudited private Organization organization; @OneToMany(cascade = CascadeType.ALL) @@ -58,7 +48,6 @@ public class EntityDescriptor extends AbstractDescriptor implements org.opensaml @OneToMany(cascade = CascadeType.ALL) @OrderColumn - @NotAudited private List roleDescriptors; @OneToMany(cascade = CascadeType.ALL) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Extensions.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Extensions.java index c1538f463..01dcf4aa8 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Extensions.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Extensions.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.XMLObject; import javax.annotation.Nullable; @@ -13,6 +14,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class Extensions extends AbstractElementExtensibleXMLObject implements org.opensaml.saml.saml2.metadata.Extensions { @Nullable @Override diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/KeyDescriptor.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/KeyDescriptor.java index 74ddbaa2c..2b07eea4c 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/KeyDescriptor.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/KeyDescriptor.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.XMLObject; import org.opensaml.security.credential.UsageType; import org.opensaml.xmlsec.signature.KeyInfo; @@ -12,6 +13,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class KeyDescriptor extends AbstractXMLObject implements org.opensaml.saml.saml2.metadata.KeyDescriptor { @Column(name = "keyDescriptorName") diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/KeyInfo.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/KeyInfo.java index 7ea604d17..7497e5837 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/KeyInfo.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/KeyInfo.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.XMLObject; import org.opensaml.xmlsec.encryption.AgreementMethod; import org.opensaml.xmlsec.encryption.EncryptedKey; @@ -29,6 +30,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class KeyInfo extends AbstractXMLObject implements org.opensaml.xmlsec.signature.KeyInfo { @OneToMany(cascade = CascadeType.ALL) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/LocalizedName.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/LocalizedName.java index 2aa493293..e0a54d494 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/LocalizedName.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/LocalizedName.java @@ -1,9 +1,12 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; +import org.hibernate.envers.Audited; + import javax.annotation.Nullable; import javax.persistence.MappedSuperclass; @MappedSuperclass +@Audited public class LocalizedName extends AbstractXMLObject implements org.opensaml.saml.saml2.metadata.LocalizedName { private String xMLLang; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Organization.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Organization.java index 1e11b499e..7ea76b1f0 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Organization.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Organization.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.XMLObject; import javax.annotation.Nullable; @@ -11,6 +12,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class Organization extends AbstractAttributeExtensibleXMLObject implements org.opensaml.saml.saml2.metadata.Organization { @OneToOne(cascade = CascadeType.ALL) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationDisplayName.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationDisplayName.java index 8d473aa82..971217fd8 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationDisplayName.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationDisplayName.java @@ -1,11 +1,13 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class OrganizationDisplayName extends LocalizedName implements org.opensaml.saml.saml2.metadata.OrganizationDisplayName { } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationName.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationName.java index edc9317c1..5af2408b9 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationName.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationName.java @@ -1,11 +1,13 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class OrganizationName extends LocalizedName implements org.opensaml.saml.saml2.metadata.OrganizationName { } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationURL.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationURL.java index 6af0d7318..1cf739ece 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationURL.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationURL.java @@ -1,12 +1,14 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.annotation.Nullable; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class OrganizationURL extends AbstractXMLObject implements org.opensaml.saml.saml2.metadata.OrganizationURL { private String xMLLang; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RoleDescriptor.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RoleDescriptor.java index fc235c110..b5bc78bc6 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RoleDescriptor.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RoleDescriptor.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.XMLObject; import org.opensaml.core.xml.util.AttributeMap; @@ -25,6 +26,7 @@ @Entity @EqualsAndHashCode(callSuper = true, exclude={"unknownAttributes"}) +@Audited public class RoleDescriptor extends AbstractDescriptor implements org.opensaml.saml.saml2.metadata.RoleDescriptor { @ElementCollection diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 7ef59d0c7..89de05a5e 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -7,6 +7,7 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.OrganizationRepresentation 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.service.EntityDescriptorService @@ -16,7 +17,6 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest import org.springframework.data.jpa.repository.config.EnableJpaRepositories import org.springframework.test.context.ContextConfiguration import org.springframework.transaction.PlatformTransactionManager -import spock.lang.Shared import spock.lang.Specification import javax.persistence.EntityManager @@ -49,11 +49,9 @@ class EntityDescriptorEnversVersioningTests extends Specification { @Autowired OpenSamlObjects openSamlObjects - @Shared - EntityDescriptor ed = new EntityDescriptor() - def "test versioning with contact persons"() { when: + def ed = new EntityDescriptor() def representation = new EntityDescriptorRepresentation().with { it.contacts = [new ContactRepresentation(type: 'administrative', name: 'name', emailAddress: 'test@test')] it @@ -116,4 +114,48 @@ class EntityDescriptorEnversVersioningTests extends Specification { entityDescriptorHistory[0][1].timestamp > 0L } + + def "test versioning with organization"() { + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.organization = new OrganizationRepresentation(name: 'org', displayName: 'display org', url: 'http://org.edu') + it + } + def entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + then: + entityDescriptorHistory.size() == 1 + entityDescriptorHistory[0][0].organization.organizationNames[0].value == 'org' + entityDescriptorHistory[0][0].organization.displayNames[0].value == 'display org' + entityDescriptorHistory[0][0].organization.URLs[0].value == 'http://org.edu' + entityDescriptorHistory[0][1].principalUserName == 'anonymous' + entityDescriptorHistory[0][1].timestamp > 0L + + when: + representation = new EntityDescriptorRepresentation().with { + it.organization = new OrganizationRepresentation(name: 'orgUpdated', displayName: 'display org Updated', url: 'http://org2.edu') + it + } + entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + then: + entityDescriptorHistory.size() == 2 + entityDescriptorHistory[1][0].organization.organizationNames[0].value == 'orgUpdated' + entityDescriptorHistory[1][0].organization.displayNames[0].value == 'display org Updated' + entityDescriptorHistory[1][0].organization.URLs[0].value == 'http://org2.edu' + entityDescriptorHistory[1][1].principalUserName == 'anonymous' + entityDescriptorHistory[1][1].timestamp > 0L + + //Check the original revision is intact + entityDescriptorHistory[0][0].organization.organizationNames[0].value == 'org' + entityDescriptorHistory[0][0].organization.displayNames[0].value == 'display org' + entityDescriptorHistory[0][0].organization.URLs[0].value == 'http://org.edu' + entityDescriptorHistory[0][1].principalUserName == 'anonymous' + entityDescriptorHistory[0][1].timestamp > 0L + } } From 714a7daa04377457cad85ca56ebe756fb0db743a Mon Sep 17 00:00:00 2001 From: Jj! Date: Thu, 30 May 2019 09:11:32 -0500 Subject: [PATCH 018/112] [SHIBUI-1253] fix property condition include writing of metadata providers --- .../ui/scheduled/EntityDescriptorFilesScheduledTasks.java | 2 +- .../admin/ui/scheduled/MetadataProvidersScheduledTasks.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/scheduled/EntityDescriptorFilesScheduledTasks.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/scheduled/EntityDescriptorFilesScheduledTasks.java index e6cb670f2..35f819165 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/scheduled/EntityDescriptorFilesScheduledTasks.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/scheduled/EntityDescriptorFilesScheduledTasks.java @@ -35,7 +35,7 @@ * @since 1.0 */ @Configuration -@ConditionalOnProperty(name = "shibui-metadata-dir") +@ConditionalOnProperty(name = "shibui.metadata-dir") public class EntityDescriptorFilesScheduledTasks { private static final Logger LOGGER = LoggerFactory.getLogger(EntityDescriptorFilesScheduledTasks.class); diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/scheduled/MetadataProvidersScheduledTasks.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/scheduled/MetadataProvidersScheduledTasks.java index 1f6ce7e69..a58b0df24 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/scheduled/MetadataProvidersScheduledTasks.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/scheduled/MetadataProvidersScheduledTasks.java @@ -19,6 +19,7 @@ import javax.xml.transform.stream.StreamResult; import java.io.IOException; import java.io.OutputStream; +import java.io.StringWriter; @Configuration @ConditionalOnProperty("shibui.metadataProviders.target") @@ -38,13 +39,14 @@ public MetadataProvidersScheduledTasks(Resource target, MetadataResolverService @Scheduled(fixedRateString = "${shibui.metadataProviders.taskRunRate:30000}") @Transactional(readOnly = true) public void generateMetadataProvidersFile() { - try (OutputStream os = ((WritableResource)target).getOutputStream()) { + try (StringWriter os = 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(os)); + this.fileWritingService.write((WritableResource)this.target, os.toString()); } catch (IOException | TransformerException e) { logger.error(e.getLocalizedMessage(), e); } From d8b98d6f682e7d548d61ba24a560e980d46f6812 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Thu, 30 May 2019 11:34:44 -0400 Subject: [PATCH 019/112] SHIBUI-1262 [1307 WIP] --- .../admin/ui/domain/AbstractDescriptor.java | 2 + .../ui/domain/ArtifactResolutionService.java | 2 + .../ui/domain/AssertionConsumerService.java | 2 + .../shibboleth/admin/ui/domain/Attribute.java | 2 + .../ui/domain/AttributeConsumingService.java | 2 + .../admin/ui/domain/IndexedEndpoint.java | 2 + .../admin/ui/domain/ManageNameIDService.java | 2 + .../admin/ui/domain/NameIDFormat.java | 2 + .../admin/ui/domain/RequestedAttribute.java | 2 + .../admin/ui/domain/SPSSODescriptor.java | 2 + .../admin/ui/domain/SSODescriptor.java | 2 + .../admin/ui/domain/ServiceDescription.java | 2 + .../admin/ui/domain/ServiceName.java | 2 + .../admin/ui/domain/SingleLogoutService.java | 2 + ...tityDescriptorEnversVersioningTests.groovy | 62 +++++++++++++++++++ .../envers/EnversTestsSupport.groovy | 7 ++- 16 files changed, 96 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractDescriptor.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractDescriptor.java index 1f6075f24..449cda701 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractDescriptor.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractDescriptor.java @@ -2,6 +2,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.Type; +import org.hibernate.envers.Audited; import org.joda.time.DateTime; import org.opensaml.core.xml.XMLObject; import org.opensaml.saml.saml2.common.CacheableSAMLObject; @@ -18,6 +19,7 @@ @MappedSuperclass @EqualsAndHashCode(callSuper = true) +@Audited public abstract class AbstractDescriptor extends AbstractAttributeExtensibleXMLObject implements CacheableSAMLObject, TimeBoundSAMLObject, SignableXMLObject { private Long cacheDuration; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ArtifactResolutionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ArtifactResolutionService.java index 0d82f8a0d..1231299a7 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ArtifactResolutionService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ArtifactResolutionService.java @@ -1,11 +1,13 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class ArtifactResolutionService extends IndexedEndpoint implements org.opensaml.saml.saml2.metadata.ArtifactResolutionService { } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AssertionConsumerService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AssertionConsumerService.java index a89045075..f63a76fcd 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AssertionConsumerService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AssertionConsumerService.java @@ -1,11 +1,13 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class AssertionConsumerService extends IndexedEndpoint implements org.opensaml.saml.saml2.metadata.AssertionConsumerService { } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Attribute.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Attribute.java index 45e1500e9..7a187bd99 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Attribute.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Attribute.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.XMLObject; import javax.annotation.Nullable; @@ -15,6 +16,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class Attribute extends AbstractAttributeExtensibleXMLObject implements org.opensaml.saml.saml2.core.Attribute { private String name; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AttributeConsumingService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AttributeConsumingService.java index 5080c1fc0..a1dba47fa 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AttributeConsumingService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AttributeConsumingService.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.schema.XSBooleanValue; import javax.persistence.CascadeType; @@ -14,6 +15,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class AttributeConsumingService extends AbstractXMLObject implements org.opensaml.saml.saml2.metadata.AttributeConsumingService { private int acsIndex; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/IndexedEndpoint.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/IndexedEndpoint.java index e8d8f1551..cc0fdd6d5 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/IndexedEndpoint.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/IndexedEndpoint.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.schema.XSBooleanValue; import javax.persistence.Entity; @@ -8,6 +9,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class IndexedEndpoint extends Endpoint implements org.opensaml.saml.saml2.metadata.IndexedEndpoint { private Integer endpointIndex; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ManageNameIDService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ManageNameIDService.java index ec43780d3..70924db96 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ManageNameIDService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ManageNameIDService.java @@ -1,11 +1,13 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class ManageNameIDService extends Endpoint implements org.opensaml.saml.saml2.metadata.ManageNameIDService { } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/NameIDFormat.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/NameIDFormat.java index 4e63ff301..148ec91e7 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/NameIDFormat.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/NameIDFormat.java @@ -1,11 +1,13 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class NameIDFormat extends AbstractXMLObject implements org.opensaml.saml.saml2.metadata.NameIDFormat { private String format; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RequestedAttribute.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RequestedAttribute.java index a7860e931..17c932ed2 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RequestedAttribute.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RequestedAttribute.java @@ -1,12 +1,14 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.schema.XSBooleanValue; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class RequestedAttribute extends Attribute implements org.opensaml.saml.saml2.metadata.RequestedAttribute { private boolean isRequired; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/SPSSODescriptor.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/SPSSODescriptor.java index 379c2c928..e90542c5a 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/SPSSODescriptor.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/SPSSODescriptor.java @@ -2,6 +2,7 @@ import com.google.common.collect.Lists; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.XMLObject; import org.opensaml.core.xml.schema.XSBooleanValue; @@ -14,6 +15,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class SPSSODescriptor extends SSODescriptor implements org.opensaml.saml.saml2.metadata.SPSSODescriptor { private Boolean isAuthnRequestsSigned; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/SSODescriptor.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/SSODescriptor.java index 1f34fc931..4e885581d 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/SSODescriptor.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/SSODescriptor.java @@ -2,6 +2,7 @@ import com.google.common.collect.Lists; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.XMLObject; import javax.annotation.Nullable; @@ -17,6 +18,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class SSODescriptor extends RoleDescriptor implements org.opensaml.saml.saml2.metadata.SSODescriptor { @OneToMany(cascade = CascadeType.ALL) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ServiceDescription.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ServiceDescription.java index 4c3a54511..9fda942ae 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ServiceDescription.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ServiceDescription.java @@ -1,11 +1,13 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class ServiceDescription extends LocalizedName implements org.opensaml.saml.saml2.metadata.ServiceDescription { } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ServiceName.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ServiceName.java index b4047f0c8..7e23c2b67 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ServiceName.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ServiceName.java @@ -1,11 +1,13 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class ServiceName extends LocalizedName implements org.opensaml.saml.saml2.metadata.ServiceName { } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/SingleLogoutService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/SingleLogoutService.java index 67967676e..ca9aa095c 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/SingleLogoutService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/SingleLogoutService.java @@ -1,11 +1,13 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class SingleLogoutService extends Endpoint implements org.opensaml.saml.saml2.metadata.SingleLogoutService { } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 89de05a5e..f0f02421d 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -8,6 +8,7 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.OrganizationRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ServiceProviderSsoDescriptorRepresentation 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.service.EntityDescriptorService @@ -20,6 +21,7 @@ import org.springframework.transaction.PlatformTransactionManager import spock.lang.Specification import javax.persistence.EntityManager +import java.time.LocalDateTime import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistory import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE @@ -158,4 +160,64 @@ class EntityDescriptorEnversVersioningTests extends Specification { entityDescriptorHistory[0][1].principalUserName == 'anonymous' entityDescriptorHistory[0][1].timestamp > 0L } + + def "test versioning with sp sso descriptor"() { + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.serviceProviderSsoDescriptor = new ServiceProviderSsoDescriptorRepresentation().with { + it.protocolSupportEnum = 'SAML 1.1' + it.nameIdFormats = ['format'] + it + } + it + } + def entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + then: + entityDescriptorHistory.size() == 1 + entityDescriptorHistory[0][0].roleDescriptors[0].nameIDFormats[0].format == 'format' + entityDescriptorHistory[0][0].roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' + entityDescriptorHistory[0][0].roleDescriptors[0].supportedProtocols[1] == null + entityDescriptorHistory[0][1].principalUserName == 'anonymous' + entityDescriptorHistory[0][1].timestamp > 0L + + when: + representation = new EntityDescriptorRepresentation().with { + it.serviceProviderSsoDescriptor = new ServiceProviderSsoDescriptorRepresentation().with { + it.protocolSupportEnum = 'SAML 1.1, SAML 2' + it.nameIdFormats = ['formatUPDATED'] + it + } + it + } + + //Currently this is the ONLY way to let envers recognize update revision type for EntityDescriptor type + //when modifying SPSSODescriptor inside RoleDescriptors collection. This date "touch" would need to be encapsulated + //perhaps in JPAEntityDescriptorServiceImpl#buildDescriptorFromRepresentation + ed.modifiedDate = LocalDateTime.now() + + entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + then: + entityDescriptorHistory.size() == 2 + entityDescriptorHistory[1][0].roleDescriptors[0].nameIDFormats[0].format == 'formatUPDATED' + entityDescriptorHistory[1][0].roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' + entityDescriptorHistory[1][0].roleDescriptors[0].supportedProtocols[1] == 'urn:oasis:names:tc:SAML:2.0:protocol' + entityDescriptorHistory[1][1].principalUserName == 'anonymous' + entityDescriptorHistory[1][1].timestamp > 0L + + //Check the original revision is intact + entityDescriptorHistory[0][0].roleDescriptors[0].nameIDFormats[0].format == 'format' + entityDescriptorHistory[0][0].roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' + entityDescriptorHistory[0][0].roleDescriptors[0].supportedProtocols[1] == null + entityDescriptorHistory[0][1].principalUserName == 'anonymous' + entityDescriptorHistory[0][1].timestamp > 0L + } } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy index 93fc12c1f..d06e8ecbb 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.repository.envers 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.repository.EntityDescriptorRepository import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService import org.hibernate.envers.AuditReaderFactory @@ -25,7 +26,7 @@ class EnversTestsSupport { entity } - static updateAndGetRevisionHistory(ed, representation, + static updateAndGetRevisionHistory(EntityDescriptor ed, EntityDescriptorRepresentation representation, EntityDescriptorService eds, EntityDescriptorRepository edr, PlatformTransactionManager txMgr, @@ -34,6 +35,10 @@ class EnversTestsSupport { doInExplicitTransaction(txMgr) { edr.save(ed) } + + //For temp debugging. Remove when done! + //def updated = edr.findByResourceId(ed.resourceId) + getRevisionHistory(em) } From e2513ceeda8cf8544c1be2dda79bfe1a89e574b1 Mon Sep 17 00:00:00 2001 From: Jj! Date: Thu, 30 May 2019 15:08:12 -0500 Subject: [PATCH 020/112] [RELEASE] v1.5.2 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 01ee65808..4905012c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=1.6.0-SNAPSHOT +version=1.5.2 shibboleth.version=3.4.0 opensaml.version=3.4.0 From 14b2f1965dc44acffa635290201ca1327e729278 Mon Sep 17 00:00:00 2001 From: Jj! Date: Thu, 30 May 2019 15:18:51 -0500 Subject: [PATCH 021/112] preparing for further development --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4905012c7..01ee65808 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=1.5.2 +version=1.6.0-SNAPSHOT shibboleth.version=3.4.0 opensaml.version=3.4.0 From 15b2e078bb96c634d4b91558a1256d1dd6303f2c Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Fri, 31 May 2019 10:01:14 -0400 Subject: [PATCH 022/112] SHIBUI-1262 [1307] --- .../ui/domain/AbstractLangBearingURL.java | 2 + .../admin/ui/domain/Description.java | 2 + .../admin/ui/domain/DisplayName.java | 2 + .../admin/ui/domain/InformationURL.java | 2 + .../tier/shibboleth/admin/ui/domain/Logo.java | 2 + .../admin/ui/domain/PrivacyStatementURL.java | 2 + .../shibboleth/admin/ui/domain/UIInfo.java | 2 + .../shibboleth/admin/ui/domain/XSURI.java | 2 + ...tityDescriptorEnversVersioningTests.groovy | 86 +++++++++++++++++++ 9 files changed, 102 insertions(+) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractLangBearingURL.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractLangBearingURL.java index 7f66a06c6..96fb81a69 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractLangBearingURL.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractLangBearingURL.java @@ -1,5 +1,6 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; +import org.hibernate.envers.Audited; import org.opensaml.saml.saml2.metadata.LocalizedURI; import javax.annotation.Nullable; @@ -10,6 +11,7 @@ @Entity @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) +@Audited abstract class AbstractLangBearingURL extends XSURI implements LocalizedURI { @Column(name = "informationUrlXmlLang") private String xmlLang; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Description.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Description.java index 81b66542d..db994740a 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Description.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Description.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.annotation.Nullable; import javax.persistence.Column; @@ -8,6 +9,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class Description extends AbstractXMLObject implements org.opensaml.saml.ext.saml2mdui.Description { @Column(name = "descriptionXMLLang") diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/DisplayName.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/DisplayName.java index 564b0b0f6..5ee4815d9 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/DisplayName.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/DisplayName.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.annotation.Nullable; import javax.persistence.Column; @@ -8,6 +9,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class DisplayName extends AbstractXMLObject implements org.opensaml.saml.ext.saml2mdui.DisplayName { @Column(name = "displayNameXMLLan") diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/InformationURL.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/InformationURL.java index 45d5477d1..e960e8463 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/InformationURL.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/InformationURL.java @@ -1,10 +1,12 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class InformationURL extends AbstractLangBearingURL implements org.opensaml.saml.ext.saml2mdui.InformationURL { } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Logo.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Logo.java index b9173bb22..13453438a 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Logo.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Logo.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.annotation.Nullable; import javax.persistence.Column; @@ -8,6 +9,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class Logo extends AbstractXMLObject implements org.opensaml.saml.ext.saml2mdui.Logo { @Column(name = "logUrl") private String url; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/PrivacyStatementURL.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/PrivacyStatementURL.java index a6d792d80..a98f5a7ad 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/PrivacyStatementURL.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/PrivacyStatementURL.java @@ -1,10 +1,12 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class PrivacyStatementURL extends AbstractLangBearingURL implements org.opensaml.saml.ext.saml2mdui.PrivacyStatementURL { } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/UIInfo.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/UIInfo.java index f7912aa65..241eebfac 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/UIInfo.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/UIInfo.java @@ -3,6 +3,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.CascadeType; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.XMLObject; import org.opensaml.saml.ext.saml2mdui.Description; import org.opensaml.saml.ext.saml2mdui.DisplayName; @@ -22,6 +23,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class UIInfo extends AbstractXMLObject implements org.opensaml.saml.ext.saml2mdui.UIInfo { @OneToMany @Cascade(CascadeType.ALL) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSURI.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSURI.java index 2780c5472..8663bf818 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSURI.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSURI.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.annotation.Nullable; import javax.persistence.Column; @@ -8,6 +9,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class XSURI extends AbstractXMLObject implements org.opensaml.core.xml.schema.XSURI { @Column(name = "xsuriValue") private String value; diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index f0f02421d..8a35bb7d5 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -5,8 +5,10 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.Internationalization import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.UIInfo import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.MduiRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.OrganizationRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ServiceProviderSsoDescriptorRepresentation import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects @@ -16,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.domain.EntityScan import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest import org.springframework.data.jpa.repository.config.EnableJpaRepositories +import org.springframework.test.annotation.DirtiesContext import org.springframework.test.context.ContextConfiguration import org.springframework.transaction.PlatformTransactionManager import spock.lang.Specification @@ -26,6 +29,8 @@ import java.time.LocalDateTime import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistory import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHER +import static org.springframework.test.annotation.DirtiesContext.MethodMode.AFTER_METHOD +import static org.springframework.test.annotation.DirtiesContext.MethodMode.BEFORE_METHOD /** * Testing entity descriptor envers versioning @@ -51,6 +56,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { @Autowired OpenSamlObjects openSamlObjects + @DirtiesContext def "test versioning with contact persons"() { when: def ed = new EntityDescriptor() @@ -117,6 +123,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { } + @DirtiesContext def "test versioning with organization"() { when: EntityDescriptor ed = new EntityDescriptor() @@ -161,6 +168,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { entityDescriptorHistory[0][1].timestamp > 0L } + @DirtiesContext def "test versioning with sp sso descriptor"() { when: EntityDescriptor ed = new EntityDescriptor() @@ -220,4 +228,82 @@ class EntityDescriptorEnversVersioningTests extends Specification { entityDescriptorHistory[0][1].principalUserName == 'anonymous' entityDescriptorHistory[0][1].timestamp > 0L } + @DirtiesContext + def "test versioning with uiInfo"() { + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.mdui = new MduiRepresentation().with { + it.displayName = 'Initial display name' + it.informationUrl = 'http://info' + it.privacyStatementUrl = 'http://privacy' + it.description = 'Initial desc' + it.logoUrl = 'http://logo' + it.logoHeight = 20 + it.logoWidth = 30 + it + } + it + } + def entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + //Groovy FTW - able to call any private methods on ANY object. Get first revision + UIInfo uiinfo = entityDescriptorService.getUIInfo(entityDescriptorHistory[0][0]) + + then: + entityDescriptorHistory.size() == 1 + uiinfo.displayNames[0].value == 'Initial display name' + uiinfo.informationURLs[0].value == 'http://info' + uiinfo.privacyStatementURLs[0].value == 'http://privacy' + uiinfo.descriptions[0].value == 'Initial desc' + uiinfo.logos[0].URL == 'http://logo' + uiinfo.logos[0].height == 20 + uiinfo.logos[0].width == 30 + + when: + representation = new EntityDescriptorRepresentation().with { + it.mdui = new MduiRepresentation().with { + it.displayName = 'Display name UPDATED' + it.informationUrl = 'http://info.updated' + it.privacyStatementUrl = 'http://privacy.updated' + it.description = 'Desc UPDATED' + it.logoUrl = 'http://logo.updated' + it.logoHeight = 30 + it.logoWidth = 40 + it + } + it + } + entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + //Get second revision + uiinfo = entityDescriptorService.getUIInfo(entityDescriptorHistory[1][0]) + //And initial revision + def uiinfoInitialRevision = entityDescriptorService.getUIInfo(entityDescriptorHistory[0][0]) + + then: + entityDescriptorHistory.size() == 2 + uiinfo.displayNames[0].value == 'Display name UPDATED' + uiinfo.informationURLs[0].value == 'http://info.updated' + uiinfo.privacyStatementURLs[0].value == 'http://privacy.updated' + uiinfo.descriptions[0].value == 'Desc UPDATED' + uiinfo.logos[0].URL == 'http://logo.updated' + uiinfo.logos[0].height == 30 + uiinfo.logos[0].width == 40 + + //Check the initial revision is still intact + uiinfoInitialRevision.displayNames[0].value == 'Initial display name' + uiinfoInitialRevision.informationURLs[0].value == 'http://info' + uiinfoInitialRevision.privacyStatementURLs[0].value == 'http://privacy' + uiinfoInitialRevision.descriptions[0].value == 'Initial desc' + uiinfoInitialRevision.logos[0].URL == 'http://logo' + uiinfoInitialRevision.logos[0].height == 20 + uiinfoInitialRevision.logos[0].width == 30 + } } From aff8ccd0128f59f61f2bed708dfc8edcc176feab Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Fri, 31 May 2019 11:54:28 -0400 Subject: [PATCH 023/112] SHIBUI-1262 [1307 WIP] --- .../admin/ui/domain/X509Certificate.java | 2 + .../shibboleth/admin/ui/domain/X509Data.java | 2 + ...tityDescriptorEnversVersioningTests.groovy | 169 +++++++++++------- .../envers/EnversTestsSupport.groovy | 27 +-- 4 files changed, 124 insertions(+), 76 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Certificate.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Certificate.java index 2fe5ea571..b1db21b72 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Certificate.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Certificate.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.annotation.Nullable; import javax.persistence.Column; @@ -9,6 +10,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class X509Certificate extends AbstractXMLObject implements org.opensaml.xmlsec.signature.X509Certificate { @Column(name = "x509CertificateValue") @Lob diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Data.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Data.java index 46c58324a..e875932cd 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Data.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Data.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.XMLObject; import org.opensaml.xmlsec.signature.X509CRL; import org.opensaml.xmlsec.signature.X509Certificate; @@ -23,6 +24,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class X509Data extends AbstractXMLObject implements org.opensaml.xmlsec.signature.X509Data { @OneToMany(cascade = CascadeType.ALL) @OrderColumn diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 8a35bb7d5..786f5e0a2 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -5,11 +5,15 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.Internationalization import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.KeyDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.SPSSODescriptor import edu.internet2.tier.shibboleth.admin.ui.domain.UIInfo +import edu.internet2.tier.shibboleth.admin.ui.domain.X509Certificate import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.MduiRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.OrganizationRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.SecurityInfoRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ServiceProviderSsoDescriptorRepresentation import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository @@ -26,11 +30,11 @@ import spock.lang.Specification import javax.persistence.EntityManager import java.time.LocalDateTime -import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistory +import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex +import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex +import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHER -import static org.springframework.test.annotation.DirtiesContext.MethodMode.AFTER_METHOD -import static org.springframework.test.annotation.DirtiesContext.MethodMode.BEFORE_METHOD /** * Testing entity descriptor envers versioning @@ -64,43 +68,43 @@ class EntityDescriptorEnversVersioningTests extends Specification { it.contacts = [new ContactRepresentation(type: 'administrative', name: 'name', emailAddress: 'test@test')] it } - def entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, entityDescriptorService, + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) then: entityDescriptorHistory.size() == 1 - entityDescriptorHistory[0][0].contactPersons[0].givenName.name == 'name' - entityDescriptorHistory[0][0].contactPersons[0].type == ADMINISTRATIVE - entityDescriptorHistory[0][0].contactPersons[0].emailAddresses[0].address == 'test@test' - entityDescriptorHistory[0][1].principalUserName == 'anonymous' - entityDescriptorHistory[0][1].timestamp > 0L + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].givenName.name == 'name' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].type == ADMINISTRATIVE + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].emailAddresses[0].address == 'test@test' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L when: representation = new EntityDescriptorRepresentation().with { it.contacts = [new ContactRepresentation(type: 'administrative', name: 'nameUPDATED', emailAddress: 'test@test')] it } - entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, entityDescriptorService, + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) then: entityDescriptorHistory.size() == 2 - entityDescriptorHistory[1][0].contactPersons[0].givenName.name == 'nameUPDATED' - entityDescriptorHistory[1][0].contactPersons[0].type == ADMINISTRATIVE - entityDescriptorHistory[1][0].contactPersons[0].emailAddresses[0].address == 'test@test' - entityDescriptorHistory[1][1].principalUserName == 'anonymous' - entityDescriptorHistory[1][1].timestamp > 0L + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].type == ADMINISTRATIVE + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].emailAddresses[0].address == 'test@test' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L when: representation = new EntityDescriptorRepresentation().with { it.contacts = [new ContactRepresentation(type: 'other', name: 'nameUPDATED2', emailAddress: 'test@test.com')] it } - entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, @@ -108,18 +112,18 @@ class EntityDescriptorEnversVersioningTests extends Specification { then: entityDescriptorHistory.size() == 3 - entityDescriptorHistory[2][0].contactPersons[0].givenName.name == 'nameUPDATED2' - entityDescriptorHistory[2][0].contactPersons[0].type == OTHER - entityDescriptorHistory[2][0].contactPersons[0].emailAddresses[0].address == 'test@test.com' - entityDescriptorHistory[2][1].principalUserName == 'anonymous' - entityDescriptorHistory[2][1].timestamp > 0L + getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].givenName.name == 'nameUPDATED2' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].type == OTHER + getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].emailAddresses[0].address == 'test@test.com' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).timestamp > 0L //Also make sure we have our original revision - entityDescriptorHistory[0][0].contactPersons[0].givenName.name == 'name' - entityDescriptorHistory[0][0].contactPersons[0].type == ADMINISTRATIVE - entityDescriptorHistory[0][0].contactPersons[0].emailAddresses[0].address == 'test@test' - entityDescriptorHistory[0][1].principalUserName == 'anonymous' - entityDescriptorHistory[0][1].timestamp > 0L + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].type == ADMINISTRATIVE + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].emailAddresses[0].address == 'test@test' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L } @@ -131,41 +135,41 @@ class EntityDescriptorEnversVersioningTests extends Specification { it.organization = new OrganizationRepresentation(name: 'org', displayName: 'display org', url: 'http://org.edu') it } - def entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, entityDescriptorService, + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) then: entityDescriptorHistory.size() == 1 - entityDescriptorHistory[0][0].organization.organizationNames[0].value == 'org' - entityDescriptorHistory[0][0].organization.displayNames[0].value == 'display org' - entityDescriptorHistory[0][0].organization.URLs[0].value == 'http://org.edu' - entityDescriptorHistory[0][1].principalUserName == 'anonymous' - entityDescriptorHistory[0][1].timestamp > 0L + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.organizationNames[0].value == 'org' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.displayNames[0].value == 'display org' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.URLs[0].value == 'http://org.edu' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L when: representation = new EntityDescriptorRepresentation().with { it.organization = new OrganizationRepresentation(name: 'orgUpdated', displayName: 'display org Updated', url: 'http://org2.edu') it } - entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, entityDescriptorService, + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) then: entityDescriptorHistory.size() == 2 - entityDescriptorHistory[1][0].organization.organizationNames[0].value == 'orgUpdated' - entityDescriptorHistory[1][0].organization.displayNames[0].value == 'display org Updated' - entityDescriptorHistory[1][0].organization.URLs[0].value == 'http://org2.edu' - entityDescriptorHistory[1][1].principalUserName == 'anonymous' - entityDescriptorHistory[1][1].timestamp > 0L + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.organizationNames[0].value == 'orgUpdated' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.displayNames[0].value == 'display org Updated' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.URLs[0].value == 'http://org2.edu' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L //Check the original revision is intact - entityDescriptorHistory[0][0].organization.organizationNames[0].value == 'org' - entityDescriptorHistory[0][0].organization.displayNames[0].value == 'display org' - entityDescriptorHistory[0][0].organization.URLs[0].value == 'http://org.edu' - entityDescriptorHistory[0][1].principalUserName == 'anonymous' - entityDescriptorHistory[0][1].timestamp > 0L + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.organizationNames[0].value == 'org' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.displayNames[0].value == 'display org' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.URLs[0].value == 'http://org.edu' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L } @DirtiesContext @@ -180,18 +184,18 @@ class EntityDescriptorEnversVersioningTests extends Specification { } it } - def entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, entityDescriptorService, + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) then: entityDescriptorHistory.size() == 1 - entityDescriptorHistory[0][0].roleDescriptors[0].nameIDFormats[0].format == 'format' - entityDescriptorHistory[0][0].roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' - entityDescriptorHistory[0][0].roleDescriptors[0].supportedProtocols[1] == null - entityDescriptorHistory[0][1].principalUserName == 'anonymous' - entityDescriptorHistory[0][1].timestamp > 0L + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].nameIDFormats[0].format == 'format' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[1] == null + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L when: representation = new EntityDescriptorRepresentation().with { @@ -208,26 +212,27 @@ class EntityDescriptorEnversVersioningTests extends Specification { //perhaps in JPAEntityDescriptorServiceImpl#buildDescriptorFromRepresentation ed.modifiedDate = LocalDateTime.now() - entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, entityDescriptorService, + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) then: entityDescriptorHistory.size() == 2 - entityDescriptorHistory[1][0].roleDescriptors[0].nameIDFormats[0].format == 'formatUPDATED' - entityDescriptorHistory[1][0].roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' - entityDescriptorHistory[1][0].roleDescriptors[0].supportedProtocols[1] == 'urn:oasis:names:tc:SAML:2.0:protocol' - entityDescriptorHistory[1][1].principalUserName == 'anonymous' - entityDescriptorHistory[1][1].timestamp > 0L + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).nameIDFormats[0].format == 'formatUPDATED' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[1] == 'urn:oasis:names:tc:SAML:2.0:protocol' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L //Check the original revision is intact - entityDescriptorHistory[0][0].roleDescriptors[0].nameIDFormats[0].format == 'format' - entityDescriptorHistory[0][0].roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' - entityDescriptorHistory[0][0].roleDescriptors[0].supportedProtocols[1] == null - entityDescriptorHistory[0][1].principalUserName == 'anonymous' - entityDescriptorHistory[0][1].timestamp > 0L + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].nameIDFormats[0].format == 'format' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[1] == null + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L } + @DirtiesContext def "test versioning with uiInfo"() { when: @@ -245,13 +250,13 @@ class EntityDescriptorEnversVersioningTests extends Specification { } it } - def entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, entityDescriptorService, + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) //Groovy FTW - able to call any private methods on ANY object. Get first revision - UIInfo uiinfo = entityDescriptorService.getUIInfo(entityDescriptorHistory[0][0]) + UIInfo uiinfo = entityDescriptorService.getUIInfo(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) then: entityDescriptorHistory.size() == 1 @@ -277,15 +282,15 @@ class EntityDescriptorEnversVersioningTests extends Specification { } it } - entityDescriptorHistory = updateAndGetRevisionHistory(ed, representation, entityDescriptorService, + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) //Get second revision - uiinfo = entityDescriptorService.getUIInfo(entityDescriptorHistory[1][0]) + uiinfo = entityDescriptorService.getUIInfo(getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) //And initial revision - def uiinfoInitialRevision = entityDescriptorService.getUIInfo(entityDescriptorHistory[0][0]) + def uiinfoInitialRevision = entityDescriptorService.getUIInfo(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) then: entityDescriptorHistory.size() == 2 @@ -306,4 +311,38 @@ class EntityDescriptorEnversVersioningTests extends Specification { uiinfoInitialRevision.logos[0].height == 20 uiinfoInitialRevision.logos[0].width == 30 } + + @DirtiesContext + def "test versioning with security"() { + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.securityInfo = new SecurityInfoRepresentation().with { + it.authenticationRequestsSigned = true + it.x509CertificateAvailable = true + it.x509Certificates = [new SecurityInfoRepresentation.X509CertificateRepresentation(name: 'sign', type: 'signing', value: 'signingValue')] + it + } + it + } + + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + //Get initial revision + SPSSODescriptor spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) + + KeyDescriptor keyDescriptor = spssoDescriptor.keyDescriptors[0] + X509Certificate x509cert = keyDescriptor.keyInfo.x509Datas[0].x509Certificates[0] + + then: + entityDescriptorHistory.size() == 1 + spssoDescriptor.isAuthnRequestsSigned() + keyDescriptor.name == 'sign' + keyDescriptor.usageType == 'signing' + x509cert.value == 'signingValue' + } } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy index d06e8ecbb..6e9b5981f 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy @@ -26,27 +26,32 @@ class EnversTestsSupport { entity } - static updateAndGetRevisionHistory(EntityDescriptor ed, EntityDescriptorRepresentation representation, - EntityDescriptorService eds, - EntityDescriptorRepository edr, - PlatformTransactionManager txMgr, - EntityManager em) { + static updateAndGetRevisionHistoryOfEntityDescriptor(EntityDescriptor ed, EntityDescriptorRepresentation representation, + EntityDescriptorService eds, + EntityDescriptorRepository edr, + PlatformTransactionManager txMgr, + EntityManager em) { eds.updateDescriptorFromRepresentation(ed, representation) doInExplicitTransaction(txMgr) { edr.save(ed) } - //For temp debugging. Remove when done! - //def updated = edr.findByResourceId(ed.resourceId) - - getRevisionHistory(em) + getRevisionHistoryForEntityType(em, EntityDescriptor) } - static getRevisionHistory(EntityManager em) { + static getRevisionHistoryForEntityType(EntityManager em, Class entityType) { def auditReader = AuditReaderFactory.get(em) AuditQuery auditQuery = auditReader .createQuery() - .forRevisionsOfEntity(EntityDescriptor, false, false) + .forRevisionsOfEntity(entityType, false, false) auditQuery.resultList } + + static getTargetEntityForRevisionIndex(List revHistory, int revIndex) { + revHistory[revIndex][0] + } + + static getRevisionEntityForRevisionIndex(List revHistory, int revIndex) { + revHistory[revIndex][1] + } } From 33cee9fb25e0655e5c09661f152119295aadbdac Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Fri, 31 May 2019 13:51:55 -0400 Subject: [PATCH 024/112] SHIBUI-1262 [1307 WIP] --- ...tityDescriptorEnversVersioningTests.groovy | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 786f5e0a2..1f8aeadf9 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -344,5 +344,56 @@ class EntityDescriptorEnversVersioningTests extends Specification { keyDescriptor.name == 'sign' keyDescriptor.usageType == 'signing' x509cert.value == 'signingValue' + + when: + representation = new EntityDescriptorRepresentation().with { + it.securityInfo = new SecurityInfoRepresentation().with { + it.authenticationRequestsSigned = false + it.x509CertificateAvailable = true + it.x509Certificates = [new SecurityInfoRepresentation.X509CertificateRepresentation(name: 'sign', type: 'signing', value: 'signingValue'), + new SecurityInfoRepresentation.X509CertificateRepresentation(name: 'encrypt', type: 'encryption', value: 'encryptionValue')] + it + } + it + } + + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + + //Get second revision + SPSSODescriptor spssoDescriptor_second = entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,1)) + + KeyDescriptor keyDescriptor_second1 = spssoDescriptor_second.keyDescriptors[0] + X509Certificate x509cert_second1 = keyDescriptor_second1.keyInfo.x509Datas[0].x509Certificates[0] + KeyDescriptor keyDescriptor_second2 = spssoDescriptor_second.keyDescriptors[1] + X509Certificate x509cert_second2 = keyDescriptor_second2.keyInfo.x509Datas[0].x509Certificates[0] + + + //Get initial revision + spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) + + keyDescriptor = spssoDescriptor.keyDescriptors[0] + x509cert = keyDescriptor.keyInfo.x509Datas[0].x509Certificates[0] + + then: + entityDescriptorHistory.size() == 2 + !spssoDescriptor_second.isAuthnRequestsSigned() + keyDescriptor_second1.name == 'sign' + keyDescriptor_second1.usageType == 'signing' + keyDescriptor_second2.name == 'encrypt' + keyDescriptor_second2.usageType == 'encryption' + x509cert_second1.value == 'signingValue' + x509cert_second2.value == 'encryptionValue' + + //Check the initial version is intact + spssoDescriptor.keyDescriptors.size() == 1 + spssoDescriptor.isAuthnRequestsSigned() + keyDescriptor.name == 'sign' + keyDescriptor.usageType == 'signing' + x509cert.value == 'signingValue' } } From dc0935a2cf2b765c5b4d2deba89ebb0ea1923e01 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 3 Jun 2019 10:40:45 -0400 Subject: [PATCH 025/112] fix test --- .../envers/EntityDescriptorEnversVersioningTests.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 1f8aeadf9..0af499a2b 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -219,7 +219,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { then: entityDescriptorHistory.size() == 2 - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).nameIDFormats[0].format == 'formatUPDATED' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].nameIDFormats[0].format == 'formatUPDATED' getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[1] == 'urn:oasis:names:tc:SAML:2.0:protocol' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' From 40545a6f2aab6849dfbd97932bcc3550700687df Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 3 Jun 2019 11:23:04 -0400 Subject: [PATCH 026/112] SHIBUI-1262 [1307,1308 WIP] --- ...tityDescriptorEnversVersioningTests.groovy | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 0af499a2b..cb2f903f8 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -4,11 +4,13 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfigurat import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration +import edu.internet2.tier.shibboleth.admin.ui.domain.AssertionConsumerService import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor import edu.internet2.tier.shibboleth.admin.ui.domain.KeyDescriptor import edu.internet2.tier.shibboleth.admin.ui.domain.SPSSODescriptor import edu.internet2.tier.shibboleth.admin.ui.domain.UIInfo import edu.internet2.tier.shibboleth.admin.ui.domain.X509Certificate +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.AssertionConsumerServiceRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.MduiRepresentation @@ -396,4 +398,67 @@ class EntityDescriptorEnversVersioningTests extends Specification { keyDescriptor.usageType == 'signing' x509cert.value == 'signingValue' } + + @DirtiesContext + def "test versioning ACS"() { + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.assertionConsumerServices = [ + new AssertionConsumerServiceRepresentation(locationUrl: 'http://acs', binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST')] + it + } + + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + SPSSODescriptor spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) + AssertionConsumerService acs = spssoDescriptor.assertionConsumerServices[0] + + then: + entityDescriptorHistory.size() == 1 + !acs.isDefault() + acs.location == 'http://acs' + acs.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' + + when: + representation = new EntityDescriptorRepresentation().with { + it.assertionConsumerServices = [ + new AssertionConsumerServiceRepresentation(locationUrl: 'http://acs.updated', binding: 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS', makeDefault: true), + new AssertionConsumerServiceRepresentation(locationUrl: 'http://acs2', binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact')] + it + } + + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + SPSSODescriptor spssoDescriptor2 = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,1)) + def (acs1, acs2) = [spssoDescriptor2.assertionConsumerServices[0], spssoDescriptor2.assertionConsumerServices[1]] + + //Initial revision + spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) + acs = spssoDescriptor.assertionConsumerServices[0] + + then: + entityDescriptorHistory.size() == 2 + acs1.isDefault() + !acs2.isDefault() + acs1.location == 'http://acs.updated' + acs1.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS' + acs2.location == 'http://acs2' + acs2.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact' + + //Check the initial revision is intact + !acs.isDefault() + acs.location == 'http://acs' + acs.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' + + } } From 7c4aceda6a8543154429738a29c7450390a66e51 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 3 Jun 2019 12:08:24 -0400 Subject: [PATCH 027/112] SHIBUI-1262 [1307,1308 WIP] --- ...tityDescriptorEnversVersioningTests.groovy | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index cb2f903f8..390672fee 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -8,11 +8,13 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.AssertionConsumerService import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor import edu.internet2.tier.shibboleth.admin.ui.domain.KeyDescriptor import edu.internet2.tier.shibboleth.admin.ui.domain.SPSSODescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.SingleLogoutService import edu.internet2.tier.shibboleth.admin.ui.domain.UIInfo import edu.internet2.tier.shibboleth.admin.ui.domain.X509Certificate import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.AssertionConsumerServiceRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.LogoutEndpointRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.MduiRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.OrganizationRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.SecurityInfoRepresentation @@ -459,6 +461,61 @@ class EntityDescriptorEnversVersioningTests extends Specification { !acs.isDefault() acs.location == 'http://acs' acs.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' + } + + @DirtiesContext + def "test versioning logout"() { + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.logoutEndpoints = [new LogoutEndpointRepresentation(url: 'http://logout', bindingType: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST')] + it + } + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + SPSSODescriptor spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + SingleLogoutService slo = spssoDescriptor.singleLogoutServices[0] + + then: + entityDescriptorHistory.size() == 1 + slo.location == 'http://logout' + slo.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' + + when: + representation = new EntityDescriptorRepresentation().with { + it.logoutEndpoints = [new LogoutEndpointRepresentation(url: 'http://logout.updated', bindingType: 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS'), + new LogoutEndpointRepresentation(url: 'http://logout2', bindingType: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact')] + it + } + + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + SPSSODescriptor spssoDescriptor2 = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) + def (slo1, slo2) = [spssoDescriptor2.singleLogoutServices[0], spssoDescriptor2.singleLogoutServices[1]] + + //Initial revision + spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + slo = spssoDescriptor.singleLogoutServices[0] + + then: + entityDescriptorHistory.size() == 2 + slo1.location == 'http://logout.updated' + slo1.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS' + slo2.location == 'http://logout2' + slo2.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact' + + //Check the initial version is intact + slo.location == 'http://logout' + slo.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' } } From 3610ed1f124996f452ebde32f6841a644a5f2d17 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 3 Jun 2019 15:45:58 -0400 Subject: [PATCH 028/112] SHIBUI-1262 [1307,1308 WIP] --- .../AbstractAttributeExtensibleXMLObject.java | 4 +- .../admin/ui/domain/AbstractAuditable.java | 2 + .../shibboleth/admin/ui/domain/Attribute.java | 1 + .../admin/ui/domain/EntityAttributes.java | 2 + .../shibboleth/admin/ui/domain/XSAny.java | 2 + .../admin/ui/domain/XSBase64Binary.java | 2 + .../shibboleth/admin/ui/domain/XSBoolean.java | 2 + .../admin/ui/domain/XSDateTime.java | 2 + .../shibboleth/admin/ui/domain/XSInteger.java | 2 + .../shibboleth/admin/ui/domain/XSQName.java | 2 + .../shibboleth/admin/ui/domain/XSString.java | 2 + ...tityDescriptorEnversVersioningTests.groovy | 56 +++++++++++++++++++ 12 files changed, 78 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAttributeExtensibleXMLObject.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAttributeExtensibleXMLObject.java index 075280330..2b4208865 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAttributeExtensibleXMLObject.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAttributeExtensibleXMLObject.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.AttributeExtensibleXMLObject; import org.opensaml.core.xml.util.AttributeMap; @@ -10,6 +11,7 @@ @MappedSuperclass @EqualsAndHashCode(callSuper = true, exclude={"unknownAttributes"}) +@Audited public abstract class AbstractAttributeExtensibleXMLObject extends AbstractXMLObject implements AttributeExtensibleXMLObject { private transient final AttributeMap unknownAttributes; @@ -24,4 +26,4 @@ public abstract class AbstractAttributeExtensibleXMLObject extends AbstractXMLOb public AttributeMap getUnknownAttributes() { return this.unknownAttributes; } -} \ No newline at end of file +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java index 1d23d5113..567a6637e 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java @@ -3,6 +3,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; +import org.hibernate.envers.Audited; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedBy; @@ -22,6 +23,7 @@ @MappedSuperclass @EntityListeners(AuditingEntityListener.class) @EqualsAndHashCode +@Audited public abstract class AbstractAuditable implements Auditable { @Id diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Attribute.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Attribute.java index 7a187bd99..1a9a28323 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Attribute.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Attribute.java @@ -27,6 +27,7 @@ public class Attribute extends AbstractAttributeExtensibleXMLObject implements o @OneToMany(cascade = CascadeType.ALL) @OrderColumn + @Audited private List attributeValues = new ArrayList<>(); @Override diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityAttributes.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityAttributes.java index ed97305fc..d48a3ea6f 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityAttributes.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityAttributes.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.XMLObject; import org.opensaml.saml.saml2.core.Assertion; @@ -16,6 +17,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class EntityAttributes extends AbstractElementExtensibleXMLObject implements org.opensaml.saml.ext.saml2mdattr.EntityAttributes { @OneToMany(cascade = CascadeType.ALL) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSAny.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSAny.java index 1c1d32f4b..de81fcdf6 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSAny.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSAny.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.util.AttributeMap; import javax.annotation.Nonnull; @@ -10,6 +11,7 @@ @Entity @EqualsAndHashCode(callSuper = true, exclude = {"unknownAttributes"}) +@Audited public class XSAny extends AbstractElementExtensibleXMLObject implements org.opensaml.core.xml.schema.XSAny { private String textContext; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSBase64Binary.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSBase64Binary.java index 0d886d52a..edfd8eec8 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSBase64Binary.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSBase64Binary.java @@ -1,12 +1,14 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.annotation.Nullable; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class XSBase64Binary extends AbstractXMLObject implements org.opensaml.core.xml.schema.XSBase64Binary { private String b64value; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSBoolean.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSBoolean.java index 72399bf06..8b0f258d1 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSBoolean.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSBoolean.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.opensaml.core.xml.schema.XSBooleanValue; import javax.annotation.Nullable; @@ -9,6 +10,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class XSBoolean extends AbstractXMLObject implements org.opensaml.core.xml.schema.XSBoolean { private String storedValue; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSDateTime.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSDateTime.java index 0ea3116f8..1b13a3cd4 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSDateTime.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSDateTime.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import org.joda.time.DateTime; import org.joda.time.chrono.ISOChronology; import org.joda.time.format.DateTimeFormatter; @@ -13,6 +14,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class XSDateTime extends AbstractXMLObject implements org.opensaml.core.xml.schema.XSDateTime { private DateTime dateTime; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSInteger.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSInteger.java index 294d0a575..cd6c205da 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSInteger.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSInteger.java @@ -1,12 +1,14 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.annotation.Nullable; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class XSInteger extends AbstractXMLObject implements org.opensaml.core.xml.schema.XSInteger { private int intValue; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSQName.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSQName.java index 259e3df36..b210ea7a4 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSQName.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSQName.java @@ -2,6 +2,7 @@ import lombok.EqualsAndHashCode; import net.shibboleth.utilities.java.support.xml.QNameSupport; +import org.hibernate.envers.Audited; import javax.annotation.Nullable; import javax.persistence.Entity; @@ -10,6 +11,7 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class XSQName extends AbstractXMLObject implements org.opensaml.core.xml.schema.XSQName { @Nullable @Override diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSString.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSString.java index f35e8e287..dbc0d4c38 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSString.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSString.java @@ -1,12 +1,14 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.envers.Audited; import javax.annotation.Nullable; import javax.persistence.Entity; @Entity @EqualsAndHashCode(callSuper = true) +@Audited public class XSString extends AbstractXMLObject implements org.opensaml.core.xml.schema.XSString { private String xsStringvalue; diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 390672fee..fa1b3af34 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -5,6 +5,7 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.Internationalization import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration import edu.internet2.tier.shibboleth.admin.ui.domain.AssertionConsumerService +import edu.internet2.tier.shibboleth.admin.ui.domain.EntityAttributes import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor import edu.internet2.tier.shibboleth.admin.ui.domain.KeyDescriptor import edu.internet2.tier.shibboleth.admin.ui.domain.SPSSODescriptor @@ -518,4 +519,59 @@ class EntityDescriptorEnversVersioningTests extends Specification { slo.location == 'http://logout' slo.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' } + + @DirtiesContext + def "test versioning relying party overrides"() { + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.relyingPartyOverrides = [signAssertion: true] + it.attributeRelease = ['attr1'] + it + } + + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + EntityAttributes attrs = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + + then: + entityDescriptorHistory.size() == 1 + attrs.attributes[0].attributeValues[0].storedValue == 'true' + attrs.attributes[1].attributeValues[0].xsStringvalue == 'attr1' + + when: + representation = new EntityDescriptorRepresentation().with { + it.relyingPartyOverrides = [signAssertion: false] + it.attributeRelease = ['attr1', 'attr2'] + it + } + + //Currently this is the ONLY way to let envers recognize update revision type for EntityDescriptor type + //when modifying attributes. This date "touch" would need to be encapsulated + //perhaps in JPAEntityDescriptorServiceImpl#buildDescriptorFromRepresentation + ed.modifiedDate = LocalDateTime.now() + + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + EntityAttributes attrs2 = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) + + //Initial revision + attrs = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + + then: + entityDescriptorHistory.size() == 2 + attrs2.attributes[0].attributeValues[0].xsStringvalue == 'attr1' + attrs2.attributes[0].attributeValues[1].xsStringvalue == 'attr2' + + //Check the initial revision is intact + attrs.attributes[0].attributeValues[0].storedValue == 'true' + attrs.attributes[1].attributeValues[0].xsStringvalue == 'attr1' + attrs.attributes[1].attributeValues[1] == null + } } From f94c3934931a2a464657091f67206d9930331f8a Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Mon, 3 Jun 2019 15:31:40 -0700 Subject: [PATCH 029/112] SHIBUI-1267 Implemented configuration component --- .../resources/metadata-sources-ui-schema.json | 1 + .../action/configuration.action.ts | 28 + .../component/array-property.component.html | 51 ++ .../component/array-property.component.ts | 36 + .../configuration-property.component.html | 0 .../configuration-property.component.ts | 19 + .../metadata-configuration.component.html | 33 +- .../metadata-configuration.component.ts | 8 +- .../component/object-property.component.html | 7 + .../component/object-property.component.ts | 26 + .../primitive-property.component.html | 5 + .../component/primitive-property.component.ts | 15 + .../configuration/configuration.module.ts | 16 +- .../container/configuration.component.html | 2 +- .../container/configuration.component.ts | 4 +- .../effect/configuration.effect.ts | 33 +- .../model/metadata-configuration.ts | 2 +- .../metadata/configuration/reducer/index.ts | 58 +- .../service/configuration.service.ts | 5 + ui/src/app/metadata/domain/model/property.ts | 1 + .../model/wizards/metadata-source-base.ts | 1 + .../model/wizards/metadata-source-editor.ts | 9 +- .../model/wizards/metadata-source-wizard.ts | 11 +- .../provider/model/base.provider.form.ts | 1 + .../model/dynamic-http.provider.form.ts | 9 +- .../model/file-backed-http.provider.form.ts | 10 +- .../model/file-system.provider.form.ts | 6 +- .../model/local-dynamic.provider.form.ts | 6 +- .../metadata/provider/model/provider.form.ts | 2 +- .../container/resolver-edit.component.html | 3 +- .../container/resolver-edit.component.ts | 6 - ui/src/app/wizard/model/wizard.ts | 2 +- ui/src/app/wizard/reducer/index.ts | 8 +- .../filebacked-http-advanced.schema.json | 242 ------ .../filebacked-http-common.editor.schema.json | 259 ------- .../filebacked-http-common.schema.json | 173 ----- .../filebacked-http-filters.schema.json | 129 ---- .../filebacked-http-reloading.schema.json | 68 -- .../provider/filebacked-http.schema.json | 686 ++++++++++++++++++ ui/src/styles.scss | 1 + ui/src/theme/utility.scss | 7 + 41 files changed, 1001 insertions(+), 988 deletions(-) create mode 100644 ui/src/app/metadata/configuration/component/array-property.component.html create mode 100644 ui/src/app/metadata/configuration/component/array-property.component.ts create mode 100644 ui/src/app/metadata/configuration/component/configuration-property.component.html create mode 100644 ui/src/app/metadata/configuration/component/configuration-property.component.ts create mode 100644 ui/src/app/metadata/configuration/component/object-property.component.html create mode 100644 ui/src/app/metadata/configuration/component/object-property.component.ts create mode 100644 ui/src/app/metadata/configuration/component/primitive-property.component.html create mode 100644 ui/src/app/metadata/configuration/component/primitive-property.component.ts delete mode 100644 ui/src/assets/schema/provider/filebacked-http-advanced.schema.json delete mode 100644 ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json delete mode 100644 ui/src/assets/schema/provider/filebacked-http-common.schema.json delete mode 100644 ui/src/assets/schema/provider/filebacked-http-filters.schema.json delete mode 100644 ui/src/assets/schema/provider/filebacked-http-reloading.schema.json create mode 100644 ui/src/assets/schema/provider/filebacked-http.schema.json create mode 100644 ui/src/theme/utility.scss diff --git a/backend/src/main/resources/metadata-sources-ui-schema.json b/backend/src/main/resources/metadata-sources-ui-schema.json index 3f002253a..9d64e75b4 100644 --- a/backend/src/main/resources/metadata-sources-ui-schema.json +++ b/backend/src/main/resources/metadata-sources-ui-schema.json @@ -310,6 +310,7 @@ }, "attributeRelease": { "type": "array", + "title": "label.attribute-release", "description": "Attribute release table - select the attributes you want to release (default unchecked)", "widget": { "id": "checklist", diff --git a/ui/src/app/metadata/configuration/action/configuration.action.ts b/ui/src/app/metadata/configuration/action/configuration.action.ts index 42d1dddaa..6c71b61a6 100644 --- a/ui/src/app/metadata/configuration/action/configuration.action.ts +++ b/ui/src/app/metadata/configuration/action/configuration.action.ts @@ -8,6 +8,10 @@ export enum ConfigurationActionTypes { LOAD_METADATA_SUCCESS = '[Metadata Configuration] Load Metadata Success', LOAD_METADATA_ERROR = '[Metadata Configuration] Load Metadata Error', + LOAD_SCHEMA_REQUEST = '[Metadata Configuration] Load Schema Request', + LOAD_SCHEMA_SUCCESS = '[Metadata Configuration] Load Schema Success', + LOAD_SCHEMA_ERROR = '[Metadata Configuration] Load Schema Error', + SET_METADATA = '[Metadata Configuration] Set Metadata Model', SET_DEFINITION = '[Metadata Configuration] Set Metadata Definition', SET_SCHEMA = '[Metadata Configuration] Set Metadata Schema', @@ -32,6 +36,24 @@ export class LoadMetadataError implements Action { constructor(public payload: any) { } } +export class LoadSchemaRequest implements Action { + readonly type = ConfigurationActionTypes.LOAD_SCHEMA_REQUEST; + + constructor(public payload: string) { } +} + +export class LoadSchemaSuccess implements Action { + readonly type = ConfigurationActionTypes.LOAD_SCHEMA_SUCCESS; + + constructor(public payload: Schema) { } +} + +export class LoadSchemaError implements Action { + readonly type = ConfigurationActionTypes.LOAD_SCHEMA_ERROR; + + constructor(public payload: any) { } +} + export class SetMetadata implements Action { readonly type = ConfigurationActionTypes.SET_METADATA; @@ -55,6 +77,12 @@ export class ClearConfiguration implements Action { } export type ConfigurationActionsUnion = + | LoadMetadataRequest + | LoadMetadataSuccess + | LoadMetadataError + | LoadSchemaRequest + | LoadSchemaSuccess + | LoadSchemaError | SetMetadata | SetDefinition | SetSchema diff --git a/ui/src/app/metadata/configuration/component/array-property.component.html b/ui/src/app/metadata/configuration/component/array-property.component.html new file mode 100644 index 000000000..ee177445e --- /dev/null +++ b/ui/src/app/metadata/configuration/component/array-property.component.html @@ -0,0 +1,51 @@ +
+ +
{{ property.name }}
+
+
+
+
+ {{ i + 1 }}.  + {{ property.items.properties[prop].title }} +
+
+ {{ value[prop] }} +
+
+
+
+ + + + + + + + + +
+ {{ attr.label }} +
+ + true + + + false + +
+
+ + +
+ +
+ {{ property.name }} +

—

+
    +
  • + {{ item }} +
    • +
+
+ \ No newline at end of file diff --git a/ui/src/app/metadata/configuration/component/array-property.component.ts b/ui/src/app/metadata/configuration/component/array-property.component.ts new file mode 100644 index 000000000..77c8fcab0 --- /dev/null +++ b/ui/src/app/metadata/configuration/component/array-property.component.ts @@ -0,0 +1,36 @@ +import { Component, Input } from '@angular/core'; +import { Property } from '../../domain/model/property'; +import { Observable, of } from 'rxjs'; +import { AttributesService } from '../../domain/service/attributes.service'; +import { ConfigurationPropertyComponent } from './configuration-property.component'; + +@Component({ + selector: 'array-property', + templateUrl: './array-property.component.html', + styleUrls: [] +}) + +export class ArrayPropertyComponent extends ConfigurationPropertyComponent { + @Input() property: Property; + + constructor( + private attrService: AttributesService + ) { + super(); + } + + getKeys(schema): string[] { + return Object.keys(schema.properties); + } + + get attributeList$(): Observable<{ key: string, label: string }[]> { + if (this.property.widget && this.property.widget.hasOwnProperty('data')) { + return of(this.property.widget.data); + } + if (this.property.widget && this.property.widget.hasOwnProperty('dataUrl')) { + return this.attrService.query(this.property.widget.dataUrl); + } + return of([]); + } +} + diff --git a/ui/src/app/metadata/configuration/component/configuration-property.component.html b/ui/src/app/metadata/configuration/component/configuration-property.component.html new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/app/metadata/configuration/component/configuration-property.component.ts b/ui/src/app/metadata/configuration/component/configuration-property.component.ts new file mode 100644 index 000000000..91e97e87b --- /dev/null +++ b/ui/src/app/metadata/configuration/component/configuration-property.component.ts @@ -0,0 +1,19 @@ +import { Component, Input } from '@angular/core'; +import { Property } from '../../domain/model/property'; + +@Component({ + selector: 'configuration-property', + templateUrl: './configuration-property.component.html', + styleUrls: [] +}) + +export class ConfigurationPropertyComponent { + @Input() property: Property; + + constructor() { } + + getItemType(items: Property): string { + return items.widget ? items.widget.id : 'default'; + } +} + diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html index f2034d06b..30e133525 100644 --- a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html +++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html @@ -1,10 +1,23 @@ -
-
-
- {{ i + 1 }}: {{ section.label }} - - {{ prop | json }} - -
-
-
\ No newline at end of file +
+
+
+
+

+ 0{{ i + 1 }} + {{ section.label | translate }} +

+
+ + + Edit + +
+
+
+ Option + Value +
+ +
+
+
diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts b/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts index 578b7abd3..6b3089f78 100644 --- a/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts +++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts @@ -1,7 +1,7 @@ import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; -import { WizardStep } from '../../../wizard/model'; -import Section from '../model/section'; import { MetadataConfiguration } from '../model/metadata-configuration'; +import { Property } from '../../domain/model/property'; +import Section from '../model/section'; @Component({ selector: 'metadata-configuration', @@ -13,4 +13,8 @@ export class MetadataConfigurationComponent { @Input() configuration: MetadataConfiguration; constructor() { } + + edit(section: Section): void { + console.log(section); + } } diff --git a/ui/src/app/metadata/configuration/component/object-property.component.html b/ui/src/app/metadata/configuration/component/object-property.component.html new file mode 100644 index 000000000..b0aa7b967 --- /dev/null +++ b/ui/src/app/metadata/configuration/component/object-property.component.html @@ -0,0 +1,7 @@ + + + + + + + diff --git a/ui/src/app/metadata/configuration/component/object-property.component.ts b/ui/src/app/metadata/configuration/component/object-property.component.ts new file mode 100644 index 000000000..db107da92 --- /dev/null +++ b/ui/src/app/metadata/configuration/component/object-property.component.ts @@ -0,0 +1,26 @@ +import { Component, Input } from '@angular/core'; +import { Property } from '../../domain/model/property'; +import { ConfigurationPropertyComponent } from './configuration-property.component'; + +@Component({ + selector: 'object-property', + templateUrl: './object-property.component.html', + styleUrls: [] +}) + +export class ObjectPropertyComponent extends ConfigurationPropertyComponent { + @Input() property: Property; + + constructor() { + super(); + } + + getKeys(schema): string[] { + return Object.keys(schema.properties); + } + + getItemType(items: Property): string { + return items.widget ? items.widget.id : 'default'; + } +} + diff --git a/ui/src/app/metadata/configuration/component/primitive-property.component.html b/ui/src/app/metadata/configuration/component/primitive-property.component.html new file mode 100644 index 000000000..9eef2181f --- /dev/null +++ b/ui/src/app/metadata/configuration/component/primitive-property.component.html @@ -0,0 +1,5 @@ +
+ {{ property.name }} + {{ property.value || property.value === false ? property.value : '-' }} +
\ No newline at end of file diff --git a/ui/src/app/metadata/configuration/component/primitive-property.component.ts b/ui/src/app/metadata/configuration/component/primitive-property.component.ts new file mode 100644 index 000000000..951d2c72a --- /dev/null +++ b/ui/src/app/metadata/configuration/component/primitive-property.component.ts @@ -0,0 +1,15 @@ +import { Component, Input } from '@angular/core'; +import { ConfigurationPropertyComponent } from './configuration-property.component'; + +@Component({ + selector: 'primitive-property', + templateUrl: './primitive-property.component.html', + styleUrls: [] +}) + +export class PrimitivePropertyComponent extends ConfigurationPropertyComponent { + constructor() { + super(); + } +} + diff --git a/ui/src/app/metadata/configuration/configuration.module.ts b/ui/src/app/metadata/configuration/configuration.module.ts index c04ab7add..eb69b14af 100644 --- a/ui/src/app/metadata/configuration/configuration.module.ts +++ b/ui/src/app/metadata/configuration/configuration.module.ts @@ -3,22 +3,36 @@ import { CommonModule } from '@angular/common'; import { StoreModule } from '@ngrx/store'; import { EffectsModule } from '@ngrx/effects'; +import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'; + import { I18nModule } from '../../i18n/i18n.module'; import { MetadataConfigurationComponent } from './component/metadata-configuration.component'; import { ConfigurationComponent } from './container/configuration.component'; import { MetadataConfigurationService } from './service/configuration.service'; import * as fromConfig from './reducer'; import { MetadataConfigurationEffects } from './effect/configuration.effect'; +import { ConfigurationPropertyComponent } from './component/configuration-property.component'; +import { DomainModule } from '../domain/domain.module'; +import { PrimitivePropertyComponent } from './component/primitive-property.component'; +import { ObjectPropertyComponent } from './component/object-property.component'; +import { ArrayPropertyComponent } from './component/array-property.component'; +import { RouterModule } from '@angular/router'; @NgModule({ declarations: [ MetadataConfigurationComponent, + ConfigurationPropertyComponent, + PrimitivePropertyComponent, + ObjectPropertyComponent, + ArrayPropertyComponent, ConfigurationComponent ], entryComponents: [], imports: [ CommonModule, - I18nModule + I18nModule, + NgbPopoverModule, + RouterModule ], exports: [], providers: [] diff --git a/ui/src/app/metadata/configuration/container/configuration.component.html b/ui/src/app/metadata/configuration/container/configuration.component.html index 21e8a3311..1e9f67486 100644 --- a/ui/src/app/metadata/configuration/container/configuration.component.html +++ b/ui/src/app/metadata/configuration/container/configuration.component.html @@ -11,7 +11,7 @@
- +
\ No newline at end of file diff --git a/ui/src/app/metadata/configuration/container/configuration.component.ts b/ui/src/app/metadata/configuration/container/configuration.component.ts index 3c47e0b93..eb52f60ba 100644 --- a/ui/src/app/metadata/configuration/container/configuration.component.ts +++ b/ui/src/app/metadata/configuration/container/configuration.component.ts @@ -24,7 +24,7 @@ export class ConfigurationComponent implements OnDestroy { private store: Store, private routerState: ActivatedRoute ) { - this.configuration$ = this.store.select(fromConfiguration.getConfigurationColumns); + this.configuration$ = this.store.select(fromConfiguration.getConfigurationSections); this.routerState.params.pipe( takeUntil(this.ngUnsubscribe), @@ -32,8 +32,6 @@ export class ConfigurationComponent implements OnDestroy { ).subscribe(store); this.configuration$.subscribe(c => console.log(c)); - - // this.resolver$ = this.store.select(fromResolvers.getSelectedResolver).pipe(skipWhile(p => !p)); } ngOnDestroy() { diff --git a/ui/src/app/metadata/configuration/effect/configuration.effect.ts b/ui/src/app/metadata/configuration/effect/configuration.effect.ts index b3c8f0515..ef86d13fd 100644 --- a/ui/src/app/metadata/configuration/effect/configuration.effect.ts +++ b/ui/src/app/metadata/configuration/effect/configuration.effect.ts @@ -10,7 +10,11 @@ import { LoadMetadataError, ConfigurationActionTypes, SetMetadata, - SetDefinition + SetDefinition, + LoadSchemaRequest, + LoadSchemaSuccess, + SetSchema, + LoadSchemaError } from '../action/configuration.action'; @Injectable() @@ -36,11 +40,36 @@ export class MetadataConfigurationEffects { ); @Effect() - setDefinitionOnMetadataSet$ = this.actions$.pipe( + setDefinition$ = this.actions$.pipe( ofType(ConfigurationActionTypes.SET_METADATA), map(action => new SetDefinition(this.configService.getDefinition(action.payload))) ); + @Effect() + loadSchemaOnDefinitionSet$ = this.actions$.pipe( + ofType(ConfigurationActionTypes.SET_DEFINITION), + map(action => new LoadSchemaRequest(action.payload.schema)) + ); + + @Effect() + loadSchemaData$ = this.actions$.pipe( + ofType(ConfigurationActionTypes.LOAD_SCHEMA_REQUEST), + switchMap(action => + this.configService + .loadSchema(action.payload) + .pipe( + map(schema => new LoadSchemaSuccess(schema)), + catchError(error => of(new LoadSchemaError(error))) + ) + ) + ); + + @Effect() + setSchema$ = this.actions$.pipe( + ofType(ConfigurationActionTypes.LOAD_SCHEMA_SUCCESS), + map(action => new SetSchema(action.payload)) + ); + constructor( private configService: MetadataConfigurationService, private actions$: Actions diff --git a/ui/src/app/metadata/configuration/model/metadata-configuration.ts b/ui/src/app/metadata/configuration/model/metadata-configuration.ts index 10768f14e..b8a37b85e 100644 --- a/ui/src/app/metadata/configuration/model/metadata-configuration.ts +++ b/ui/src/app/metadata/configuration/model/metadata-configuration.ts @@ -1,5 +1,5 @@ import Section from './section'; export interface MetadataConfiguration { - columns: Array
[]; + sections: Section[]; } diff --git a/ui/src/app/metadata/configuration/reducer/index.ts b/ui/src/app/metadata/configuration/reducer/index.ts index 13b5c627f..3fb2ae27d 100644 --- a/ui/src/app/metadata/configuration/reducer/index.ts +++ b/ui/src/app/metadata/configuration/reducer/index.ts @@ -29,47 +29,29 @@ export const getConfigurationModel = createSelector(getConfigurationState, fromC export const getConfigurationDefinition = createSelector(getConfigurationState, fromConfiguration.getDefinition); export const getConfigurationSchema = createSelector(getConfigurationState, fromConfiguration.getSchema); -export const mergedSchema = createSelector(getConfigurationSchema, schema => !schema ? null : Object.keys(schema).reduce((coll, key) => ({ - ...merge(coll, schema[key]) -}), {} as any)); - export const getConfigurationSectionsFn = (model, definition, schema) => !definition || !schema ? null : - definition.steps - .filter(step => step.id !== 'summary') - .map( - (step: WizardStep, num: number) => { - return ({ - id: step.id, - pageNumber: num + 1, - index: step.index, - label: step.label, - properties: utils.getStepProperties( - getSplitSchema(schema, step), - definition.formatter(model), - schema.definitions || {} - ) - }); - } - ); - -export const getConfigurationColumnsFn = sections => !sections ? null : - sections.reduce((resultArray, item, index) => { - const chunkIndex = Math.floor(index / Math.round(this.sections.length / 2)); - - if (!resultArray[chunkIndex]) { - resultArray[chunkIndex] = []; - } - - resultArray[chunkIndex].push(item); - - return resultArray; - }, []); - + ({ + sections: definition.steps + .filter(step => step.id !== 'summary') + .map( + (step: WizardStep, num: number) => { + return ({ + id: step.id, + pageNumber: num + 1, + index: step.index, + label: step.label, + properties: utils.getStepProperties( + getSplitSchema(schema, step), + definition.formatter(model), + schema.definitions || {} + ) + }); + } + ) + }); export const getConfigurationSections = createSelector( getConfigurationModel, getConfigurationDefinition, - mergedSchema, + getConfigurationSchema, getConfigurationSectionsFn ); - -export const getConfigurationColumns = createSelector(getConfigurationSections, getConfigurationColumnsFn); diff --git a/ui/src/app/metadata/configuration/service/configuration.service.ts b/ui/src/app/metadata/configuration/service/configuration.service.ts index 9ea95a79a..d7f5641d9 100644 --- a/ui/src/app/metadata/configuration/service/configuration.service.ts +++ b/ui/src/app/metadata/configuration/service/configuration.service.ts @@ -5,6 +5,7 @@ import { Metadata } from '../../domain/domain.type'; import { Wizard } from '../../../wizard/model'; import { MetadataSourceEditor } from '../../domain/model/wizards/metadata-source-editor'; import { MetadataProviderEditorTypes } from '../../provider/model'; +import { Schema } from '../model/schema'; export enum PATHS { resolver = 'EntityDescriptor', @@ -31,5 +32,9 @@ export class MetadataConfigurationService { getDefinition(model: Metadata): Wizard { return MetadataProviderEditorTypes.find(def => def.type === model['@type']) || new MetadataSourceEditor(); } + + loadSchema(path: string): Observable { + return this.http.get(path); + } } diff --git a/ui/src/app/metadata/domain/model/property.ts b/ui/src/app/metadata/domain/model/property.ts index f54829916..a792514d8 100644 --- a/ui/src/app/metadata/domain/model/property.ts +++ b/ui/src/app/metadata/domain/model/property.ts @@ -1,4 +1,5 @@ export interface Property { + title?: string; type: string; name: string; value: string[]; diff --git a/ui/src/app/metadata/domain/model/wizards/metadata-source-base.ts b/ui/src/app/metadata/domain/model/wizards/metadata-source-base.ts index 673f176c1..aab844d5e 100644 --- a/ui/src/app/metadata/domain/model/wizards/metadata-source-base.ts +++ b/ui/src/app/metadata/domain/model/wizards/metadata-source-base.ts @@ -9,6 +9,7 @@ export class MetadataSourceBase implements Wizard { label = 'Metadata Source'; type = '@MetadataProvider'; steps: WizardStep[] = []; + schema = ''; bindings = { '/securityInfo/x509CertificateAvailable': [ diff --git a/ui/src/app/metadata/domain/model/wizards/metadata-source-editor.ts b/ui/src/app/metadata/domain/model/wizards/metadata-source-editor.ts index 2c5c66a59..13136ddfc 100644 --- a/ui/src/app/metadata/domain/model/wizards/metadata-source-editor.ts +++ b/ui/src/app/metadata/domain/model/wizards/metadata-source-editor.ts @@ -3,12 +3,12 @@ import { MetadataResolver } from '../metadata-resolver'; import { MetadataSourceBase } from './metadata-source-base'; export class MetadataSourceEditor extends MetadataSourceBase implements Wizard { + schema = '/api/ui/MetadataSources'; steps: WizardStep[] = [ { index: 1, id: 'common', label: 'label.sp-org-info', - schema: '/api/ui/MetadataSources', fields: [ 'serviceProviderName', 'entityId', @@ -38,7 +38,6 @@ export class MetadataSourceEditor extends MetadataSourceBase implements Wizard { + schema = '/api/ui/MetadataSources'; steps: WizardStep[] = [ { index: 1, id: 'common', label: 'label.name-and-entity-id', - schema: '/api/ui/MetadataSources', fields: [ 'serviceProviderName', 'entityId' @@ -28,7 +28,6 @@ export class MetadataSourceWizard extends MetadataSourceBase implements Wizard = { label: 'BaseMetadataProvider', type: 'BaseMetadataResolver', + schema: '', getValidators(namesList: string[]): any { const validators = { '/': (value, property, form_current) => { diff --git a/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts b/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts index be0654dec..a0ca22143 100644 --- a/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts +++ b/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts @@ -80,13 +80,13 @@ export const DynamicHttpMetadataProviderWizard: Wizard = { ...FileBackedHttpMetadataProviderWizard, + schema: 'assets/schema/provider/filebacked-http.schema.json', steps: [ { id: 'common', label: 'label.common-attributes', index: 1, initialValues: [], - schema: 'assets/schema/provider/filebacked-http-common.editor.schema.json', fields: [ 'enabled', 'xmlId', @@ -120,7 +117,6 @@ export const FileBackedHttpMetadataProviderEditor: Wizard = { ...BaseMetadataProviderEditor, label: 'MetadataProvider', type: 'MetadataProvider', + schema: 'assets/schema/provider/metadata-provider.schema.json', steps: [ { id: 'new', label: 'label.select-metadata-provider-type', index: 1, initialValues: [], - schema: 'assets/schema/provider/metadata-provider.schema.json', fields: [ 'name', '@type' diff --git a/ui/src/app/metadata/resolver/container/resolver-edit.component.html b/ui/src/app/metadata/resolver/container/resolver-edit.component.html index bf04c16ae..88eb1946a 100644 --- a/ui/src/app/metadata/resolver/container/resolver-edit.component.html +++ b/ui/src/app/metadata/resolver/container/resolver-edit.component.html @@ -31,7 +31,8 @@   diff --git a/ui/src/app/metadata/resolver/container/resolver-edit.component.ts b/ui/src/app/metadata/resolver/container/resolver-edit.component.ts index 6161919f9..f793ef96e 100644 --- a/ui/src/app/metadata/resolver/container/resolver-edit.component.ts +++ b/ui/src/app/metadata/resolver/container/resolver-edit.component.ts @@ -56,8 +56,6 @@ export class ResolverEditComponent implements OnDestroy, CanComponentDeactivate let startIndex$ = this.route.firstChild.params.pipe(map(p => p.form)); startIndex$.pipe(takeUntil(this.ngUnsubscribe)).subscribe(index => this.store.dispatch(new SetIndex(index))); - this.index$.pipe(takeUntil(this.ngUnsubscribe)).subscribe(index => index && this.go(index)); - this.store .select(fromWizard.getCurrentWizardSchema) .pipe(filter(s => !!s)) @@ -67,10 +65,6 @@ export class ResolverEditComponent implements OnDestroy, CanComponentDeactivate this.store.select(fromResolver.getEntityChanges).subscribe(changes => this.latest = changes); } - go(index: string): void { - this.router.navigate(['./', index], { relativeTo: this.route }); - } - ngOnDestroy() { this.clear(); this.ngUnsubscribe.next(); diff --git a/ui/src/app/wizard/model/wizard.ts b/ui/src/app/wizard/model/wizard.ts index 3115ed041..5729c4f24 100644 --- a/ui/src/app/wizard/model/wizard.ts +++ b/ui/src/app/wizard/model/wizard.ts @@ -2,13 +2,13 @@ import { FormDefinition } from './form-definition'; export interface Wizard extends FormDefinition { steps: WizardStep[]; + schema: string; } export interface WizardStep { id: string; label: string; initialValues?: WizardValue[]; - schema?: string; index: number; locked?: boolean; fields?: string[]; diff --git a/ui/src/app/wizard/reducer/index.ts b/ui/src/app/wizard/reducer/index.ts index 3446f3713..4c3321c62 100644 --- a/ui/src/app/wizard/reducer/index.ts +++ b/ui/src/app/wizard/reducer/index.ts @@ -48,11 +48,7 @@ export const getWizardIsDisabled = createSelector(getState, fromWizard.getDisabl export const getWizardDefinition = createSelector(getState, fromWizard.getDefinition); export const getSchemaCollection = createSelector(getState, fromWizard.getCollection); -export const getSchemaPath = (index: string, wizard: Wizard) => { - if (!wizard) { return null; } - const step = wizard.steps.find(s => s.id === index); - return step ? step.schema : null; -}; +export const getSchemaPath = (wizard: Wizard) => wizard ? wizard.schema : null; export const getSplitSchema = (schema: any, step: WizardStep) => { if (!schema || !step.fields || !step.fields.length || !schema.properties) { @@ -93,7 +89,7 @@ export const getSplitSchema = (schema: any, step: WizardStep) => { return s; }; -export const getCurrentWizardSchema = createSelector(getWizardIndex, getWizardDefinition, getSchemaPath); +export const getCurrentWizardSchema = createSelector(getWizardDefinition, getSchemaPath); export const getPreviousFn = (index: string, wizard: Wizard) => { if (!wizard) { return null; } diff --git a/ui/src/assets/schema/provider/filebacked-http-advanced.schema.json b/ui/src/assets/schema/provider/filebacked-http-advanced.schema.json deleted file mode 100644 index 2e19da247..000000000 --- a/ui/src/assets/schema/provider/filebacked-http-advanced.schema.json +++ /dev/null @@ -1,242 +0,0 @@ -{ - "type": "object", - "title": "", - "properties": { - "httpMetadataResolverAttributes": { - "order": [], - "type": "object", - "fieldsets": [ - { - "title": "label.http-connection-attributes", - "type": "section", - "fields": [ - "connectionRequestTimeout", - "connectionTimeout", - "socketTimeout" - ] - }, - { - "title": "label.http-security-attributes", - "type": "section", - "class": "col-12", - "fields": [ - "disregardTLSCertificate" - ] - }, - { - "title": "label.http-proxy-attributes", - "type": "section", - "class": "col-12", - "fields": [ - "proxyHost", - "proxyPort", - "proxyUser", - "proxyPassword" - ] - }, - { - "title": "label.http-caching-attributes", - "type": "section", - "class": "col-12", - "fields": [ - "httpCaching", - "httpCacheDirectory", - "httpMaxCacheEntries", - "httpMaxCacheEntrySize" - ] - }, - { - "title": "", - "type": "hidden", - "class": "col-12", - "fields": [ - "tlsTrustEngineRef", - "httpClientSecurityParametersRef", - "httpClientRef" - ] - } - ], - "properties": { - "httpClientRef": { - "type": "string", - "title": "", - "description": "", - "placeholder": "", - "widget": "hidden" - }, - "connectionRequestTimeout": { - "type": "string", - "title": "label.connection-request-timeout", - "description": "tooltip.connection-request-timeout", - "placeholder": "label.duration", - "widget": { - "id": "datalist", - "data": [ - "PT0S", - "PT30S", - "PT1M", - "PT10M", - "PT30M", - "PT1H", - "PT4H", - "PT12H", - "PT24H" - ] - }, - "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" - }, - "connectionTimeout": { - "type": "string", - "title": "label.connection-timeout", - "description": "tooltip.connection-timeout", - "placeholder": "label.duration", - "widget": { - "id": "datalist", - "data": [ - "PT0S", - "PT30S", - "PT1M", - "PT10M", - "PT30M", - "PT1H", - "PT4H", - "PT12H", - "PT24H" - ] - }, - "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" - }, - "socketTimeout": { - "type": "string", - "title": "label.socket-timeout", - "description": "tooltip.socket-timeout", - "placeholder": "label.duration", - "widget": { - "id": "datalist", - "data": [ - "PT0S", - "PT30S", - "PT1M", - "PT10M", - "PT30M", - "PT1H", - "PT4H", - "PT12H", - "PT24H" - ] - }, - "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" - }, - "disregardTLSCertificate": { - "type": "boolean", - "title": "label.disregard-tls-cert", - "description": "tooltip.disregard-tls-cert", - "widget": { - "id": "boolean-radio" - }, - "oneOf": [ - { - "enum": [ - true - ], - "description": "True" - }, - { - "enum": [ - false - ], - "description": "False" - } - ] - }, - "tlsTrustEngineRef": { - "type": "string", - "title": "", - "description": "", - "placeholder": "", - "widget": "hidden" - }, - "httpClientSecurityParametersRef": { - "type": "string", - "title": "", - "description": "", - "placeholder": "", - "widget": "hidden" - }, - "proxyHost": { - "type": "string", - "title": "label.proxy-host", - "description": "tooltip.proxy-host", - "placeholder": "" - }, - "proxyPort": { - "type": "string", - "title": "label.proxy-port", - "description": "tooltip.proxy-port", - "placeholder": "" - }, - "proxyUser": { - "type": "string", - "title": "label.proxy-user", - "description": "tooltip.proxy-user", - "placeholder": "" - }, - "proxyPassword": { - "type": "string", - "title": "label.proxy-password", - "description": "tooltip.proxy-password", - "placeholder": "" - }, - "httpCaching": { - "type": "string", - "title": "label.http-caching", - "description": "tooltip.http-caching", - "placeholder": "label.select-caching-type", - "widget": { - "id": "select" - }, - "oneOf": [ - { - "enum": [ - "none" - ], - "description": "value.none" - }, - { - "enum": [ - "file" - ], - "description": "value.file" - }, - { - "enum": [ - "memory" - ], - "description": "value.memory" - } - ] - }, - "httpCacheDirectory": { - "type": "string", - "title": "label.http-caching-directory", - "description": "tooltip.http-caching-directory", - "placeholder": "" - }, - "httpMaxCacheEntries": { - "type": "integer", - "title": "label.http-max-cache-entries", - "description": "tooltip.http-max-cache-entries", - "placeholder": "", - "minimum": 0 - }, - "httpMaxCacheEntrySize": { - "type": "integer", - "title": "label.max-cache-entry-size", - "description": "tooltip.max-cache-entry-size", - "placeholder": "", - "minimum": 0 - } - } - } - } -} diff --git a/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json b/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json deleted file mode 100644 index 9e1d37308..000000000 --- a/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json +++ /dev/null @@ -1,259 +0,0 @@ -{ - "type": "object", - "order": [ - "name", - "@type", - "xmlId", - "metadataURL", - "initializeFromBackupFile", - "backingFile", - "backupFileInitNextRefreshDelay", - "requireValidMetadata", - "failFastInitialization", - "useDefaultPredicateRegistry", - "satisfyAnyPredicates" - ], - "required": [ - "name", - "xmlId", - "metadataURL", - "backingFile", - "backupFileInitNextRefreshDelay" - ], - "anyOf": [ - { - "properties": { - "initializeFromBackupFile": { - "enum": [ - true - ] - } - } - }, - { - "properties": { - "initializeFromBackupFile": { - "enum": [ - false - ] - } - } - } - ], - "fieldsets": [ - { - "type": "section", - "fields": [ - "name", - "@type", - "enabled" - ] - }, - { - "type": "group-lg", - "fields": [ - "xmlId", - "metadataURL", - "initializeFromBackupFile", - "backingFile", - "backupFileInitNextRefreshDelay", - "requireValidMetadata", - "failFastInitialization", - "useDefaultPredicateRegistry", - "satisfyAnyPredicates" - ] - } - ], - "properties": { - "name": { - "title": "label.metadata-provider-name", - "description": "tooltip.metadata-provider-name", - "type": "string", - "widget": { - "id": "string", - "help": "message.must-be-unique" - } - }, - "@type": { - "title": "label.metadata-provider-type", - "description": "tooltip.metadata-provider-type", - "placeholder": "label.select-metadata-type", - "type": "string", - "readOnly": true, - "widget": { - "id": "select", - "disabled": true - }, - "oneOf": [ - { - "enum": [ - "FileBackedHttpMetadataResolver" - ], - "description": "value.file-backed-http-metadata-provider" - } - ] - }, - "enabled": { - "title": "label.enable-service", - "description": "tooltip.enable-service", - "type": "boolean", - "default": false - }, - "xmlId": { - "title": "label.xml-id", - "description": "tooltip.xml-id", - "type": "string", - "default": "", - "minLength": 1 - }, - "metadataURL": { - "title": "label.metadata-url", - "description": "tooltip.metadata-url", - "type": "string", - "default": "", - "minLength": 1 - }, - "initializeFromBackupFile": { - "title": "label.init-from-backup", - "description": "tooltip.init-from-backup", - "type": "boolean", - "widget": { - "id": "boolean-radio" - }, - "oneOf": [ - { - "enum": [ - true - ], - "description": "value.true" - }, - { - "enum": [ - false - ], - "description": "value.false" - } - ], - "default": true - }, - "backingFile": { - "title": "label.backing-file", - "description": "tooltip.backing-file", - "type": "string", - "default": "" - }, - "backupFileInitNextRefreshDelay": { - "title": "label.backup-file-init-refresh-delay", - "description": "tooltip.backup-file-init-refresh-delay", - "type": "string", - "widget": { - "id": "datalist", - "data": [ - "PT0S", - "PT30S", - "PT1M", - "PT10M", - "PT30M", - "PT1H", - "PT4H", - "PT12H", - "PT24H" - ] - }, - "default": null, - "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" - }, - "requireValidMetadata": { - "title": "label.require-valid-metadata", - "description": "tooltip.require-valid-metadata", - "type": "boolean", - "widget": { - "id": "boolean-radio" - }, - "oneOf": [ - { - "enum": [ - true - ], - "description": "value.true" - }, - { - "enum": [ - false - ], - "description": "value.false" - } - ], - "default": true - }, - "failFastInitialization": { - "title": "label.fail-fast-init", - "description": "tooltip.fail-fast-init", - "type": "boolean", - "widget": { - "id": "boolean-radio" - }, - "oneOf": [ - { - "enum": [ - true - ], - "description": "value.true" - }, - { - "enum": [ - false - ], - "description": "value.false" - } - ], - "default": true - }, - "useDefaultPredicateRegistry": { - "title": "label.use-default-predicate-reg", - "description": "tooltip.use-default-predicate-reg", - "type": "boolean", - "widget": { - "id": "boolean-radio" - }, - "oneOf": [ - { - "enum": [ - true - ], - "description": "value.true" - }, - { - "enum": [ - false - ], - "description": "value.false" - } - ], - "default": true - }, - "satisfyAnyPredicates": { - "title": "label.satisfy-any-predicates", - "description": "tooltip.satisfy-any-predicates", - "type": "boolean", - "widget": { - "id": "boolean-radio" - }, - "oneOf": [ - { - "enum": [ - true - ], - "description": "value.true" - }, - { - "enum": [ - false - ], - "description": "value.false" - } - ], - "default": false - } - } -} \ No newline at end of file diff --git a/ui/src/assets/schema/provider/filebacked-http-common.schema.json b/ui/src/assets/schema/provider/filebacked-http-common.schema.json deleted file mode 100644 index 5db366d07..000000000 --- a/ui/src/assets/schema/provider/filebacked-http-common.schema.json +++ /dev/null @@ -1,173 +0,0 @@ -{ - "type": "object", - "order": [ - "xmlId", - "metadataURL", - "initializeFromBackupFile", - "backingFile", - "backupFileInitNextRefreshDelay", - "requireValidMetadata", - "failFastInitialization", - "useDefaultPredicateRegistry", - "satisfyAnyPredicates" - ], - "required": ["xmlId", "metadataURL", "backingFile", "backupFileInitNextRefreshDelay"], - "properties": { - "xmlId": { - "title": "label.xml-id", - "description": "tooltip.xml-id", - "type": "string", - "default": "", - "minLength": 1 - }, - "metadataURL": { - "title": "label.metadata-url", - "description": "tooltip.metadata-url", - "type": "string", - "default": "", - "minLength": 1 - }, - "initializeFromBackupFile": { - "title": "label.init-from-backup", - "description": "tooltip.init-from-backup", - "type": "boolean", - "widget": { - "id": "boolean-radio" - }, - "oneOf": [ - { - "enum": [ - true - ], - "description": "value.true" - }, - { - "enum": [ - false - ], - "description": "value.false" - } - ], - "default": true - }, - "backingFile": { - "title": "label.backing-file", - "description": "tooltip.backing-file", - "type": "string", - "default": "" - }, - "backupFileInitNextRefreshDelay": { - "title": "label.backup-file-init-refresh-delay", - "description": "tooltip.backup-file-init-refresh-delay", - "type": "string", - "widget": { - "id": "datalist", - "data": [ - "PT0S", - "PT30S", - "PT1M", - "PT10M", - "PT30M", - "PT1H", - "PT4H", - "PT12H", - "PT24H" - ] - }, - "default": null, - "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" - }, - "requireValidMetadata": { - "title": "label.require-valid-metadata", - "description": "tooltip.require-valid-metadata", - "type": "boolean", - "widget": { - "id": "boolean-radio" - }, - "oneOf": [ - { - "enum": [ - true - ], - "description": "value.true" - }, - { - "enum": [ - false - ], - "description": "value.false" - } - ], - "default": true - }, - "failFastInitialization": { - "title": "label.fail-fast-init", - "description": "tooltip.fail-fast-init", - "type": "boolean", - "widget": { - "id": "boolean-radio" - }, - "oneOf": [ - { - "enum": [ - true - ], - "description": "value.true" - }, - { - "enum": [ - false - ], - "description": "value.false" - } - ], - "default": true - }, - "useDefaultPredicateRegistry": { - "title": "label.use-default-predicate-reg", - "description": "tooltip.use-default-predicate-reg", - "type": "boolean", - "widget": { - "id": "boolean-radio" - }, - "oneOf": [ - { - "enum": [ - true - ], - "description": "value.true" - }, - { - "enum": [ - false - ], - "description": "value.false" - } - ], - "default": true - }, - "satisfyAnyPredicates": { - "title": "label.satisfy-any-predicates", - "description": "tooltip.satisfy-any-predicates", - "type": "boolean", - "widget": { - "id": "boolean-radio" - }, - "oneOf": [ - { - "enum": [ - true - ], - "description": "value.true" - }, - { - "enum": [ - false - ], - "description": "value.false" - } - ], - "default": false - } - } -} diff --git a/ui/src/assets/schema/provider/filebacked-http-filters.schema.json b/ui/src/assets/schema/provider/filebacked-http-filters.schema.json deleted file mode 100644 index 820063bfa..000000000 --- a/ui/src/assets/schema/provider/filebacked-http-filters.schema.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "type": "object", - "properties": { - "metadataFilters": { - "title": "", - "description": "", - "type": "object", - "properties": { - "RequiredValidUntil": { - "title": "label.required-valid-until", - "type": "object", - "widget": { - "id": "fieldset" - }, - "properties": { - "maxValidityInterval": { - "title": "label.max-validity-interval", - "description": "tooltip.max-validity-interval", - "type": "string", - "placeholder": "label.duration", - "widget": { - "id": "datalist", - "data": [ - "PT0S", - "P14D", - "P7D", - "P1D", - "PT12H" - ] - }, - "default": null, - "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" - } - } - }, - "SignatureValidation": { - "title": "label.signature-validation-filter", - "type": "object", - "widget": { - "id": "fieldset" - }, - "properties": { - "requireSignedRoot": { - "title": "label.require-signed-root", - "description": "tooltip.require-signed-root", - "type": "boolean", - "default": true - }, - "certificateFile": { - "title": "label.certificate-file", - "description": "tooltip.certificate-file", - "type": "string", - "widget": "textline" - } - }, - "anyOf": [ - { - "properties": { - "requireSignedRoot": { - "enum": [ true ] - }, - "certificateFile": { - "minLength": 1, - "type": "string" - } - }, - "required": [ - "certificateFile" - ] - }, - { - "properties": { - "requireSignedRoot": { - "enum": [ false ] - } - } - } - ] - }, - "EntityRoleWhiteList": { - "title": "label.entity-role-whitelist", - "type": "object", - "widget": { - "id": "fieldset" - }, - "properties": { - "retainedRoles": { - "title": "label.retained-roles", - "description": "tooltip.retained-roles", - "type": "array", - "items": { - "widget": { - "id": "select" - }, - "type": "string", - "oneOf": [ - { - "enum": [ - "md:SPSSODescriptor" - ], - "description": "value.spdescriptor" - }, - { - "enum": [ - "md:AttributeAuthorityDescriptor" - ], - "description": "value.attr-auth-descriptor" - } - ] - } - }, - "removeRolelessEntityDescriptors": { - "title": "label.remove-roleless-entity-descriptors", - "description": "tooltip.remove-roleless-entity-descriptors", - "type": "boolean", - "default": true - }, - "removeEmptyEntitiesDescriptors": { - "title": "label.remove-empty-entities-descriptors", - "description": "tooltip.remove-empty-entities-descriptors", - "type": "boolean", - "default": true - } - } - } - } - } - } -} diff --git a/ui/src/assets/schema/provider/filebacked-http-reloading.schema.json b/ui/src/assets/schema/provider/filebacked-http-reloading.schema.json deleted file mode 100644 index 6723e4cb1..000000000 --- a/ui/src/assets/schema/provider/filebacked-http-reloading.schema.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "type": "object", - "properties": { - "reloadableMetadataResolverAttributes": { - "type": "object", - "properties": { - "minRefreshDelay": { - "title": "label.min-refresh-delay", - "description": "tooltip.min-refresh-delay", - "type": "string", - "placeholder": "label.duration", - "widget": { - "id": "datalist", - "data": [ - "PT0S", - "PT30S", - "PT1M", - "PT10M", - "PT30M", - "PT1H", - "PT4H", - "PT12H", - "PT24H" - ] - }, - "default": null, - "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" - }, - "maxRefreshDelay": { - "title": "label.max-refresh-delay", - "description": "tooltip.max-refresh-delay", - "type": "string", - "placeholder": "label.duration", - "widget": { - "id": "datalist", - "data": [ - "PT0S", - "PT30S", - "PT1M", - "PT10M", - "PT30M", - "PT1H", - "PT4H", - "PT12H", - "PT24H" - ] - }, - "default": null, - "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" - }, - "refreshDelayFactor": { - "title": "label.refresh-delay-factor", - "description": "tooltip.refresh-delay-factor", - "type": "string", - "widget": { - "id": "string", - "help": "message.real-number" - }, - "placeholder": "label.real-number", - "minimum": 0, - "maximum": 1, - "default": "", - "pattern": "^(?:([0]*(\\.[0-9]+)?|[0]*\\.[0-9]*[1-9][0-9]*)|)$" - } - } - } - } -} diff --git a/ui/src/assets/schema/provider/filebacked-http.schema.json b/ui/src/assets/schema/provider/filebacked-http.schema.json new file mode 100644 index 000000000..f543e9e89 --- /dev/null +++ b/ui/src/assets/schema/provider/filebacked-http.schema.json @@ -0,0 +1,686 @@ +{ + "type": "object", + "order": [ + "name", + "@type", + "xmlId", + "metadataURL", + "initializeFromBackupFile", + "backingFile", + "backupFileInitNextRefreshDelay", + "requireValidMetadata", + "failFastInitialization", + "useDefaultPredicateRegistry", + "satisfyAnyPredicates" + ], + "required": [ + "name", + "xmlId", + "metadataURL", + "backingFile", + "backupFileInitNextRefreshDelay" + ], + "anyOf": [ + { + "properties": { + "initializeFromBackupFile": { + "enum": [ + true + ] + } + } + }, + { + "properties": { + "initializeFromBackupFile": { + "enum": [ + false + ] + } + } + } + ], + "fieldsets": [ + { + "type": "section", + "fields": [ + "name", + "@type", + "enabled" + ] + }, + { + "type": "group-lg", + "fields": [ + "xmlId", + "metadataURL", + "initializeFromBackupFile", + "backingFile", + "backupFileInitNextRefreshDelay", + "requireValidMetadata", + "failFastInitialization", + "useDefaultPredicateRegistry", + "satisfyAnyPredicates" + ] + } + ], + "properties": { + "name": { + "title": "label.metadata-provider-name", + "description": "tooltip.metadata-provider-name", + "type": "string", + "widget": { + "id": "string", + "help": "message.must-be-unique" + } + }, + "@type": { + "title": "label.metadata-provider-type", + "description": "tooltip.metadata-provider-type", + "placeholder": "label.select-metadata-type", + "type": "string", + "readOnly": true, + "widget": { + "id": "select", + "disabled": true + }, + "oneOf": [ + { + "enum": [ + "FileBackedHttpMetadataResolver" + ], + "description": "value.file-backed-http-metadata-provider" + } + ] + }, + "enabled": { + "title": "label.enable-service", + "description": "tooltip.enable-service", + "type": "boolean", + "default": false + }, + "xmlId": { + "title": "label.xml-id", + "description": "tooltip.xml-id", + "type": "string", + "default": "", + "minLength": 1 + }, + "metadataURL": { + "title": "label.metadata-url", + "description": "tooltip.metadata-url", + "type": "string", + "default": "", + "minLength": 1 + }, + "initializeFromBackupFile": { + "title": "label.init-from-backup", + "description": "tooltip.init-from-backup", + "type": "boolean", + "widget": { + "id": "boolean-radio" + }, + "oneOf": [ + { + "enum": [ + true + ], + "description": "value.true" + }, + { + "enum": [ + false + ], + "description": "value.false" + } + ], + "default": true + }, + "backingFile": { + "title": "label.backing-file", + "description": "tooltip.backing-file", + "type": "string", + "default": "" + }, + "backupFileInitNextRefreshDelay": { + "title": "label.backup-file-init-refresh-delay", + "description": "tooltip.backup-file-init-refresh-delay", + "type": "string", + "widget": { + "id": "datalist", + "data": [ + "PT0S", + "PT30S", + "PT1M", + "PT10M", + "PT30M", + "PT1H", + "PT4H", + "PT12H", + "PT24H" + ] + }, + "default": null, + "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" + }, + "requireValidMetadata": { + "title": "label.require-valid-metadata", + "description": "tooltip.require-valid-metadata", + "type": "boolean", + "widget": { + "id": "boolean-radio" + }, + "oneOf": [ + { + "enum": [ + true + ], + "description": "value.true" + }, + { + "enum": [ + false + ], + "description": "value.false" + } + ], + "default": true + }, + "failFastInitialization": { + "title": "label.fail-fast-init", + "description": "tooltip.fail-fast-init", + "type": "boolean", + "widget": { + "id": "boolean-radio" + }, + "oneOf": [ + { + "enum": [ + true + ], + "description": "value.true" + }, + { + "enum": [ + false + ], + "description": "value.false" + } + ], + "default": true + }, + "useDefaultPredicateRegistry": { + "title": "label.use-default-predicate-reg", + "description": "tooltip.use-default-predicate-reg", + "type": "boolean", + "widget": { + "id": "boolean-radio" + }, + "oneOf": [ + { + "enum": [ + true + ], + "description": "value.true" + }, + { + "enum": [ + false + ], + "description": "value.false" + } + ], + "default": true + }, + "satisfyAnyPredicates": { + "title": "label.satisfy-any-predicates", + "description": "tooltip.satisfy-any-predicates", + "type": "boolean", + "widget": { + "id": "boolean-radio" + }, + "oneOf": [ + { + "enum": [ + true + ], + "description": "value.true" + }, + { + "enum": [ + false + ], + "description": "value.false" + } + ], + "default": false + }, + "httpMetadataResolverAttributes": { + "order": [], + "type": "object", + "fieldsets": [ + { + "title": "label.http-connection-attributes", + "type": "section", + "fields": [ + "connectionRequestTimeout", + "connectionTimeout", + "socketTimeout" + ] + }, + { + "title": "label.http-security-attributes", + "type": "section", + "class": "col-12", + "fields": [ + "disregardTLSCertificate" + ] + }, + { + "title": "label.http-proxy-attributes", + "type": "section", + "class": "col-12", + "fields": [ + "proxyHost", + "proxyPort", + "proxyUser", + "proxyPassword" + ] + }, + { + "title": "label.http-caching-attributes", + "type": "section", + "class": "col-12", + "fields": [ + "httpCaching", + "httpCacheDirectory", + "httpMaxCacheEntries", + "httpMaxCacheEntrySize" + ] + }, + { + "title": "", + "type": "hidden", + "class": "col-12", + "fields": [ + "tlsTrustEngineRef", + "httpClientSecurityParametersRef", + "httpClientRef" + ] + } + ], + "properties": { + "httpClientRef": { + "type": "string", + "title": "", + "description": "", + "placeholder": "", + "widget": "hidden" + }, + "connectionRequestTimeout": { + "type": "string", + "title": "label.connection-request-timeout", + "description": "tooltip.connection-request-timeout", + "placeholder": "label.duration", + "widget": { + "id": "datalist", + "data": [ + "PT0S", + "PT30S", + "PT1M", + "PT10M", + "PT30M", + "PT1H", + "PT4H", + "PT12H", + "PT24H" + ] + }, + "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" + }, + "connectionTimeout": { + "type": "string", + "title": "label.connection-timeout", + "description": "tooltip.connection-timeout", + "placeholder": "label.duration", + "widget": { + "id": "datalist", + "data": [ + "PT0S", + "PT30S", + "PT1M", + "PT10M", + "PT30M", + "PT1H", + "PT4H", + "PT12H", + "PT24H" + ] + }, + "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" + }, + "socketTimeout": { + "type": "string", + "title": "label.socket-timeout", + "description": "tooltip.socket-timeout", + "placeholder": "label.duration", + "widget": { + "id": "datalist", + "data": [ + "PT0S", + "PT30S", + "PT1M", + "PT10M", + "PT30M", + "PT1H", + "PT4H", + "PT12H", + "PT24H" + ] + }, + "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" + }, + "disregardTLSCertificate": { + "type": "boolean", + "title": "label.disregard-tls-cert", + "description": "tooltip.disregard-tls-cert", + "widget": { + "id": "boolean-radio" + }, + "oneOf": [ + { + "enum": [ + true + ], + "description": "True" + }, + { + "enum": [ + false + ], + "description": "False" + } + ] + }, + "tlsTrustEngineRef": { + "type": "string", + "title": "", + "description": "", + "placeholder": "", + "widget": "hidden" + }, + "httpClientSecurityParametersRef": { + "type": "string", + "title": "", + "description": "", + "placeholder": "", + "widget": "hidden" + }, + "proxyHost": { + "type": "string", + "title": "label.proxy-host", + "description": "tooltip.proxy-host", + "placeholder": "" + }, + "proxyPort": { + "type": "string", + "title": "label.proxy-port", + "description": "tooltip.proxy-port", + "placeholder": "" + }, + "proxyUser": { + "type": "string", + "title": "label.proxy-user", + "description": "tooltip.proxy-user", + "placeholder": "" + }, + "proxyPassword": { + "type": "string", + "title": "label.proxy-password", + "description": "tooltip.proxy-password", + "placeholder": "" + }, + "httpCaching": { + "type": "string", + "title": "label.http-caching", + "description": "tooltip.http-caching", + "placeholder": "label.select-caching-type", + "widget": { + "id": "select" + }, + "oneOf": [ + { + "enum": [ + "none" + ], + "description": "value.none" + }, + { + "enum": [ + "file" + ], + "description": "value.file" + }, + { + "enum": [ + "memory" + ], + "description": "value.memory" + } + ] + }, + "httpCacheDirectory": { + "type": "string", + "title": "label.http-caching-directory", + "description": "tooltip.http-caching-directory", + "placeholder": "" + }, + "httpMaxCacheEntries": { + "type": "integer", + "title": "label.http-max-cache-entries", + "description": "tooltip.http-max-cache-entries", + "placeholder": "", + "minimum": 0 + }, + "httpMaxCacheEntrySize": { + "type": "integer", + "title": "label.max-cache-entry-size", + "description": "tooltip.max-cache-entry-size", + "placeholder": "", + "minimum": 0 + } + } + }, + "reloadableMetadataResolverAttributes": { + "type": "object", + "properties": { + "minRefreshDelay": { + "title": "label.min-refresh-delay", + "description": "tooltip.min-refresh-delay", + "type": "string", + "placeholder": "label.duration", + "widget": { + "id": "datalist", + "data": [ + "PT0S", + "PT30S", + "PT1M", + "PT10M", + "PT30M", + "PT1H", + "PT4H", + "PT12H", + "PT24H" + ] + }, + "default": null, + "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" + }, + "maxRefreshDelay": { + "title": "label.max-refresh-delay", + "description": "tooltip.max-refresh-delay", + "type": "string", + "placeholder": "label.duration", + "widget": { + "id": "datalist", + "data": [ + "PT0S", + "PT30S", + "PT1M", + "PT10M", + "PT30M", + "PT1H", + "PT4H", + "PT12H", + "PT24H" + ] + }, + "default": null, + "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" + }, + "refreshDelayFactor": { + "title": "label.refresh-delay-factor", + "description": "tooltip.refresh-delay-factor", + "type": "string", + "widget": { + "id": "string", + "help": "message.real-number" + }, + "placeholder": "label.real-number", + "minimum": 0, + "maximum": 1, + "default": "", + "pattern": "^(?:([0]*(\\.[0-9]+)?|[0]*\\.[0-9]*[1-9][0-9]*)|)$" + } + } + }, + "metadataFilters": { + "title": "", + "description": "", + "type": "object", + "properties": { + "RequiredValidUntil": { + "title": "label.required-valid-until", + "type": "object", + "widget": { + "id": "fieldset" + }, + "properties": { + "maxValidityInterval": { + "title": "label.max-validity-interval", + "description": "tooltip.max-validity-interval", + "type": "string", + "placeholder": "label.duration", + "widget": { + "id": "datalist", + "data": [ + "PT0S", + "P14D", + "P7D", + "P1D", + "PT12H" + ] + }, + "default": null, + "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$" + } + } + }, + "SignatureValidation": { + "title": "label.signature-validation-filter", + "type": "object", + "widget": { + "id": "fieldset" + }, + "properties": { + "requireSignedRoot": { + "title": "label.require-signed-root", + "description": "tooltip.require-signed-root", + "type": "boolean", + "default": true + }, + "certificateFile": { + "title": "label.certificate-file", + "description": "tooltip.certificate-file", + "type": "string", + "widget": "textline" + } + }, + "anyOf": [ + { + "properties": { + "requireSignedRoot": { + "enum": [ + true + ] + }, + "certificateFile": { + "minLength": 1, + "type": "string" + } + }, + "required": [ + "certificateFile" + ] + }, + { + "properties": { + "requireSignedRoot": { + "enum": [ + false + ] + } + } + } + ] + }, + "EntityRoleWhiteList": { + "title": "label.entity-role-whitelist", + "type": "object", + "widget": { + "id": "fieldset" + }, + "properties": { + "retainedRoles": { + "title": "label.retained-roles", + "description": "tooltip.retained-roles", + "type": "array", + "items": { + "widget": { + "id": "select" + }, + "type": "string", + "oneOf": [ + { + "enum": [ + "md:SPSSODescriptor" + ], + "description": "value.spdescriptor" + }, + { + "enum": [ + "md:AttributeAuthorityDescriptor" + ], + "description": "value.attr-auth-descriptor" + } + ] + } + }, + "removeRolelessEntityDescriptors": { + "title": "label.remove-roleless-entity-descriptors", + "description": "tooltip.remove-roleless-entity-descriptors", + "type": "boolean", + "default": true + }, + "removeEmptyEntitiesDescriptors": { + "title": "label.remove-empty-entities-descriptors", + "description": "tooltip.remove-empty-entities-descriptors", + "type": "boolean", + "default": true + } + } + } + } + } + } +} \ No newline at end of file diff --git a/ui/src/styles.scss b/ui/src/styles.scss index 454ccba2e..a3f814d8a 100644 --- a/ui/src/styles.scss +++ b/ui/src/styles.scss @@ -6,6 +6,7 @@ @import './theme/alert'; @import './theme/typography'; @import './theme/list'; +@import './theme/utility'; body { background-color: theme-color("light"); diff --git a/ui/src/theme/utility.scss b/ui/src/theme/utility.scss new file mode 100644 index 000000000..f6c3c0e9e --- /dev/null +++ b/ui/src/theme/utility.scss @@ -0,0 +1,7 @@ +.border-2 { + border-width: 2px !important; +} + +.bg-lighter { + background: #FAFAFA !important; +} \ No newline at end of file From f5eae5e63854cf9cc8497e8a33d564667582d4ef Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Wed, 5 Jun 2019 10:06:23 -0400 Subject: [PATCH 030/112] SHIBUI-1262(1308) --- .../envers/PrincipalAwareRevisionEntity.java | 3 +- .../JPAEntityDescriptorServiceImpl.java | 5 + ...tityDescriptorEnversVersioningTests.groovy | 107 +++++++++++++----- .../envers/EnversTestsSupport.groovy | 4 + 4 files changed, 87 insertions(+), 32 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/PrincipalAwareRevisionEntity.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/PrincipalAwareRevisionEntity.java index 8ee27218f..88e20179d 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/PrincipalAwareRevisionEntity.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/PrincipalAwareRevisionEntity.java @@ -3,6 +3,7 @@ import lombok.Getter; import lombok.Setter; import org.hibernate.envers.DefaultRevisionEntity; +import org.hibernate.envers.DefaultTrackingModifiedEntitiesRevisionEntity; import org.hibernate.envers.RevisionEntity; import javax.persistence.Entity; @@ -14,7 +15,7 @@ @RevisionEntity(PrincipalEnhancingRevisionListener.class) @Getter @Setter -public class PrincipalAwareRevisionEntity extends DefaultRevisionEntity { +public class PrincipalAwareRevisionEntity extends DefaultTrackingModifiedEntitiesRevisionEntity { private String principalUserName; } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java index 9bbf5ec2a..e97c166a3 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java @@ -56,6 +56,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -120,6 +121,10 @@ private EntityDescriptor buildDescriptorFromRepresentation(final EntityDescripto setupLogout(ed, representation); setupRelyingPartyOverrides(ed, representation); + //Let envers recognize update revision type for EntityDescriptor type + //when modifying Attributes and SPSSODescriptor inside RoleDescriptors collection + ed.setModifiedDate(LocalDateTime.now()); + return ed; } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index fa1b3af34..acea73775 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -4,22 +4,8 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfigurat import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration -import edu.internet2.tier.shibboleth.admin.ui.domain.AssertionConsumerService -import edu.internet2.tier.shibboleth.admin.ui.domain.EntityAttributes -import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor -import edu.internet2.tier.shibboleth.admin.ui.domain.KeyDescriptor -import edu.internet2.tier.shibboleth.admin.ui.domain.SPSSODescriptor -import edu.internet2.tier.shibboleth.admin.ui.domain.SingleLogoutService -import edu.internet2.tier.shibboleth.admin.ui.domain.UIInfo -import edu.internet2.tier.shibboleth.admin.ui.domain.X509Certificate -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.AssertionConsumerServiceRepresentation -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.LogoutEndpointRepresentation -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.MduiRepresentation -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.OrganizationRepresentation -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.SecurityInfoRepresentation -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ServiceProviderSsoDescriptorRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.* +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.* 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.service.EntityDescriptorService @@ -33,11 +19,8 @@ import org.springframework.transaction.PlatformTransactionManager import spock.lang.Specification import javax.persistence.EntityManager -import java.time.LocalDateTime -import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex -import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex -import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor +import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.* import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHER @@ -67,6 +50,9 @@ class EntityDescriptorEnversVersioningTests extends Specification { @DirtiesContext def "test versioning with contact persons"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, ContactPerson.name, GivenName.name, EmailAddress.name] + when: def ed = new EntityDescriptor() def representation = new EntityDescriptorRepresentation().with { @@ -85,6 +71,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].emailAddresses[0].address == 'test@test' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() when: representation = new EntityDescriptorRepresentation().with { @@ -95,7 +82,6 @@ class EntityDescriptorEnversVersioningTests extends Specification { entityDescriptorRepository, txMgr, entityManager) - then: entityDescriptorHistory.size() == 2 getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' @@ -103,6 +89,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].emailAddresses[0].address == 'test@test' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() when: representation = new EntityDescriptorRepresentation().with { @@ -122,6 +109,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].emailAddresses[0].address == 'test@test.com' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).principalUserName == 'anonymous' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 2).sort() == expectedModifiedPersistentEntities.sort() //Also make sure we have our original revision getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' @@ -134,6 +122,13 @@ class EntityDescriptorEnversVersioningTests extends Specification { @DirtiesContext def "test versioning with organization"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + Organization.name, + OrganizationDisplayName.name, + OrganizationName.name, + OrganizationURL.name] + when: EntityDescriptor ed = new EntityDescriptor() def representation = new EntityDescriptorRepresentation().with { @@ -151,6 +146,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.URLs[0].value == 'http://org.edu' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() when: representation = new EntityDescriptorRepresentation().with { @@ -168,6 +164,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.URLs[0].value == 'http://org2.edu' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() //Check the original revision is intact getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.organizationNames[0].value == 'org' @@ -179,6 +176,10 @@ class EntityDescriptorEnversVersioningTests extends Specification { @DirtiesContext def "test versioning with sp sso descriptor"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + NameIDFormat.name, + SPSSODescriptor.name] when: EntityDescriptor ed = new EntityDescriptor() def representation = new EntityDescriptorRepresentation().with { @@ -201,6 +202,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[1] == null getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() when: representation = new EntityDescriptorRepresentation().with { @@ -212,11 +214,6 @@ class EntityDescriptorEnversVersioningTests extends Specification { it } - //Currently this is the ONLY way to let envers recognize update revision type for EntityDescriptor type - //when modifying SPSSODescriptor inside RoleDescriptors collection. This date "touch" would need to be encapsulated - //perhaps in JPAEntityDescriptorServiceImpl#buildDescriptorFromRepresentation - ed.modifiedDate = LocalDateTime.now() - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, @@ -229,6 +226,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[1] == 'urn:oasis:names:tc:SAML:2.0:protocol' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() //Check the original revision is intact getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].nameIDFormats[0].format == 'format' @@ -240,6 +238,17 @@ class EntityDescriptorEnversVersioningTests extends Specification { @DirtiesContext def "test versioning with uiInfo"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + Description.name, + DisplayName.name, + SPSSODescriptor.name, + Extensions.name, + InformationURL.name, + Logo.name, + PrivacyStatementURL.name, + UIInfo.name] + when: EntityDescriptor ed = new EntityDescriptor() def representation = new EntityDescriptorRepresentation().with { @@ -272,6 +281,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { uiinfo.logos[0].URL == 'http://logo' uiinfo.logos[0].height == 20 uiinfo.logos[0].width == 30 + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() when: representation = new EntityDescriptorRepresentation().with { @@ -306,6 +316,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { uiinfo.logos[0].URL == 'http://logo.updated' uiinfo.logos[0].height == 30 uiinfo.logos[0].width == 40 + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() //Check the initial revision is still intact uiinfoInitialRevision.displayNames[0].value == 'Initial display name' @@ -319,6 +330,14 @@ class EntityDescriptorEnversVersioningTests extends Specification { @DirtiesContext def "test versioning with security"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + KeyDescriptor.name, + KeyInfo.name, + SPSSODescriptor.name, + X509Certificate.name, + X509Data.name] + when: EntityDescriptor ed = new EntityDescriptor() def representation = new EntityDescriptorRepresentation().with { @@ -349,6 +368,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { keyDescriptor.name == 'sign' keyDescriptor.usageType == 'signing' x509cert.value == 'signingValue' + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() when: representation = new EntityDescriptorRepresentation().with { @@ -393,6 +413,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { keyDescriptor_second2.usageType == 'encryption' x509cert_second1.value == 'signingValue' x509cert_second2.value == 'encryptionValue' + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() //Check the initial version is intact spssoDescriptor.keyDescriptors.size() == 1 @@ -404,6 +425,11 @@ class EntityDescriptorEnversVersioningTests extends Specification { @DirtiesContext def "test versioning ACS"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + SPSSODescriptor.name, + AssertionConsumerService.name] + when: EntityDescriptor ed = new EntityDescriptor() def representation = new EntityDescriptorRepresentation().with { @@ -426,6 +452,8 @@ class EntityDescriptorEnversVersioningTests extends Specification { !acs.isDefault() acs.location == 'http://acs' acs.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + when: representation = new EntityDescriptorRepresentation().with { @@ -457,6 +485,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { acs1.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS' acs2.location == 'http://acs2' acs2.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact' + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() //Check the initial revision is intact !acs.isDefault() @@ -466,6 +495,11 @@ class EntityDescriptorEnversVersioningTests extends Specification { @DirtiesContext def "test versioning logout"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + SPSSODescriptor.name, + SingleLogoutService.name] + when: EntityDescriptor ed = new EntityDescriptor() def representation = new EntityDescriptorRepresentation().with { @@ -486,6 +520,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { entityDescriptorHistory.size() == 1 slo.location == 'http://logout' slo.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() when: representation = new EntityDescriptorRepresentation().with { @@ -514,6 +549,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { slo1.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS' slo2.location == 'http://logout2' slo2.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact' + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() //Check the initial version is intact slo.location == 'http://logout' @@ -522,6 +558,14 @@ class EntityDescriptorEnversVersioningTests extends Specification { @DirtiesContext def "test versioning relying party overrides"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + EntityAttributes.name, + Extensions.name, + Attribute.name, + XSBoolean.name, + XSString.name] + when: EntityDescriptor ed = new EntityDescriptor() def representation = new EntityDescriptorRepresentation().with { @@ -541,6 +585,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { entityDescriptorHistory.size() == 1 attrs.attributes[0].attributeValues[0].storedValue == 'true' attrs.attributes[1].attributeValues[0].xsStringvalue == 'attr1' + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() when: representation = new EntityDescriptorRepresentation().with { @@ -549,11 +594,6 @@ class EntityDescriptorEnversVersioningTests extends Specification { it } - //Currently this is the ONLY way to let envers recognize update revision type for EntityDescriptor type - //when modifying attributes. This date "touch" would need to be encapsulated - //perhaps in JPAEntityDescriptorServiceImpl#buildDescriptorFromRepresentation - ed.modifiedDate = LocalDateTime.now() - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, @@ -564,10 +604,15 @@ class EntityDescriptorEnversVersioningTests extends Specification { //Initial revision attrs = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + expectedModifiedPersistentEntities = [EntityDescriptor.name, + EntityAttributes.name, + Attribute.name, + XSString.name] then: entityDescriptorHistory.size() == 2 attrs2.attributes[0].attributeValues[0].xsStringvalue == 'attr1' attrs2.attributes[0].attributeValues[1].xsStringvalue == 'attr2' + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() //Check the initial revision is intact attrs.attributes[0].attributeValues[0].storedValue == 'true' diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy index 6e9b5981f..3d2632f6b 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy @@ -54,4 +54,8 @@ class EnversTestsSupport { static getRevisionEntityForRevisionIndex(List revHistory, int revIndex) { revHistory[revIndex][1] } + + static getModifiedEntityNames(List revHistory, int revIndex) { + getRevisionEntityForRevisionIndex(revHistory, revIndex).modifiedEntityNames + } } From 69a404a31f488e15ccb57db94b1c805719b1277f Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Wed, 5 Jun 2019 12:07:06 -0400 Subject: [PATCH 031/112] WIP1 --- .../admin/ui/configuration/DevConfig.groovy | 4 +-- .../EntitiesVersioningConfiguration.java | 12 ++++--- .../EnversEntityDescriptorVersionService.java | 32 +++++++++++++++++++ 3 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy index 6f853e089..b49d5b858 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy @@ -162,10 +162,10 @@ class DevConfig { }) } - @Profile('dev-ed-versioning') + /*@Profile('dev-ed-versioning') @Bean EntityDescriptorVersionService stubEntityDescriptorVersionService(EntityDescriptorService entityDescriptorService, EntityDescriptorRepository entityDescriptorRepository) { return EntityDescriptorVersionService.stubImpl(entityDescriptorService, entityDescriptorRepository) - } + }*/ } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java index 5f1b64b46..75dfb5ded 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java @@ -1,15 +1,17 @@ package edu.internet2.tier.shibboleth.admin.ui.configuration; -import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService; import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorVersionService; +import edu.internet2.tier.shibboleth.admin.ui.service.EnversEntityDescriptorVersionService; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import javax.persistence.EntityManager; + @Configuration public class EntitiesVersioningConfiguration { - //@Bean - EntityDescriptorVersionService entityDescriptorVersionService(EntityDescriptorService entityDescriptorService) { - //TODO create real impl when available - return null; + @Bean + EntityDescriptorVersionService entityDescriptorVersionService(EntityManager entityManager) { + return new EnversEntityDescriptorVersionService(entityManager); } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java new file mode 100644 index 000000000..c5cbabc27 --- /dev/null +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java @@ -0,0 +1,32 @@ +package edu.internet2.tier.shibboleth.admin.ui.service; + +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation; +import edu.internet2.tier.shibboleth.admin.ui.domain.versioning.Version; +import org.hibernate.envers.AuditReader; +import org.hibernate.envers.AuditReaderFactory; + +import javax.persistence.EntityManager; +import java.util.List; + +/** + * Hibernate Envers based implementation of {@link EntityDescriptorVersionService}. + */ +public class EnversEntityDescriptorVersionService implements EntityDescriptorVersionService { + + private AuditReader auditReader; + + public EnversEntityDescriptorVersionService(EntityManager em) { + + this.auditReader = AuditReaderFactory.get(em); + } + + @Override + public List findVersionsForEntityDescriptor(String resourceId) { + return null; + } + + @Override + public EntityDescriptorRepresentation findSpecificVersionOfEntityDescriptor(String resourceId, String versionId) { + return null; + } +} From 50896d7f5f373efe2496e4400115c4782e2fcc3c Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Wed, 5 Jun 2019 16:07:44 -0400 Subject: [PATCH 032/112] SHIBUI-1262(1306) WIP --- .../EntitiesVersioningConfiguration.java | 6 +- .../envers/PrincipalAwareRevisionEntity.java | 4 ++ .../EnversEntityDescriptorVersionService.java | 33 +++++++++- ...EntityDescriptorVersionServiceTests.groovy | 63 +++++++++++++++++++ 4 files changed, 102 insertions(+), 4 deletions(-) create mode 100644 backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java index 75dfb5ded..b73448e5e 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java @@ -6,12 +6,16 @@ import org.springframework.context.annotation.Configuration; import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; @Configuration public class EntitiesVersioningConfiguration { + @PersistenceContext + private EntityManager entityManager; + @Bean - EntityDescriptorVersionService entityDescriptorVersionService(EntityManager entityManager) { + EntityDescriptorVersionService entityDescriptorVersionService() { return new EnversEntityDescriptorVersionService(entityManager); } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/PrincipalAwareRevisionEntity.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/PrincipalAwareRevisionEntity.java index 88e20179d..6a2847b38 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/PrincipalAwareRevisionEntity.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/PrincipalAwareRevisionEntity.java @@ -18,4 +18,8 @@ public class PrincipalAwareRevisionEntity extends DefaultTrackingModifiedEntitiesRevisionEntity { private String principalUserName; + + public String idAsString() { + return String.valueOf(getId()); + } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java index c5cbabc27..123940f35 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java @@ -1,12 +1,22 @@ package edu.internet2.tier.shibboleth.admin.ui.service; +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.envers.PrincipalAwareRevisionEntity; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; +import org.hibernate.envers.RevisionEntity; +import org.hibernate.envers.query.AuditEntity; +import org.springframework.data.jpa.repository.JpaContext; import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** * Hibernate Envers based implementation of {@link EntityDescriptorVersionService}. @@ -15,14 +25,31 @@ public class EnversEntityDescriptorVersionService implements EntityDescriptorVer private AuditReader auditReader; - public EnversEntityDescriptorVersionService(EntityManager em) { + private EntityManager entityManager; - this.auditReader = AuditReaderFactory.get(em); + public EnversEntityDescriptorVersionService(EntityManager entityManager) { + this.entityManager = entityManager; } @Override public List findVersionsForEntityDescriptor(String resourceId) { - return null; + List revs = AuditReaderFactory.get(entityManager).createQuery() + .forRevisionsOfEntity(EntityDescriptor.class, false, false) + .add(AuditEntity.property("resourceId").eq(resourceId)) + .getResultList(); + + //TODO: sort + Object revEntities = revs.stream() + .map(it -> (PrincipalAwareRevisionEntity)((Object[])it)[1]) + .map(it -> { + return new Version(((PrincipalAwareRevisionEntity) it).idAsString(), + ((PrincipalAwareRevisionEntity) it).getPrincipalUserName(), + ((PrincipalAwareRevisionEntity) it).getRevisionDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); + }) + .collect(Collectors.toList()); + + + return (List)revEntities; } @Override diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy new file mode 100644 index 000000000..426c5eb6e --- /dev/null +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy @@ -0,0 +1,63 @@ +package edu.internet2.tier.shibboleth.admin.ui.service + +import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.EntitiesVersioningConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration +import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation +import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository +import edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.autoconfigure.domain.EntityScan +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest +import org.springframework.data.jpa.repository.config.EnableJpaRepositories +import org.springframework.test.context.ContextConfiguration +import org.springframework.transaction.PlatformTransactionManager +import spock.lang.Specification + +import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.* +import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction + +@DataJpaTest +@ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration, EntitiesVersioningConfiguration]) +@EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) +@EntityScan("edu.internet2.tier.shibboleth.admin.ui") +class EnversEntityDescriptorVersionServiceTests extends Specification { + + @Autowired + EntityDescriptorVersionService entityDescriptorVersionService + + @Autowired + EntityDescriptorRepository entityDescriptorRepository + + @Autowired + EntityDescriptorService entityDescriptorService + + @Autowired + PlatformTransactionManager txMgr + + def "temp test"() { + def representation = new EntityDescriptorRepresentation().with { + it.contacts = [new ContactRepresentation(type: 'administrative', name: 'name', emailAddress: 'test@test')] + it + } + EntityDescriptor ed = entityDescriptorService.createDescriptorFromRepresentation(representation) + ed = doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(ed) + } + entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) + + ed.entityID = "Entity ID" + ed = doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(ed) + } + + def versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) + + expect: + true + } +} From 21ea1fd2898061308e3a1388f9dd402a96a5d242 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Thu, 6 Jun 2019 08:56:49 -0400 Subject: [PATCH 033/112] Fix tests --- .../TestEntityDescriptorVersioningConfiguration.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestEntityDescriptorVersioningConfiguration.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestEntityDescriptorVersioningConfiguration.groovy index f3d1346e0..06d16ca31 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestEntityDescriptorVersioningConfiguration.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestEntityDescriptorVersioningConfiguration.groovy @@ -17,7 +17,7 @@ class TestEntityDescriptorVersioningConfiguration { @Autowired EntityDescriptorService entityDescriptorService - @Bean + /*@Bean EntityDescriptorVersionService stubEntityDescriptorVersionService() { return new EntityDescriptorVersionService() { @Override @@ -31,6 +31,6 @@ class TestEntityDescriptorVersioningConfiguration { return entityDescriptorService.createRepresentationFromDescriptor(new TestObjectGenerator().buildEntityDescriptor()) } } - } + }*/ } From be2090de352e5ff7e4ae479913bc845a6176d5d7 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Thu, 6 Jun 2019 10:10:55 -0400 Subject: [PATCH 034/112] SHIBUI-1262(1306) --- .../EnversEntityDescriptorVersionService.java | 22 +++++--- ...tyDescriptorVersioningConfiguration.groovy | 36 ------------ ...EntityDescriptorVersionServiceTests.groovy | 55 ++++++++++++------- 3 files changed, 48 insertions(+), 65 deletions(-) delete mode 100644 backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestEntityDescriptorVersioningConfiguration.groovy diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java index 123940f35..fced0645f 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java @@ -15,16 +15,18 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.util.Arrays; +import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; +import static java.util.Comparator.comparing; +import static java.util.stream.Collectors.*; + /** * Hibernate Envers based implementation of {@link EntityDescriptorVersionService}. */ public class EnversEntityDescriptorVersionService implements EntityDescriptorVersionService { - private AuditReader auditReader; - private EntityManager entityManager; public EnversEntityDescriptorVersionService(EntityManager entityManager) { @@ -38,18 +40,20 @@ public List findVersionsForEntityDescriptor(String resourceId) { .add(AuditEntity.property("resourceId").eq(resourceId)) .getResultList(); - //TODO: sort - Object revEntities = revs.stream() - .map(it -> (PrincipalAwareRevisionEntity)((Object[])it)[1]) + Object listOfVersions = revs.stream() + .map(it -> ((Object[])it)[1]) .map(it -> { return new Version(((PrincipalAwareRevisionEntity) it).idAsString(), ((PrincipalAwareRevisionEntity) it).getPrincipalUserName(), - ((PrincipalAwareRevisionEntity) it).getRevisionDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); + ((PrincipalAwareRevisionEntity) it).getRevisionDate() + .toInstant() + .atZone(ZoneId.systemDefault()) + .toLocalDateTime()); }) - .collect(Collectors.toList()); - + .sorted(comparing(Version::getDate)) + .collect(toList()); - return (List)revEntities; + return (List)listOfVersions; } @Override diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestEntityDescriptorVersioningConfiguration.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestEntityDescriptorVersioningConfiguration.groovy deleted file mode 100644 index 06d16ca31..000000000 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestEntityDescriptorVersioningConfiguration.groovy +++ /dev/null @@ -1,36 +0,0 @@ -package edu.internet2.tier.shibboleth.admin.ui.configuration - -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.service.EntityDescriptorService -import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorVersionService -import edu.internet2.tier.shibboleth.admin.ui.util.TestObjectGenerator -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.context.annotation.Bean -import org.springframework.context.annotation.Configuration - -import java.time.LocalDateTime - -@Configuration -class TestEntityDescriptorVersioningConfiguration { - - @Autowired - EntityDescriptorService entityDescriptorService - - /*@Bean - EntityDescriptorVersionService stubEntityDescriptorVersionService() { - return new EntityDescriptorVersionService() { - @Override - List findVersionsForEntityDescriptor(String resourceId) { - return [new Version(id: '1', creator: 'kramer', date: LocalDateTime.now().minusDays(3)), - new Version(id: '2', creator: 'newman', date: LocalDateTime.now())] - } - - @Override - EntityDescriptorRepresentation findSpecificVersionOfEntityDescriptor(String resourceId, String versionId) { - return entityDescriptorService.createRepresentationFromDescriptor(new TestObjectGenerator().buildEntityDescriptor()) - } - } - }*/ - -} diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy index 426c5eb6e..0114e2ffb 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy @@ -1,24 +1,19 @@ package edu.internet2.tier.shibboleth.admin.ui.service -import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration -import edu.internet2.tier.shibboleth.admin.ui.configuration.EntitiesVersioningConfiguration -import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration -import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration -import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.* import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository -import edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.domain.EntityScan import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest import org.springframework.data.jpa.repository.config.EnableJpaRepositories +import org.springframework.test.annotation.DirtiesContext import org.springframework.test.context.ContextConfiguration import org.springframework.transaction.PlatformTransactionManager import spock.lang.Specification -import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.* +import java.time.LocalDateTime + import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction @DataJpaTest @@ -39,25 +34,45 @@ class EnversEntityDescriptorVersionServiceTests extends Specification { @Autowired PlatformTransactionManager txMgr - def "temp test"() { - def representation = new EntityDescriptorRepresentation().with { - it.contacts = [new ContactRepresentation(type: 'administrative', name: 'name', emailAddress: 'test@test')] - it - } - EntityDescriptor ed = entityDescriptorService.createDescriptorFromRepresentation(representation) + @DirtiesContext + def "versioning service returns correct number of versions sorted by modified date in natural order"() { + when: 'Initial version' + EntityDescriptor ed = new EntityDescriptor(entityID: 'ed', serviceProviderName: 'SP1') ed = doInExplicitTransaction(txMgr) { entityDescriptorRepository.save(ed) } - entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) + def versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) - ed.entityID = "Entity ID" + then: + versions.size() == 1 + versions[0].id + versions[0].creator + versions[0].date < LocalDateTime.now() + + when: 'Third version' + ed.serviceProviderName = 'SP2' ed = doInExplicitTransaction(txMgr) { entityDescriptorRepository.save(ed) } + versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) - def versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) + then: + versions.size() == 2 + versions[0].id && versions[1].id + versions[0].creator && versions[1].creator + versions[0].date < versions[1].date + + when: 'Third version' + ed.serviceProviderName = 'SP3' + ed = doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(ed) + } + versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) - expect: - true + then: + versions.size() == 3 + versions[0].id && versions[1].id && versions[2].id + versions[0].creator && versions[1].creator && versions[2].creator + (versions[0].date < versions[1].date) && (versions[1].date < versions[2].date) } } From 812d90e2fdc73246d370bf373bbfbbcc77876e12 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Thu, 6 Jun 2019 10:11:59 -0400 Subject: [PATCH 035/112] Polishing --- .../ui/service/EnversEntityDescriptorVersionServiceTests.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy index 0114e2ffb..adc723b83 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy @@ -49,7 +49,7 @@ class EnversEntityDescriptorVersionServiceTests extends Specification { versions[0].creator versions[0].date < LocalDateTime.now() - when: 'Third version' + when: 'Second version' ed.serviceProviderName = 'SP2' ed = doInExplicitTransaction(txMgr) { entityDescriptorRepository.save(ed) From 714c1edb9b8283826f78bd6bce812931f737649a Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Thu, 6 Jun 2019 07:35:35 -0700 Subject: [PATCH 036/112] SHIBUI-1267 fixed tests --- .../domain/component/editor-nav.component.spec.ts | 3 +-- .../container/dashboard-providers-list.component.spec.ts | 2 ++ .../container/dashboard-providers-list.component.ts | 5 +++-- .../container/dashboard-resolvers-list.component.spec.ts | 8 -------- ui/src/app/wizard/reducer/index.spec.ts | 6 +++--- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/ui/src/app/metadata/domain/component/editor-nav.component.spec.ts b/ui/src/app/metadata/domain/component/editor-nav.component.spec.ts index 3a93f2f8c..3d6627a4e 100644 --- a/ui/src/app/metadata/domain/component/editor-nav.component.spec.ts +++ b/ui/src/app/metadata/domain/component/editor-nav.component.spec.ts @@ -35,8 +35,7 @@ describe('Editor Nav Component', () => { id: 'common', label: 'Common Attributes', index: 2, - initialValues: [], - schema: 'assets/schema/provider/filebacked-http-common.schema.json' + initialValues: [] }; beforeEach(async(() => { diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.spec.ts b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.spec.ts index 95e8537f0..1a8c447e3 100644 --- a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.spec.ts +++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.spec.ts @@ -15,6 +15,7 @@ import { ProviderItemComponent } from '../component/provider-item.component'; import { FileBackedHttpMetadataResolver } from '../../domain/entity'; import { MockI18nModule } from '../../../../testing/i18n.stub'; import { CustomDatePipe } from '../../../shared/pipe/date.pipe'; +import { Observable, of } from 'rxjs'; describe('Dashboard Providers List Page', () => { @@ -61,6 +62,7 @@ describe('Dashboard Providers List Page', () => { modal = TestBed.get(NgbModal); spyOn(store, 'dispatch').and.callThrough(); + spyOn(store, 'select').and.returnValues(of([]), of({'foo': true})); }); it('should compile', () => { diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts index 35ece7de0..de7c3644f 100644 --- a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts +++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts @@ -9,6 +9,7 @@ import { getOpenProviders } from '../reducer'; import { ToggleEntityDisplay } from '../action/manager.action'; import { map } from 'rxjs/operators'; import { ChangeProviderOrderUp, ChangeProviderOrderDown } from '../../provider/action/collection.action'; +import { Metadata } from '../../domain/domain.type'; @Component({ selector: 'dashboard-providers-list', @@ -17,7 +18,7 @@ import { ChangeProviderOrderUp, ChangeProviderOrderDown } from '../../provider/a export class DashboardProvidersListComponent implements OnInit { - providers$: Observable; + providers$: Observable; providersOpen$: Observable<{ [key: string]: boolean }>; constructor( @@ -26,7 +27,7 @@ export class DashboardProvidersListComponent implements OnInit { ) { } ngOnInit(): void { - this.providers$ = this.store.select(getOrderedProviders) as Observable; + this.providers$ = this.store.select(getOrderedProviders); this.providersOpen$ = this.store.select(getOpenProviders); } diff --git a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts index d4e81b761..41a8bd30e 100644 --- a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts +++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts @@ -6,7 +6,6 @@ import { StoreModule, Store, combineReducers } from '@ngrx/store'; import { NgbPaginationModule, NgbModal, NgbModalModule, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import * as fromDashboard from '../reducer'; import { ProviderSearchComponent } from '../component/provider-search.component'; -import { EntityItemComponent } from '../component/entity-item.component'; import { DeleteDialogComponent } from '../component/delete-dialog.component'; import { RouterStub } from '../../../../testing/router.stub'; import { NgbModalStub } from '../../../../testing/modal.stub'; @@ -100,13 +99,6 @@ describe('Dashboard Resolvers List Page', () => { }); }); - describe('openPreviewDialog method', () => { - it('should fire a redux action', () => { - instance.openPreviewDialog(resolver); - expect(store.dispatch).toHaveBeenCalled(); - }); - }); - describe('search method', () => { it('should fire a redux action', () => { instance.search(); diff --git a/ui/src/app/wizard/reducer/index.spec.ts b/ui/src/app/wizard/reducer/index.spec.ts index dd407ba01..5f72dd71f 100644 --- a/ui/src/app/wizard/reducer/index.spec.ts +++ b/ui/src/app/wizard/reducer/index.spec.ts @@ -5,12 +5,12 @@ describe('wizard index selectors', () => { describe('getSchema method', () => { it('should return the schema by index name', () => { expect( - selectors.getSchemaPath('common', FileBackedHttpMetadataProviderWizard) - ).toBe(FileBackedHttpMetadataProviderWizard.steps[0].schema); + selectors.getSchemaPath(FileBackedHttpMetadataProviderWizard) + ).toBe(FileBackedHttpMetadataProviderWizard.schema); }); it('should return nothing if no schema is found', () => { expect( - selectors.getSchemaPath('common', null) + selectors.getSchemaPath(null) ).toBeFalsy(); }); }); From 44dea7b8b8d759a720f8a723c06c587385f86c1f Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Thu, 6 Jun 2019 09:05:57 -0700 Subject: [PATCH 037/112] SHIBUI-1267 unit tests --- .../metadata-configuration.component.spec.ts | 60 +++++++++++++++++ .../metadata-configuration.component.ts | 6 -- .../container/configuration.component.spec.ts | 64 +++++++++++++++++++ .../container/configuration.component.ts | 3 - .../reducer/configuration.reducer.spec.ts | 51 +++++++++++++++ .../configuration/reducer/index.spec.ts | 19 ++++++ .../domain/model/metadata-resolver.ts | 2 + 7 files changed, 196 insertions(+), 9 deletions(-) create mode 100644 ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts create mode 100644 ui/src/app/metadata/configuration/reducer/index.spec.ts diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.spec.ts b/ui/src/app/metadata/configuration/component/metadata-configuration.component.spec.ts index e69de29bb..f26c8d65c 100644 --- a/ui/src/app/metadata/configuration/component/metadata-configuration.component.spec.ts +++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.spec.ts @@ -0,0 +1,60 @@ +import { Component, ViewChild, Input } from '@angular/core'; +import { TestBed, async, ComponentFixture } from '@angular/core/testing'; +import { RouterTestingModule } from '@angular/router/testing'; +import { MetadataConfigurationComponent } from './metadata-configuration.component'; + +import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; +import { MetadataConfiguration } from '../model/metadata-configuration'; +import { Property } from '../../domain/model/property'; +import { MockI18nModule } from '../../../../testing/i18n.stub'; + +@Component({ + selector: 'object-property', + template: `` +}) +class ObjectPropertyComponent { + @Input() property: Property; +} + +@Component({ + template: ` + + ` +}) +class TestHostComponent { + @ViewChild(MetadataConfigurationComponent) + public componentUnderTest: MetadataConfigurationComponent; + + configuration: MetadataConfiguration = {sections: []}; +} + +describe('Metadata Configuration Component', () => { + + let fixture: ComponentFixture; + let instance: TestHostComponent; + let app: MetadataConfigurationComponent; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + NgbDropdownModule, + MockI18nModule, + RouterTestingModule + ], + declarations: [ + MetadataConfigurationComponent, + ObjectPropertyComponent, + TestHostComponent + ], + }).compileComponents(); + + fixture = TestBed.createComponent(TestHostComponent); + instance = fixture.componentInstance; + app = instance.componentUnderTest; + fixture.detectChanges(); + })); + + it('should accept a configuration input', async(() => { + expect(app).toBeTruthy(); + })); +}); diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts b/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts index 6b3089f78..732b920d3 100644 --- a/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts +++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts @@ -1,7 +1,5 @@ import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; import { MetadataConfiguration } from '../model/metadata-configuration'; -import { Property } from '../../domain/model/property'; -import Section from '../model/section'; @Component({ selector: 'metadata-configuration', @@ -13,8 +11,4 @@ export class MetadataConfigurationComponent { @Input() configuration: MetadataConfiguration; constructor() { } - - edit(section: Section): void { - console.log(section); - } } diff --git a/ui/src/app/metadata/configuration/container/configuration.component.spec.ts b/ui/src/app/metadata/configuration/container/configuration.component.spec.ts index e69de29bb..a61db7b7c 100644 --- a/ui/src/app/metadata/configuration/container/configuration.component.spec.ts +++ b/ui/src/app/metadata/configuration/container/configuration.component.spec.ts @@ -0,0 +1,64 @@ +import { Component, ViewChild, Input } from '@angular/core'; +import { TestBed, async, ComponentFixture } from '@angular/core/testing'; +import { RouterTestingModule } from '@angular/router/testing'; +import { StoreModule, combineReducers } from '@ngrx/store'; +import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; + +import { MetadataConfiguration } from '../model/metadata-configuration'; +import { ConfigurationComponent } from './configuration.component'; +import * as fromConfiguration from '../reducer'; +import { MockI18nModule } from '../../../../testing/i18n.stub'; + +@Component({ + selector: 'metadata-configuration', + template: `` +}) +class MetadataConfigurationComponent { + @Input() configuration: MetadataConfiguration; +} + +@Component({ + template: ` + + ` +}) +class TestHostComponent { + @ViewChild(ConfigurationComponent) + public componentUnderTest: ConfigurationComponent; + + configuration: MetadataConfiguration = { sections: [] }; +} + +describe('Metadata Configuration Page Component', () => { + + let fixture: ComponentFixture; + let instance: TestHostComponent; + let app: ConfigurationComponent; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + NgbDropdownModule, + StoreModule.forRoot({ + 'metadata-configuration': combineReducers(fromConfiguration.reducers), + }), + MockI18nModule, + RouterTestingModule + ], + declarations: [ + ConfigurationComponent, + MetadataConfigurationComponent, + TestHostComponent + ], + }).compileComponents(); + + fixture = TestBed.createComponent(TestHostComponent); + instance = fixture.componentInstance; + app = instance.componentUnderTest; + fixture.detectChanges(); + })); + + it('should load metadata objects', async(() => { + expect(app).toBeTruthy(); + })); +}); diff --git a/ui/src/app/metadata/configuration/container/configuration.component.ts b/ui/src/app/metadata/configuration/container/configuration.component.ts index eb52f60ba..e22f23861 100644 --- a/ui/src/app/metadata/configuration/container/configuration.component.ts +++ b/ui/src/app/metadata/configuration/container/configuration.component.ts @@ -5,7 +5,6 @@ import { ActivatedRoute } from '@angular/router'; import * as fromConfiguration from '../reducer'; import { MetadataConfiguration } from '../model/metadata-configuration'; -import { METADATA_SOURCE_EDITOR } from '../../resolver/wizard-definition'; import { takeUntil, map } from 'rxjs/operators'; import { LoadMetadataRequest, ClearConfiguration } from '../action/configuration.action'; @@ -30,8 +29,6 @@ export class ConfigurationComponent implements OnDestroy { takeUntil(this.ngUnsubscribe), map(params => new LoadMetadataRequest({id: params.id, type: params.type})) ).subscribe(store); - - this.configuration$.subscribe(c => console.log(c)); } ngOnDestroy() { diff --git a/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts b/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts new file mode 100644 index 000000000..b4d485fd0 --- /dev/null +++ b/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts @@ -0,0 +1,51 @@ +import { reducer } from './configuration.reducer'; +import * as fromConfig from './configuration.reducer'; +import * as actions from '../action/configuration.action'; +import { MetadataSourceEditor } from '../../domain/model/wizards/metadata-source-editor'; +import { SCHEMA } from '../../../../testing/form-schema.stub'; +import { MetadataResolver } from '../../domain/model'; + +describe('Configuration Reducer', () => { + const initialState: fromConfig.State = { ...fromConfig.initialState }; + + describe('undefined action', () => { + it('should return the default state', () => { + const result = reducer(undefined, {} as any); + + expect(result).toEqual(initialState); + }); + }); + + describe('SET_DEFINITION action', () => { + it('should set the state definition', () => { + const definition = new MetadataSourceEditor(); + const action = new actions.SetDefinition(definition); + const result = reducer(initialState, action); + + expect(result).toEqual({ ...initialState, definition }); + }); + }); + + describe('SET_SCHEMA action', () => { + it('should set the state schema', () => { + const action = new actions.SetSchema(SCHEMA); + const result = reducer(initialState, action); + + expect(result).toEqual({ ...initialState, schema: SCHEMA }); + }); + }); + + describe('SET_METADATA action', () => { + it('should set the state metadata model', () => { + const model: MetadataResolver = { + id: 'foo', + serviceProviderName: 'foo', + '@type': 'MetadataResolver' + }; + const action = new actions.SetMetadata(model as MetadataResolver); + const result = reducer(initialState, action); + + expect(result).toEqual({ ...initialState, model }); + }); + }); +}); diff --git a/ui/src/app/metadata/configuration/reducer/index.spec.ts b/ui/src/app/metadata/configuration/reducer/index.spec.ts new file mode 100644 index 000000000..5a675621c --- /dev/null +++ b/ui/src/app/metadata/configuration/reducer/index.spec.ts @@ -0,0 +1,19 @@ +import { getConfigurationSectionsFn } from './index'; +import { SCHEMA as schema } from '../../../../testing/form-schema.stub'; +import { MetadataSourceEditor } from '../../domain/model/wizards/metadata-source-editor'; + +describe('Configuration Reducer', () => { + const model = { + name: 'foo', + '@type': 'MetadataResolver' + }; + + const definition = new MetadataSourceEditor(); + + describe('getConfigurationSectionsFn', () => { + it('should parse the schema, definition, and model into a MetadataConfiguration', () => { + const config = getConfigurationSectionsFn(model, definition, schema); + expect(config.sections).toBeDefined(); + }); + }); +}); diff --git a/ui/src/app/metadata/domain/model/metadata-resolver.ts b/ui/src/app/metadata/domain/model/metadata-resolver.ts index 01505cff5..e97c08d07 100644 --- a/ui/src/app/metadata/domain/model/metadata-resolver.ts +++ b/ui/src/app/metadata/domain/model/metadata-resolver.ts @@ -25,4 +25,6 @@ export interface MetadataResolver extends MetadataBase { serviceEnabled?: boolean; relyingPartyOverrides?: RelyingPartyOverrides; attributeRelease?: string[]; + + [property: string]: unknown; } From 1cd26348960682c47a37f2f8432ed28ab6a5d63f Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Thu, 6 Jun 2019 09:58:12 -0700 Subject: [PATCH 038/112] SHIBUI-nojira fixed issue with app locking up on navigation to editors --- ui/src/app/metadata/domain/domain.util.ts | 1 + .../container/provider-edit.component.spec.ts | 8 -------- .../provider/container/provider-edit.component.ts | 6 ------ .../provider/container/provider-select.component.ts | 12 +++++++++--- .../provider/container/provider.component.spec.ts | 13 +------------ .../provider/container/provider.component.ts | 4 +--- .../metadata/provider/effect/collection.effect.ts | 8 ++++---- .../metadata/provider/reducer/collection.reducer.ts | 2 +- .../resolver/container/resolver-edit.component.ts | 6 ------ 9 files changed, 17 insertions(+), 43 deletions(-) diff --git a/ui/src/app/metadata/domain/domain.util.ts b/ui/src/app/metadata/domain/domain.util.ts index 2aeeac247..1080d5237 100644 --- a/ui/src/app/metadata/domain/domain.util.ts +++ b/ui/src/app/metadata/domain/domain.util.ts @@ -7,6 +7,7 @@ import { Metadata } from './domain.type'; export const combineAllFn = (d, p) => [...p, ...d]; export const doesExistFn = (ids, selected) => ids.indexOf(selected) > -1; export const getInCollectionFn = (entities, selectedId) => { + console.log(entities, selectedId); return selectedId && entities[selectedId]; }; export const getEntityIdsFn = list => list.map(entity => entity.entityId); diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts b/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts index 83d6288f0..bd6ed6698 100644 --- a/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts +++ b/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts @@ -97,14 +97,6 @@ describe('Provider Edit Component', () => { expect(app).toBeTruthy(); })); - describe('go method', () => { - it('should route to the given child form', () => { - spyOn(router, 'navigate'); - app.go('common'); - expect(router.navigate).toHaveBeenCalled(); - }); - }); - describe('save method', () => { it('should route to the given child form', () => { app.save(); diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.ts b/ui/src/app/metadata/provider/container/provider-edit.component.ts index a0a3ad0ea..c00da63e2 100644 --- a/ui/src/app/metadata/provider/container/provider-edit.component.ts +++ b/ui/src/app/metadata/provider/container/provider-edit.component.ts @@ -60,8 +60,6 @@ export class ProviderEditComponent implements OnDestroy, CanComponentDeactivate let startIndex$ = this.route.firstChild.params.pipe(map(p => p.form || 'filters')); startIndex$.subscribe(index => this.store.dispatch(new SetIndex(index))); - this.index$.pipe(takeUntil(this.ngUnsubscribe)).subscribe(id => id && this.go(id)); - this.store .select(fromWizard.getCurrentWizardSchema) .pipe(filter(s => !!s)) @@ -77,10 +75,6 @@ export class ProviderEditComponent implements OnDestroy, CanComponentDeactivate this.canFilter$ = this.definition$.pipe(map(def => FilterableProviders.indexOf(def.type) > -1)); } - go(id: string): void { - this.router.navigate(['./', id], { relativeTo: this.route }); - } - ngOnDestroy() { this.clear(); this.ngUnsubscribe.next(); diff --git a/ui/src/app/metadata/provider/container/provider-select.component.ts b/ui/src/app/metadata/provider/container/provider-select.component.ts index baba7f626..a704afcb2 100644 --- a/ui/src/app/metadata/provider/container/provider-select.component.ts +++ b/ui/src/app/metadata/provider/container/provider-select.component.ts @@ -3,7 +3,7 @@ import { Subscription, Observable } from 'rxjs'; import { Store } from '@ngrx/store'; import { ActivatedRoute } from '@angular/router'; -import { map, distinctUntilChanged, skipWhile } from 'rxjs/operators'; +import { map, distinctUntilChanged, skipWhile, filter } from 'rxjs/operators'; import { SelectProviderRequest, ClearProviderSelection } from '../action/collection.action'; import * as fromProviders from '../reducer'; import { MetadataProvider } from '../../domain/model'; @@ -31,9 +31,15 @@ export class ProviderSelectComponent implements OnDestroy { map(params => new SelectProviderRequest(params.providerId)) ).subscribe(store); - this.provider$ = this.store.select(fromProviders.getSelectedProvider).pipe(skipWhile(p => !p)); + this.provider$ = this.store.select(fromProviders.getSelectedProvider).pipe(filter(p => { + console.log(p); + return p; + })); - this.provider$.subscribe(provider => this.setDefinition(provider)); + this.provider$.subscribe(provider => { + console.log(provider); + this.setDefinition(provider); + }); } setDefinition(provider: MetadataProvider): void { diff --git a/ui/src/app/metadata/provider/container/provider.component.spec.ts b/ui/src/app/metadata/provider/container/provider.component.spec.ts index 430c248b2..c04839b6f 100644 --- a/ui/src/app/metadata/provider/container/provider.component.spec.ts +++ b/ui/src/app/metadata/provider/container/provider.component.spec.ts @@ -1,13 +1,10 @@ import { Component, ViewChild } from '@angular/core'; import { TestBed, async, ComponentFixture } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { StoreModule, Store, combineReducers } from '@ngrx/store'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { ProviderComponent } from './provider.component'; -import * as fromRoot from '../reducer'; -import * as fromWizard from '../../../wizard/reducer'; @Component({ template: ` @@ -24,17 +21,12 @@ describe('Provider Component', () => { let fixture: ComponentFixture; let instance: TestHostComponent; let app: ProviderComponent; - let store: Store; beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ NgbDropdownModule, - RouterTestingModule, - StoreModule.forRoot({ - provider: combineReducers(fromRoot.reducers), - wizard: combineReducers(fromWizard.reducers) - }) + RouterTestingModule ], declarations: [ ProviderComponent, @@ -42,9 +34,6 @@ describe('Provider Component', () => { ], }).compileComponents(); - store = TestBed.get(Store); - spyOn(store, 'dispatch'); - fixture = TestBed.createComponent(TestHostComponent); instance = fixture.componentInstance; app = instance.componentUnderTest; diff --git a/ui/src/app/metadata/provider/container/provider.component.ts b/ui/src/app/metadata/provider/container/provider.component.ts index c23dc7066..54757e53d 100644 --- a/ui/src/app/metadata/provider/container/provider.component.ts +++ b/ui/src/app/metadata/provider/container/provider.component.ts @@ -8,7 +8,5 @@ import * as fromProvider from '../reducer'; styleUrls: [] }) export class ProviderComponent { - constructor( - private store: Store - ) {} + constructor() {} } diff --git a/ui/src/app/metadata/provider/effect/collection.effect.ts b/ui/src/app/metadata/provider/effect/collection.effect.ts index 8b19d6d3a..7091e46d8 100644 --- a/ui/src/app/metadata/provider/effect/collection.effect.ts +++ b/ui/src/app/metadata/provider/effect/collection.effect.ts @@ -82,14 +82,14 @@ export class CollectionEffects { ofType(ProviderCollectionActionTypes.SELECT_PROVIDER_REQUEST), map(action => action.payload), debounceTime(500), - switchMap(id => - this.providerService + switchMap(id => { + return this.providerService .find(id) .pipe( map(provider => new SelectProviderSuccess(provider)), catchError(error => of(new SelectProviderError(error))) - ) - ) + ); + }) ); @Effect() diff --git a/ui/src/app/metadata/provider/reducer/collection.reducer.ts b/ui/src/app/metadata/provider/reducer/collection.reducer.ts index de1439821..a04e940af 100644 --- a/ui/src/app/metadata/provider/reducer/collection.reducer.ts +++ b/ui/src/app/metadata/provider/reducer/collection.reducer.ts @@ -23,7 +23,7 @@ export function reducer(state = initialState, action: ProviderCollectionActionsU case ProviderCollectionActionTypes.SELECT_PROVIDER_SUCCESS: { return { ...state, - selectedProviderId: action.payload.id as string + selectedProviderId: action.payload.resourceId }; } diff --git a/ui/src/app/metadata/resolver/container/resolver-edit.component.ts b/ui/src/app/metadata/resolver/container/resolver-edit.component.ts index 6161919f9..f793ef96e 100644 --- a/ui/src/app/metadata/resolver/container/resolver-edit.component.ts +++ b/ui/src/app/metadata/resolver/container/resolver-edit.component.ts @@ -56,8 +56,6 @@ export class ResolverEditComponent implements OnDestroy, CanComponentDeactivate let startIndex$ = this.route.firstChild.params.pipe(map(p => p.form)); startIndex$.pipe(takeUntil(this.ngUnsubscribe)).subscribe(index => this.store.dispatch(new SetIndex(index))); - this.index$.pipe(takeUntil(this.ngUnsubscribe)).subscribe(index => index && this.go(index)); - this.store .select(fromWizard.getCurrentWizardSchema) .pipe(filter(s => !!s)) @@ -67,10 +65,6 @@ export class ResolverEditComponent implements OnDestroy, CanComponentDeactivate this.store.select(fromResolver.getEntityChanges).subscribe(changes => this.latest = changes); } - go(index: string): void { - this.router.navigate(['./', index], { relativeTo: this.route }); - } - ngOnDestroy() { this.clear(); this.ngUnsubscribe.next(); From 841ab6c72da21b55b8083e08484c138800188e45 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Thu, 6 Jun 2019 10:00:39 -0700 Subject: [PATCH 039/112] removed console log statements --- ui/src/app/metadata/domain/domain.util.ts | 1 - .../metadata/provider/container/provider-select.component.ts | 2 -- 2 files changed, 3 deletions(-) diff --git a/ui/src/app/metadata/domain/domain.util.ts b/ui/src/app/metadata/domain/domain.util.ts index 1080d5237..2aeeac247 100644 --- a/ui/src/app/metadata/domain/domain.util.ts +++ b/ui/src/app/metadata/domain/domain.util.ts @@ -7,7 +7,6 @@ import { Metadata } from './domain.type'; export const combineAllFn = (d, p) => [...p, ...d]; export const doesExistFn = (ids, selected) => ids.indexOf(selected) > -1; export const getInCollectionFn = (entities, selectedId) => { - console.log(entities, selectedId); return selectedId && entities[selectedId]; }; export const getEntityIdsFn = list => list.map(entity => entity.entityId); diff --git a/ui/src/app/metadata/provider/container/provider-select.component.ts b/ui/src/app/metadata/provider/container/provider-select.component.ts index a704afcb2..b0c07f6fd 100644 --- a/ui/src/app/metadata/provider/container/provider-select.component.ts +++ b/ui/src/app/metadata/provider/container/provider-select.component.ts @@ -32,12 +32,10 @@ export class ProviderSelectComponent implements OnDestroy { ).subscribe(store); this.provider$ = this.store.select(fromProviders.getSelectedProvider).pipe(filter(p => { - console.log(p); return p; })); this.provider$.subscribe(provider => { - console.log(provider); this.setDefinition(provider); }); } From ccff5b5f89f63815a718300ef00ce338933538c1 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Thu, 6 Jun 2019 13:33:43 -0700 Subject: [PATCH 040/112] shibui-nojira: changed npm install command to use ci --- ui/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/build.gradle b/ui/build.gradle index 7735a3116..64fe2e561 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -9,6 +9,8 @@ node { download = true } +npmInstall.setNpmCommand('ci') + npm_run_build { inputs.dir 'src' outputs.dir 'dist' From 5e16afa3c5d94fff3af0cd3ad18cfa9dd28e6e51 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Fri, 7 Jun 2019 11:04:12 -0400 Subject: [PATCH 041/112] Fixing tests --- .../EntityDescriptorController.java | 4 ---- .../admin/ui/domain/EntityDescriptor.java | 8 ++++++- .../JPAEntityDescriptorServiceImpl.java | 2 +- ...EntityDescriptorVersionServiceTests.groovy | 2 ++ ...JPAEntityDescriptorServiceImplTests.groovy | 22 +++---------------- 5 files changed, 13 insertions(+), 25 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java index 6690d4520..8bb0da84f 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java @@ -6,8 +6,6 @@ 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.repository.RoleRepository; -import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository; 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; @@ -34,11 +32,9 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import javax.annotation.PostConstruct; -import javax.xml.ws.Response; import java.net.URI; import java.util.List; import java.util.stream.Collectors; -import java.util.stream.Stream; @RestController @RequestMapping("/api") diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java index b2054d362..dc036fa7f 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java @@ -26,7 +26,7 @@ @Entity -@EqualsAndHashCode(callSuper = true) +@EqualsAndHashCode(callSuper = true, exclude={"versionModifiedTimestamp"}) @Audited public class EntityDescriptor extends AbstractDescriptor implements org.opensaml.saml.saml2.metadata.EntityDescriptor { private String localId; @@ -39,6 +39,8 @@ public class EntityDescriptor extends AbstractDescriptor implements org.opensaml private String resourceId; + private Long versionModifiedTimestamp; + @OneToOne(cascade = CascadeType.ALL) private Organization organization; @@ -77,6 +79,10 @@ public EntityDescriptor() { this.resourceId = UUID.randomUUID().toString(); } + public void setVersionModifiedTimestamp(Long versionModifiedTimestamp) { + this.versionModifiedTimestamp = versionModifiedTimestamp; + } + //getters and setters @Override public String getID() { diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java index e97c166a3..ca7a8659e 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java @@ -123,7 +123,7 @@ private EntityDescriptor buildDescriptorFromRepresentation(final EntityDescripto //Let envers recognize update revision type for EntityDescriptor type //when modifying Attributes and SPSSODescriptor inside RoleDescriptors collection - ed.setModifiedDate(LocalDateTime.now()); + ed.setVersionModifiedTimestamp(System.currentTimeMillis()); return ed; } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy index adc723b83..7a28fcd7b 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy @@ -10,6 +10,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories import org.springframework.test.annotation.DirtiesContext import org.springframework.test.context.ContextConfiguration import org.springframework.transaction.PlatformTransactionManager +import spock.lang.Ignore import spock.lang.Specification import java.time.LocalDateTime @@ -20,6 +21,7 @@ import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTes @ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration, EntitiesVersioningConfiguration]) @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") +@Ignore class EnversEntityDescriptorVersionServiceTests extends Specification { @Autowired diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests.groovy index eeb22048e..38dfb821e 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests.groovy @@ -4,22 +4,8 @@ import com.fasterxml.jackson.databind.ObjectMapper import edu.internet2.tier.shibboleth.admin.ui.ShibbolethUiApplication import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.CustomPropertiesConfiguration -import edu.internet2.tier.shibboleth.admin.ui.configuration.TestEntityDescriptorVersioningConfiguration -import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor -import edu.internet2.tier.shibboleth.admin.ui.domain.SPSSODescriptor -import edu.internet2.tier.shibboleth.admin.ui.domain.XSAny -import edu.internet2.tier.shibboleth.admin.ui.domain.XSAnyBuilder -import edu.internet2.tier.shibboleth.admin.ui.domain.XSBoolean -import edu.internet2.tier.shibboleth.admin.ui.domain.XSBooleanBuilder -import edu.internet2.tier.shibboleth.admin.ui.domain.XSStringBuilder -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.AssertionConsumerServiceRepresentation -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.LogoutEndpointRepresentation -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.MduiRepresentation -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.OrganizationRepresentation -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.SecurityInfoRepresentation -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ServiceProviderSsoDescriptorRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.* +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.* import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects import edu.internet2.tier.shibboleth.admin.ui.security.repository.RoleRepository import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository @@ -27,7 +13,6 @@ import edu.internet2.tier.shibboleth.admin.ui.security.service.UserService import edu.internet2.tier.shibboleth.admin.ui.util.RandomGenerator import edu.internet2.tier.shibboleth.admin.ui.util.TestObjectGenerator import edu.internet2.tier.shibboleth.admin.util.AttributeUtility -import groovy.json.JsonOutput import org.skyscreamer.jsonassert.JSONAssert import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest @@ -38,10 +23,9 @@ import org.xmlunit.builder.DiffBuilder import org.xmlunit.builder.Input import org.xmlunit.diff.DefaultNodeMatcher import org.xmlunit.diff.ElementSelectors -import spock.lang.Ignore import spock.lang.Specification -@ContextConfiguration(classes=[CoreShibUiConfiguration, CustomPropertiesConfiguration, TestEntityDescriptorVersioningConfiguration]) +@ContextConfiguration(classes=[CoreShibUiConfiguration, CustomPropertiesConfiguration]) @SpringBootTest(classes = ShibbolethUiApplication.class, webEnvironment = SpringBootTest.WebEnvironment.NONE) @PropertySource("classpath:application.yml") class JPAEntityDescriptorServiceImplTests extends Specification { From a179f369c00cc8b786813cb6817bde0eebf0b9eb Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Fri, 7 Jun 2019 11:31:32 -0400 Subject: [PATCH 042/112] SHIBUI-1262 - disable ntity desc versioning tests as they are expencive and cuse OOM - for now --- .../envers/EntityDescriptorEnversVersioningTests.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index acea73775..c71cd55a8 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -16,6 +16,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories import org.springframework.test.annotation.DirtiesContext import org.springframework.test.context.ContextConfiguration import org.springframework.transaction.PlatformTransactionManager +import spock.lang.Ignore import spock.lang.Specification import javax.persistence.EntityManager @@ -31,6 +32,7 @@ import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHE @ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration]) @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") +@Ignore class EntityDescriptorEnversVersioningTests extends Specification { @Autowired From 4678866c1e5a3c9d108d09a873a679326fdfc140 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Fri, 7 Jun 2019 15:02:45 -0400 Subject: [PATCH 043/112] SHIBUI-1262 optimize tests --- .../EntityDescriptorEnversVersioningTests.groovy | 11 +---------- .../ui/repository/envers/EnversTestsSupport.groovy | 6 ++++-- .../EnversEntityDescriptorVersionServiceTests.groovy | 3 +-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index c71cd55a8..af2047eae 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -16,7 +16,6 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories import org.springframework.test.annotation.DirtiesContext import org.springframework.test.context.ContextConfiguration import org.springframework.transaction.PlatformTransactionManager -import spock.lang.Ignore import spock.lang.Specification import javax.persistence.EntityManager @@ -32,7 +31,7 @@ import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHE @ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration]) @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") -@Ignore +@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) class EntityDescriptorEnversVersioningTests extends Specification { @Autowired @@ -50,7 +49,6 @@ class EntityDescriptorEnversVersioningTests extends Specification { @Autowired OpenSamlObjects openSamlObjects - @DirtiesContext def "test versioning with contact persons"() { setup: def expectedModifiedPersistentEntities = [EntityDescriptor.name, ContactPerson.name, GivenName.name, EmailAddress.name] @@ -122,7 +120,6 @@ class EntityDescriptorEnversVersioningTests extends Specification { } - @DirtiesContext def "test versioning with organization"() { setup: def expectedModifiedPersistentEntities = [EntityDescriptor.name, @@ -176,7 +173,6 @@ class EntityDescriptorEnversVersioningTests extends Specification { getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L } - @DirtiesContext def "test versioning with sp sso descriptor"() { setup: def expectedModifiedPersistentEntities = [EntityDescriptor.name, @@ -238,7 +234,6 @@ class EntityDescriptorEnversVersioningTests extends Specification { getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L } - @DirtiesContext def "test versioning with uiInfo"() { setup: def expectedModifiedPersistentEntities = [EntityDescriptor.name, @@ -330,7 +325,6 @@ class EntityDescriptorEnversVersioningTests extends Specification { uiinfoInitialRevision.logos[0].width == 30 } - @DirtiesContext def "test versioning with security"() { setup: def expectedModifiedPersistentEntities = [EntityDescriptor.name, @@ -425,7 +419,6 @@ class EntityDescriptorEnversVersioningTests extends Specification { x509cert.value == 'signingValue' } - @DirtiesContext def "test versioning ACS"() { setup: def expectedModifiedPersistentEntities = [EntityDescriptor.name, @@ -495,7 +488,6 @@ class EntityDescriptorEnversVersioningTests extends Specification { acs.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' } - @DirtiesContext def "test versioning logout"() { setup: def expectedModifiedPersistentEntities = [EntityDescriptor.name, @@ -558,7 +550,6 @@ class EntityDescriptorEnversVersioningTests extends Specification { slo.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' } - @DirtiesContext def "test versioning relying party overrides"() { setup: def expectedModifiedPersistentEntities = [EntityDescriptor.name, diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy index 3d2632f6b..ca447e7f0 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy @@ -5,6 +5,7 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRe import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService import org.hibernate.envers.AuditReaderFactory +import org.hibernate.envers.query.AuditEntity import org.hibernate.envers.query.AuditQuery import org.springframework.transaction.PlatformTransactionManager import org.springframework.transaction.support.DefaultTransactionDefinition @@ -36,14 +37,15 @@ class EnversTestsSupport { edr.save(ed) } - getRevisionHistoryForEntityType(em, EntityDescriptor) + getRevisionHistoryForEntityType(em, EntityDescriptor, ed.resourceId) } - static getRevisionHistoryForEntityType(EntityManager em, Class entityType) { + static getRevisionHistoryForEntityType(EntityManager em, Class entityType, String resourceId) { def auditReader = AuditReaderFactory.get(em) AuditQuery auditQuery = auditReader .createQuery() .forRevisionsOfEntity(entityType, false, false) + .add(AuditEntity.property("resourceId").eq(resourceId)) auditQuery.resultList } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy index 7a28fcd7b..37e6113a0 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy @@ -6,6 +6,7 @@ import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorReposit import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.domain.EntityScan import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest +import org.springframework.boot.test.context.SpringBootTest import org.springframework.data.jpa.repository.config.EnableJpaRepositories import org.springframework.test.annotation.DirtiesContext import org.springframework.test.context.ContextConfiguration @@ -21,7 +22,6 @@ import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTes @ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration, EntitiesVersioningConfiguration]) @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") -@Ignore class EnversEntityDescriptorVersionServiceTests extends Specification { @Autowired @@ -36,7 +36,6 @@ class EnversEntityDescriptorVersionServiceTests extends Specification { @Autowired PlatformTransactionManager txMgr - @DirtiesContext def "versioning service returns correct number of versions sorted by modified date in natural order"() { when: 'Initial version' EntityDescriptor ed = new EntityDescriptor(entityID: 'ed', serviceProviderName: 'SP1') From 43826b184b5b1d308b0fd260cf34d31196aae3e1 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Fri, 7 Jun 2019 12:36:25 -0700 Subject: [PATCH 044/112] moved utilities --- .../metadata/configuration/reducer/configuration.reducer.ts | 4 ---- ui/src/app/metadata/configuration/reducer/index.ts | 2 +- ui/src/app/metadata/domain/utility/configuration.spec.ts | 0 .../service/utility.ts => domain/utility/configuration.ts} | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) create mode 100644 ui/src/app/metadata/domain/utility/configuration.spec.ts rename ui/src/app/metadata/{configuration/service/utility.ts => domain/utility/configuration.ts} (96%) diff --git a/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts b/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts index 3acc42338..c526aa22b 100644 --- a/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts +++ b/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts @@ -22,24 +22,20 @@ export function reducer(state = initialState, action: ConfigurationActionsUnion) ...state, schema: action.payload }; - break; case ConfigurationActionTypes.SET_DEFINITION: return { ...state, definition: action.payload }; - break; case ConfigurationActionTypes.SET_METADATA: return { ...state, model: action.payload }; - break; case ConfigurationActionTypes.CLEAR: return { ...initialState }; - break; default: { return state; } diff --git a/ui/src/app/metadata/configuration/reducer/index.ts b/ui/src/app/metadata/configuration/reducer/index.ts index 3fb2ae27d..e8ba98467 100644 --- a/ui/src/app/metadata/configuration/reducer/index.ts +++ b/ui/src/app/metadata/configuration/reducer/index.ts @@ -5,7 +5,7 @@ import * as fromRoot from '../../../app.reducer'; import * as fromConfiguration from './configuration.reducer'; import { WizardStep } from '../../../wizard/model'; -import * as utils from '../service/utility'; +import * as utils from '../../domain/utility/configuration'; import { getSplitSchema } from '../../../wizard/reducer'; export interface ConfigurationState { diff --git a/ui/src/app/metadata/domain/utility/configuration.spec.ts b/ui/src/app/metadata/domain/utility/configuration.spec.ts new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/app/metadata/configuration/service/utility.ts b/ui/src/app/metadata/domain/utility/configuration.ts similarity index 96% rename from ui/src/app/metadata/configuration/service/utility.ts rename to ui/src/app/metadata/domain/utility/configuration.ts index ee329c3b1..0cd0a7a45 100644 --- a/ui/src/app/metadata/configuration/service/utility.ts +++ b/ui/src/app/metadata/domain/utility/configuration.ts @@ -1,4 +1,4 @@ -import { Property } from '../../domain/model/property'; +import { Property } from '../model/property'; export function getDefinition(path: string, definitions: any): any { let def = path.split('/').pop(); From 3ab91cd4487d9cbc4d36f61fc4109fdcf61f7594 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Fri, 7 Jun 2019 15:53:57 -0400 Subject: [PATCH 045/112] tests optimization --- .../envers/EntityDescriptorEnversVersioningTests.groovy | 2 ++ .../ui/service/EnversEntityDescriptorVersionServiceTests.groovy | 1 + 2 files changed, 3 insertions(+) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index af2047eae..5f833de03 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -16,6 +16,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories import org.springframework.test.annotation.DirtiesContext import org.springframework.test.context.ContextConfiguration import org.springframework.transaction.PlatformTransactionManager +import spock.lang.Ignore import spock.lang.Specification import javax.persistence.EntityManager @@ -32,6 +33,7 @@ import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHE @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) +//@Ignore class EntityDescriptorEnversVersioningTests extends Specification { @Autowired diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy index 37e6113a0..c59834bda 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy @@ -22,6 +22,7 @@ import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTes @ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration, EntitiesVersioningConfiguration]) @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") +//@Ignore class EnversEntityDescriptorVersionServiceTests extends Specification { @Autowired From 23d5799b76af88e9acd7632b4b86353a7854393f Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Fri, 7 Jun 2019 15:55:53 -0400 Subject: [PATCH 046/112] tests optimization --- .../envers/EntityDescriptorEnversVersioningTests.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 5f833de03..659b51c3c 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -32,7 +32,7 @@ import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHE @ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration]) @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") -@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) +//@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) //@Ignore class EntityDescriptorEnversVersioningTests extends Specification { From ee914e269c775144b41bcae43469e18738bd7b64 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Fri, 7 Jun 2019 16:51:44 -0400 Subject: [PATCH 047/112] Disable versioning test for now --- .../envers/EntityDescriptorEnversVersioningTests.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 659b51c3c..81d5ad7ab 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -33,7 +33,7 @@ import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHE @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") //@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) -//@Ignore +@Ignore class EntityDescriptorEnversVersioningTests extends Specification { @Autowired From 5b1d54058e8fc5c670a0a87351f1f514f9d30f7d Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Fri, 7 Jun 2019 13:55:57 -0700 Subject: [PATCH 048/112] SHIBUI-1267 Updated unit test coverage --- ui/package.json | 2 +- .../effect/configuration.effect.ts | 2 +- .../reducer/configuration.reducer.spec.ts | 33 +++++++--- .../reducer/configuration.reducer.ts | 2 +- .../service/configuration.service.spec.ts | 63 +++++++++++++++++++ .../service/configuration.service.ts | 4 +- .../wizard-summary.component.spec.ts | 13 +--- .../component/wizard-summary.component.ts | 44 +------------ .../domain/utility/configuration.spec.ts | 62 ++++++++++++++++++ .../metadata/domain/utility/configuration.ts | 2 + ui/src/testing/form-schema.stub.ts | 10 ++- 11 files changed, 168 insertions(+), 69 deletions(-) create mode 100644 ui/src/app/metadata/configuration/service/configuration.service.spec.ts diff --git a/ui/package.json b/ui/package.json index 6cfe807cd..60a73244f 100644 --- a/ui/package.json +++ b/ui/package.json @@ -6,7 +6,7 @@ "ng": "ng", "start": "ng serve --proxy-config proxy.conf.json", "build": "ng build", - "test": "ng test --code-coverage --source-map=false", + "test": "ng test --code-coverage --source-map=true", "lint": "ng lint", "e2e": "ng e2e", "build:static": "node-sass src/static.scss ./dist/unsecured/static.css", diff --git a/ui/src/app/metadata/configuration/effect/configuration.effect.ts b/ui/src/app/metadata/configuration/effect/configuration.effect.ts index ef86d13fd..781d9a7b9 100644 --- a/ui/src/app/metadata/configuration/effect/configuration.effect.ts +++ b/ui/src/app/metadata/configuration/effect/configuration.effect.ts @@ -42,7 +42,7 @@ export class MetadataConfigurationEffects { @Effect() setDefinition$ = this.actions$.pipe( ofType(ConfigurationActionTypes.SET_METADATA), - map(action => new SetDefinition(this.configService.getDefinition(action.payload))) + map(action => new SetDefinition(this.configService.getDefinition(action.payload['@type']))) ); @Effect() diff --git a/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts b/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts index b4d485fd0..d02b99560 100644 --- a/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts +++ b/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts @@ -2,12 +2,19 @@ import { reducer } from './configuration.reducer'; import * as fromConfig from './configuration.reducer'; import * as actions from '../action/configuration.action'; import { MetadataSourceEditor } from '../../domain/model/wizards/metadata-source-editor'; -import { SCHEMA } from '../../../../testing/form-schema.stub'; +import { SCHEMA as schema } from '../../../../testing/form-schema.stub'; import { MetadataResolver } from '../../domain/model'; describe('Configuration Reducer', () => { const initialState: fromConfig.State = { ...fromConfig.initialState }; + const definition = new MetadataSourceEditor(); + const model: MetadataResolver = { + id: 'foo', + serviceProviderName: 'foo', + '@type': 'MetadataResolver' + }; + describe('undefined action', () => { it('should return the default state', () => { const result = reducer(undefined, {} as any); @@ -18,7 +25,6 @@ describe('Configuration Reducer', () => { describe('SET_DEFINITION action', () => { it('should set the state definition', () => { - const definition = new MetadataSourceEditor(); const action = new actions.SetDefinition(definition); const result = reducer(initialState, action); @@ -28,24 +34,33 @@ describe('Configuration Reducer', () => { describe('SET_SCHEMA action', () => { it('should set the state schema', () => { - const action = new actions.SetSchema(SCHEMA); + const action = new actions.SetSchema(schema); const result = reducer(initialState, action); - expect(result).toEqual({ ...initialState, schema: SCHEMA }); + expect(result).toEqual({ ...initialState, schema }); }); }); describe('SET_METADATA action', () => { it('should set the state metadata model', () => { - const model: MetadataResolver = { - id: 'foo', - serviceProviderName: 'foo', - '@type': 'MetadataResolver' - }; const action = new actions.SetMetadata(model as MetadataResolver); const result = reducer(initialState, action); expect(result).toEqual({ ...initialState, model }); }); }); + + describe('CLEAR action', () => { + it('should clear the state and reset to initial state', () => { + const action = new actions.ClearConfiguration(); + const result = reducer({ + ...initialState, + model, + definition, + schema + }, action); + + expect(result).toEqual(initialState); + }); + }); }); diff --git a/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts b/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts index c526aa22b..966cf634c 100644 --- a/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts +++ b/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts @@ -1,6 +1,6 @@ import { ConfigurationActionTypes, ConfigurationActionsUnion } from '../action/configuration.action'; import { Metadata } from '../../domain/domain.type'; -import { Wizard, WizardStep } from '../../../wizard/model'; +import { Wizard } from '../../../wizard/model'; import { Schema } from '../model/schema'; export interface State { diff --git a/ui/src/app/metadata/configuration/service/configuration.service.spec.ts b/ui/src/app/metadata/configuration/service/configuration.service.spec.ts new file mode 100644 index 000000000..b3588c174 --- /dev/null +++ b/ui/src/app/metadata/configuration/service/configuration.service.spec.ts @@ -0,0 +1,63 @@ +import { TestBed, async, inject } from '@angular/core/testing'; +import { HttpClientModule, HttpRequest } from '@angular/common/http'; +import { HttpTestingController, HttpClientTestingModule } from '@angular/common/http/testing'; +import { MetadataConfigurationService, PATHS } from './configuration.service'; +import { FileBackedHttpMetadataProviderEditor } from '../../provider/model'; +import { MetadataSourceEditor } from '../../domain/model/wizards/metadata-source-editor'; + +describe(`Attributes Service`, () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + HttpClientModule, + HttpClientTestingModule + ], + providers: [ + MetadataConfigurationService + ] + }); + }); + + describe('find method', () => { + it(`should send an expected GET request`, async(inject([MetadataConfigurationService, HttpTestingController], + (service: MetadataConfigurationService, backend: HttpTestingController) => { + const type = 'resolver'; + const id = 'foo'; + service.find(id, type).subscribe(); + backend.expectOne((req: HttpRequest) => { + return req.url === `${service.base}/${PATHS[type]}/${id}` + && req.method === 'GET'; + }, `GET metadata by id and type`); + } + ))); + }); + + describe('loadSchema method', () => { + it(`should send an expected GET request`, async(inject([MetadataConfigurationService, HttpTestingController], + (service: MetadataConfigurationService, backend: HttpTestingController) => { + const path = '/foo.json'; + service.loadSchema(path).subscribe(); + backend.expectOne((req: HttpRequest) => { + return req.url === `${path}` + && req.method === 'GET'; + }, `GET schema by path`); + } + ))); + }); + + describe('getDefinition method', () => { + it(`should retrieve the editor definition by model type`, async(inject([MetadataConfigurationService, HttpTestingController], + (service: MetadataConfigurationService, backend: HttpTestingController) => { + const def = service.getDefinition('FileBackedHttpMetadataResolver'); + expect(def).toBe(FileBackedHttpMetadataProviderEditor); + } + ))); + + it(`should instantiate an editor for resolvers`, async(inject([MetadataConfigurationService], + (service: MetadataConfigurationService) => { + const def = service.getDefinition('foo'); + expect(def instanceof MetadataSourceEditor).toBe(true); + } + ))); + }); +}); diff --git a/ui/src/app/metadata/configuration/service/configuration.service.ts b/ui/src/app/metadata/configuration/service/configuration.service.ts index d7f5641d9..2f0420c49 100644 --- a/ui/src/app/metadata/configuration/service/configuration.service.ts +++ b/ui/src/app/metadata/configuration/service/configuration.service.ts @@ -29,8 +29,8 @@ export class MetadataConfigurationService { return this.http.get(`${this.base}/${PATHS[type]}/${id}`); } - getDefinition(model: Metadata): Wizard { - return MetadataProviderEditorTypes.find(def => def.type === model['@type']) || new MetadataSourceEditor(); + getDefinition(type: string): Wizard { + return MetadataProviderEditorTypes.find(def => def.type === type) || new MetadataSourceEditor(); } loadSchema(path: string): Observable { diff --git a/ui/src/app/metadata/domain/component/wizard-summary.component.spec.ts b/ui/src/app/metadata/domain/component/wizard-summary.component.spec.ts index 335cd634f..107ef7241 100644 --- a/ui/src/app/metadata/domain/component/wizard-summary.component.spec.ts +++ b/ui/src/app/metadata/domain/component/wizard-summary.component.spec.ts @@ -4,7 +4,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbDropdownModule, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'; -import { getStepProperties, WizardSummaryComponent } from './wizard-summary.component'; +import { WizardSummaryComponent } from './wizard-summary.component'; import { SchemaFormModule, WidgetRegistry, DefaultWidgetRegistry } from 'ngx-schema-form'; import { Wizard } from '../../../wizard/model'; import { MetadataProvider } from '../../domain/model'; @@ -68,17 +68,6 @@ describe('Provider Wizard Summary Component', () => { expect(app).toBeTruthy(); })); - describe('getStepProperties function', () => { - it('should return an empty array of schema or schema.properties is not defined', () => { - expect(getStepProperties(null, {})).toEqual([]); - expect(getStepProperties({}, {})).toEqual([]); - }); - - it('should return a formatted list of properties', () => { - expect(getStepProperties(SCHEMA, {}).length).toBe(2); - }); - }); - describe('gotoPage function', () => { it('should emit an empty string if page is null', () => { spyOn(app.onPageSelect, 'emit'); diff --git a/ui/src/app/metadata/domain/component/wizard-summary.component.ts b/ui/src/app/metadata/domain/component/wizard-summary.component.ts index fa570a1c0..e8b8deb34 100644 --- a/ui/src/app/metadata/domain/component/wizard-summary.component.ts +++ b/ui/src/app/metadata/domain/component/wizard-summary.component.ts @@ -1,10 +1,11 @@ import { Component, Input, SimpleChanges, OnChanges, Output, EventEmitter } from '@angular/core'; +import merge from 'deepmerge'; import { Wizard, WizardStep } from '../../../wizard/model'; import { MetadataProvider, MetadataResolver } from '../../domain/model'; import { Property } from '../model/property'; import { getSplitSchema } from '../../../wizard/reducer'; -import merge from 'deepmerge'; +import { getStepProperties } from '../utility/configuration'; interface Section { id: string; @@ -14,47 +15,6 @@ interface Section { properties: Property[]; } -export function getDefinition(path: string, definitions: any): any { - let def = path.split('/').pop(); - return definitions[def]; -} - -export function getPropertyItemSchema(items: any, definitions: any): any { - if (!items) { return null; } - return items.$ref ? getDefinition(items.$ref, definitions) : items; -} - -export function getStepProperty(property, model, definitions): Property { - if (!property) { return null; } - property = property.$ref ? { ...property, ...getDefinition(property.$ref, definitions) } : property; - return { - name: property.title, - value: model, - type: property.type, - items: getPropertyItemSchema(property.items, definitions), - properties: getStepProperties( - property, - model, - definitions - ), - widget: property.widget instanceof String ? { id: property.widget } : { ...property.widget } - }; -} - - -export function getStepProperties(schema: any, model: any, definitions: any = {}): Property[] { - if (!schema || !schema.properties) { return []; } - return Object - .keys(schema.properties) - .map(property => { - return getStepProperty( - schema.properties[property], - model && model.hasOwnProperty(property) ? model[property] : null, - definitions - ); - }); -} - @Component({ selector: 'wizard-summary', templateUrl: './wizard-summary.component.html', diff --git a/ui/src/app/metadata/domain/utility/configuration.spec.ts b/ui/src/app/metadata/domain/utility/configuration.spec.ts index e69de29bb..b331a8647 100644 --- a/ui/src/app/metadata/domain/utility/configuration.spec.ts +++ b/ui/src/app/metadata/domain/utility/configuration.spec.ts @@ -0,0 +1,62 @@ +import { getStepProperties, getDefinition, getPropertyItemSchema, getStepProperty } from './configuration'; +import * as utils from './configuration'; +import { SCHEMA } from '../../../../testing/form-schema.stub'; + +describe('domain utility functions', () => { + describe('getStepProperties function', () => { + it('should return an empty array of schema or schema.properties is not defined', () => { + expect(getStepProperties(null, {})).toEqual([]); + expect(getStepProperties({}, {})).toEqual([]); + }); + + it('should return a formatted list of properties', () => { + expect(getStepProperties(SCHEMA, {}).length).toBe(2); + }); + }); + + describe('getDefinitions method', () => { + it('should retrieve the definitions from the json schema', () => { + const definition = { + id: 'foo', + title: 'bar', + description: 'baz', + type: 'string' + }; + expect(getDefinition('/foo/bar', {bar: definition})).toBe(definition); + }); + }); + + describe('getPropertyItemSchema method', () => { + it('should return null if no items are provided', () => { + expect(getPropertyItemSchema(null, SCHEMA.definitions)).toBeNull(); + }); + it('should retrieve the definitions from the items schema', () => { + expect(getPropertyItemSchema({$ref: 'description'}, SCHEMA.definitions)).toBe(SCHEMA.definitions.description); + }); + it('should return the item itself if no $ref', () => { + let item = {}; + expect(getPropertyItemSchema(item, SCHEMA.definitions)).toBe(item); + }); + }); + + describe('getStepProperty method', () => { + const model = { + name: 'foo', + type: 'bar', + description: 'baz' + }; + it('should return null if no items are provided', () => { + expect(getStepProperty(null, null, SCHEMA.definitions)).toBeNull(); + }); + + it('should retrieve the property $ref definition if available', () => { + const property = getStepProperty( + { $ref: 'description' }, + model, + SCHEMA.definitions + ); + expect(property.type).toBe('string'); + }); + }); +}); + diff --git a/ui/src/app/metadata/domain/utility/configuration.ts b/ui/src/app/metadata/domain/utility/configuration.ts index 0cd0a7a45..dc641c4dd 100644 --- a/ui/src/app/metadata/domain/utility/configuration.ts +++ b/ui/src/app/metadata/domain/utility/configuration.ts @@ -4,6 +4,7 @@ export function getDefinition(path: string, definitions: any): any { let def = path.split('/').pop(); return definitions[def]; } + export function getPropertyItemSchema(items: any, definitions: any): any { if (!items) { return null; } return items.$ref ? getDefinition(items.$ref, definitions) : items; @@ -26,6 +27,7 @@ export function getStepProperty(property, model, definitions): Property { }; } + export function getStepProperties(schema: any, model: any, definitions: any = {}): Property[] { if (!schema || !schema.properties) { return []; } return Object diff --git a/ui/src/testing/form-schema.stub.ts b/ui/src/testing/form-schema.stub.ts index c91f63bf1..f317b1199 100644 --- a/ui/src/testing/form-schema.stub.ts +++ b/ui/src/testing/form-schema.stub.ts @@ -44,5 +44,13 @@ export const SCHEMA = { '@type' ] } - ] + ], + 'definitions': { + 'description': { + 'title': 'Description', + 'description': 'A description of the object', + 'type': 'string', + 'widget': 'string' + } + } }; From e0298a4df051ac4e06c58b522151d6b5f1623abd Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Fri, 7 Jun 2019 14:41:55 -0700 Subject: [PATCH 049/112] SHIBUI-1267 Updated unit test coverage --- .../array-property.component.spec.ts | 115 ++++++++++++++++++ .../component/array-property.component.ts | 4 - .../configuration-property.component.spec.ts | 69 +++++++++++ .../configuration-property.component.ts | 6 +- .../object-property.component.spec.ts | 60 +++++++++ .../component/object-property.component.ts | 8 -- .../primitive-property.component.spec.ts | 60 +++++++++ .../domain/utility/configuration.spec.ts | 2 +- ui/src/testing/form-schema.stub.ts | 25 ++++ 9 files changed, 335 insertions(+), 14 deletions(-) create mode 100644 ui/src/app/metadata/configuration/component/array-property.component.spec.ts create mode 100644 ui/src/app/metadata/configuration/component/configuration-property.component.spec.ts create mode 100644 ui/src/app/metadata/configuration/component/object-property.component.spec.ts create mode 100644 ui/src/app/metadata/configuration/component/primitive-property.component.spec.ts diff --git a/ui/src/app/metadata/configuration/component/array-property.component.spec.ts b/ui/src/app/metadata/configuration/component/array-property.component.spec.ts new file mode 100644 index 000000000..453d9d484 --- /dev/null +++ b/ui/src/app/metadata/configuration/component/array-property.component.spec.ts @@ -0,0 +1,115 @@ +import { Component, ViewChild, Input } from '@angular/core'; +import { TestBed, async, ComponentFixture } from '@angular/core/testing'; +import { RouterTestingModule } from '@angular/router/testing'; + +import { NgbDropdownModule, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'; +import { Property } from '../../domain/model/property'; +import { MockI18nModule } from '../../../../testing/i18n.stub'; +import { SCHEMA } from '../../../../testing/form-schema.stub'; +import { getStepProperty } from '../../domain/utility/configuration'; +import { ArrayPropertyComponent } from './array-property.component'; +import { AttributesService } from '../../domain/service/attributes.service'; +import { MockAttributeService } from '../../../../testing/attributes.stub'; +import { of } from 'rxjs'; + +@Component({ + template: ` + + ` +}) +class TestHostComponent { + @ViewChild(ArrayPropertyComponent) + public componentUnderTest: ArrayPropertyComponent; + + property: Property = getStepProperty(SCHEMA.properties.list, { + name: 'foo', + type: 'baz', + description: 'foo bar baz', + list: [] + }, SCHEMA.definitions); + + setProperty(property: Property): void { + this.property = property; + } +} + +describe('Array Property Component', () => { + + let fixture: ComponentFixture; + let instance: TestHostComponent; + let app: ArrayPropertyComponent; + let service: AttributesService; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + NgbPopoverModule, + MockI18nModule, + RouterTestingModule + ], + declarations: [ + ArrayPropertyComponent, + TestHostComponent + ], + providers: [ + { provide: AttributesService, useClass: MockAttributeService } + ] + }).compileComponents(); + + fixture = TestBed.createComponent(TestHostComponent); + instance = fixture.componentInstance; + app = instance.componentUnderTest; + service = TestBed.get(AttributesService); + fixture.detectChanges(); + })); + + it('should accept a property input', async(() => { + expect(app).toBeTruthy(); + })); + + describe('attributeList$ getter', () => { + it('should return an empty list when no data or dataUrl is set', () => { + app.attributeList$.subscribe((list) => { + expect(list).toEqual([]); + }); + }); + it('should return a list of data items from the schema', () => { + const datalist = [ + { key: 'foo', label: 'foo' }, + { key: 'bar', label: 'bar' }, + { key: 'baz', label: 'baz' }, + ]; + instance.setProperty({ + ...instance.property, + widget: { + id: 'datalist', + data: datalist + } + }); + fixture.detectChanges(); + app.attributeList$.subscribe(list => { + expect(list).toEqual(datalist); + }); + }); + + it('should call the attribute service with a provided dataUrl', () => { + const datalist = [ + { key: 'foo', label: 'foo' }, + { key: 'bar', label: 'bar' }, + { key: 'baz', label: 'baz' }, + ]; + spyOn(service, 'query').and.returnValue(of(datalist)); + instance.setProperty({ + ...instance.property, + widget: { + id: 'datalist', + dataUrl: '/foo' + } + }); + fixture.detectChanges(); + app.attributeList$.subscribe(list => { + expect(list).toEqual(datalist); + }); + }); + }); +}); diff --git a/ui/src/app/metadata/configuration/component/array-property.component.ts b/ui/src/app/metadata/configuration/component/array-property.component.ts index 77c8fcab0..ff9cd0ac4 100644 --- a/ui/src/app/metadata/configuration/component/array-property.component.ts +++ b/ui/src/app/metadata/configuration/component/array-property.component.ts @@ -19,10 +19,6 @@ export class ArrayPropertyComponent extends ConfigurationPropertyComponent { super(); } - getKeys(schema): string[] { - return Object.keys(schema.properties); - } - get attributeList$(): Observable<{ key: string, label: string }[]> { if (this.property.widget && this.property.widget.hasOwnProperty('data')) { return of(this.property.widget.data); diff --git a/ui/src/app/metadata/configuration/component/configuration-property.component.spec.ts b/ui/src/app/metadata/configuration/component/configuration-property.component.spec.ts new file mode 100644 index 000000000..5ef0452e0 --- /dev/null +++ b/ui/src/app/metadata/configuration/component/configuration-property.component.spec.ts @@ -0,0 +1,69 @@ +import { Component, ViewChild, Input } from '@angular/core'; +import { TestBed, async, ComponentFixture } from '@angular/core/testing'; +import { RouterTestingModule } from '@angular/router/testing'; + +import { NgbDropdownModule, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'; +import { Property } from '../../domain/model/property'; +import { MockI18nModule } from '../../../../testing/i18n.stub'; +import { SCHEMA } from '../../../../testing/form-schema.stub'; +import { getStepProperties, getStepProperty } from '../../domain/utility/configuration'; +import { ConfigurationPropertyComponent } from './configuration-property.component'; + +@Component({ + template: ` + + ` +}) +class TestHostComponent { + @ViewChild(ConfigurationPropertyComponent) + public componentUnderTest: ConfigurationPropertyComponent; + + property: Property = getStepProperty(SCHEMA.properties.name, { + name: 'foo', + type: 'baz', + description: 'foo bar baz' + }, SCHEMA.definitions); +} + +describe('Configuration Property Component', () => { + + let fixture: ComponentFixture; + let instance: TestHostComponent; + let app: ConfigurationPropertyComponent; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + NgbPopoverModule, + MockI18nModule, + RouterTestingModule + ], + declarations: [ + ConfigurationPropertyComponent, + TestHostComponent + ] + }).compileComponents(); + + fixture = TestBed.createComponent(TestHostComponent); + instance = fixture.componentInstance; + app = instance.componentUnderTest; + fixture.detectChanges(); + })); + + it('should accept a property input', async(() => { + expect(app).toBeTruthy(); + })); + + describe('getKeys method', () => { + it('should return the property`s child keys', () => { + expect(app.getKeys({ properties: { foo: 'bar', baz: 'bar' } })).toEqual(['foo', 'baz']); + }); + }); + + describe('getItemType method', () => { + it('should return the item`s type', () => { + expect(app.getItemType({ widget: { id: 'string' } } as Property)).toBe('string'); + expect(app.getItemType({} as Property)).toBe('default'); + }); + }); +}); diff --git a/ui/src/app/metadata/configuration/component/configuration-property.component.ts b/ui/src/app/metadata/configuration/component/configuration-property.component.ts index 91e97e87b..bcdd45711 100644 --- a/ui/src/app/metadata/configuration/component/configuration-property.component.ts +++ b/ui/src/app/metadata/configuration/component/configuration-property.component.ts @@ -3,7 +3,7 @@ import { Property } from '../../domain/model/property'; @Component({ selector: 'configuration-property', - templateUrl: './configuration-property.component.html', + template: `{{ property | json }}`, styleUrls: [] }) @@ -12,6 +12,10 @@ export class ConfigurationPropertyComponent { constructor() { } + getKeys(schema): string[] { + return Object.keys(schema.properties); + } + getItemType(items: Property): string { return items.widget ? items.widget.id : 'default'; } diff --git a/ui/src/app/metadata/configuration/component/object-property.component.spec.ts b/ui/src/app/metadata/configuration/component/object-property.component.spec.ts new file mode 100644 index 000000000..6299b20d5 --- /dev/null +++ b/ui/src/app/metadata/configuration/component/object-property.component.spec.ts @@ -0,0 +1,60 @@ +import { Component, ViewChild, Input } from '@angular/core'; +import { TestBed, async, ComponentFixture } from '@angular/core/testing'; +import { RouterTestingModule } from '@angular/router/testing'; + +import { NgbDropdownModule, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'; +import { Property } from '../../domain/model/property'; +import { MockI18nModule } from '../../../../testing/i18n.stub'; +import { ObjectPropertyComponent } from './object-property.component'; +import { SCHEMA } from '../../../../testing/form-schema.stub'; +import { getStepProperties, getStepProperty } from '../../domain/utility/configuration'; +import { PrimitivePropertyComponent } from './primitive-property.component'; +import { ArrayPropertyComponent } from './array-property.component'; + +@Component({ + template: ` + + ` +}) +class TestHostComponent { + @ViewChild(ObjectPropertyComponent) + public componentUnderTest: ObjectPropertyComponent; + + property: Property = getStepProperty(SCHEMA.properties.name, { + name: 'foo', + type: 'baz', + description: 'foo bar baz' + }, SCHEMA.definitions); +} + +describe('Object Property Component', () => { + + let fixture: ComponentFixture; + let instance: TestHostComponent; + let app: ObjectPropertyComponent; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + NgbPopoverModule, + MockI18nModule, + RouterTestingModule + ], + declarations: [ + ObjectPropertyComponent, + PrimitivePropertyComponent, + ArrayPropertyComponent, + TestHostComponent + ] + }).compileComponents(); + + fixture = TestBed.createComponent(TestHostComponent); + instance = fixture.componentInstance; + app = instance.componentUnderTest; + fixture.detectChanges(); + })); + + it('should accept a property input', async(() => { + expect(app).toBeTruthy(); + })); +}); diff --git a/ui/src/app/metadata/configuration/component/object-property.component.ts b/ui/src/app/metadata/configuration/component/object-property.component.ts index db107da92..f7892877e 100644 --- a/ui/src/app/metadata/configuration/component/object-property.component.ts +++ b/ui/src/app/metadata/configuration/component/object-property.component.ts @@ -14,13 +14,5 @@ export class ObjectPropertyComponent extends ConfigurationPropertyComponent { constructor() { super(); } - - getKeys(schema): string[] { - return Object.keys(schema.properties); - } - - getItemType(items: Property): string { - return items.widget ? items.widget.id : 'default'; - } } diff --git a/ui/src/app/metadata/configuration/component/primitive-property.component.spec.ts b/ui/src/app/metadata/configuration/component/primitive-property.component.spec.ts new file mode 100644 index 000000000..9ce81bfb5 --- /dev/null +++ b/ui/src/app/metadata/configuration/component/primitive-property.component.spec.ts @@ -0,0 +1,60 @@ +import { Component, ViewChild, Input } from '@angular/core'; +import { TestBed, async, ComponentFixture } from '@angular/core/testing'; +import { RouterTestingModule } from '@angular/router/testing'; + +import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; +import { Property } from '../../domain/model/property'; +import { MockI18nModule } from '../../../../testing/i18n.stub'; +import { PrimitivePropertyComponent } from './primitive-property.component'; + +@Component({ + template: ` + + ` +}) +class TestHostComponent { + @ViewChild(PrimitivePropertyComponent) + public componentUnderTest: PrimitivePropertyComponent; + + property: Property = { + title: 'foo', + type: 'string', + name: 'foo', + value: ['bar'], + items: null, + properties: null, + widget: { + id: 'string' + } + }; +} + +describe('Primitive Property Component', () => { + + let fixture: ComponentFixture; + let instance: TestHostComponent; + let app: PrimitivePropertyComponent; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + NgbDropdownModule, + MockI18nModule, + RouterTestingModule + ], + declarations: [ + PrimitivePropertyComponent, + TestHostComponent + ], + }).compileComponents(); + + fixture = TestBed.createComponent(TestHostComponent); + instance = fixture.componentInstance; + app = instance.componentUnderTest; + fixture.detectChanges(); + })); + + it('should accept a property input', async(() => { + expect(app).toBeTruthy(); + })); +}); diff --git a/ui/src/app/metadata/domain/utility/configuration.spec.ts b/ui/src/app/metadata/domain/utility/configuration.spec.ts index b331a8647..d9a5a653f 100644 --- a/ui/src/app/metadata/domain/utility/configuration.spec.ts +++ b/ui/src/app/metadata/domain/utility/configuration.spec.ts @@ -10,7 +10,7 @@ describe('domain utility functions', () => { }); it('should return a formatted list of properties', () => { - expect(getStepProperties(SCHEMA, {}).length).toBe(2); + expect(getStepProperties(SCHEMA, {}).length).toBe(3); }); }); diff --git a/ui/src/testing/form-schema.stub.ts b/ui/src/testing/form-schema.stub.ts index f317b1199..1ef7d42ae 100644 --- a/ui/src/testing/form-schema.stub.ts +++ b/ui/src/testing/form-schema.stub.ts @@ -30,6 +30,31 @@ export const SCHEMA = { 'description': 'FileBackedHttpMetadataProvider' } ] + }, + 'list': { + 'title': 'label.retained-roles', + 'description': 'tooltip.retained-roles', + 'type': 'array', + 'items': { + 'widget': { + 'id': 'select' + }, + 'type': 'string', + 'oneOf': [ + { + 'enum': [ + 'SPSSODescriptor' + ], + 'description': 'value.spdescriptor' + }, + { + 'enum': [ + 'AttributeAuthorityDescriptor' + ], + 'description': 'value.attr-auth-descriptor' + } + ] + } } }, 'required': [ From 7dab3e402569fb02ea6c38e760d686a62d1d2b4c Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Fri, 7 Jun 2019 22:40:59 -0400 Subject: [PATCH 050/112] Refactor tests to optimize and fix performance issues cause by versioning tests --- ...ityDescriptorEnversVersioningTestsX.groovy | 617 ++++++++++++++++++ ...EntityDescriptorVersionServiceTests.groovy | 2 +- envers-tests-module/build.gradle | 34 + ....ui.envers-tests-module.main.kotlin_module | Bin 0 -> 16 bytes ...tityDescriptorEnversVersioningTests.groovy | 5 +- settings.gradle | 2 +- 6 files changed, 656 insertions(+), 4 deletions(-) create mode 100644 backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTestsX.groovy create mode 100644 envers-tests-module/build.gradle create mode 100644 envers-tests-module/out/test/classes/META-INF/edu.internet2.tier.shibboleth.admin.ui.envers-tests-module.main.kotlin_module rename {backend => envers-tests-module}/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy (99%) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTestsX.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTestsX.groovy new file mode 100644 index 000000000..a95ded149 --- /dev/null +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTestsX.groovy @@ -0,0 +1,617 @@ +package edu.internet2.tier.shibboleth.admin.ui.repository.envers + +import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration +import edu.internet2.tier.shibboleth.admin.ui.domain.* +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.* +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.service.EntityDescriptorService +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.autoconfigure.domain.EntityScan +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest +import org.springframework.data.jpa.repository.config.EnableJpaRepositories +import org.springframework.test.annotation.DirtiesContext +import org.springframework.test.context.ContextConfiguration +import org.springframework.transaction.PlatformTransactionManager +import spock.lang.Ignore +import spock.lang.Specification + +import javax.persistence.EntityManager + +import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.* +import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE +import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHER + +/** + * Testing entity descriptor envers versioning + */ +@DataJpaTest +@ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration]) +@EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) +@EntityScan("edu.internet2.tier.shibboleth.admin.ui") +//@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) +@Ignore +class EntityDescriptorEnversVersioningTestsX extends Specification { + + @Autowired + EntityDescriptorRepository entityDescriptorRepository + + @Autowired + EntityDescriptorService entityDescriptorService + + @Autowired + EntityManager entityManager + + @Autowired + PlatformTransactionManager txMgr + + @Autowired + OpenSamlObjects openSamlObjects + + def "test versioning with contact persons"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, ContactPerson.name, GivenName.name, EmailAddress.name] + + when: + def ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.contacts = [new ContactRepresentation(type: 'administrative', name: 'name', emailAddress: 'test@test')] + it + } + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + then: + entityDescriptorHistory.size() == 1 + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].givenName.name == 'name' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].type == ADMINISTRATIVE + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].emailAddresses[0].address == 'test@test' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + representation = new EntityDescriptorRepresentation().with { + it.contacts = [new ContactRepresentation(type: 'administrative', name: 'nameUPDATED', emailAddress: 'test@test')] + it + } + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + then: + entityDescriptorHistory.size() == 2 + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].type == ADMINISTRATIVE + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].emailAddresses[0].address == 'test@test' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + when: + representation = new EntityDescriptorRepresentation().with { + it.contacts = [new ContactRepresentation(type: 'other', name: 'nameUPDATED2', emailAddress: 'test@test.com')] + it + } + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, + entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + then: + entityDescriptorHistory.size() == 3 + getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].givenName.name == 'nameUPDATED2' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].type == OTHER + getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].emailAddresses[0].address == 'test@test.com' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 2).sort() == expectedModifiedPersistentEntities.sort() + + //Also make sure we have our original revision + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].type == ADMINISTRATIVE + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].emailAddresses[0].address == 'test@test' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L + + } + + def "test versioning with organization"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + Organization.name, + OrganizationDisplayName.name, + OrganizationName.name, + OrganizationURL.name] + + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.organization = new OrganizationRepresentation(name: 'org', displayName: 'display org', url: 'http://org.edu') + it + } + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + then: + entityDescriptorHistory.size() == 1 + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.organizationNames[0].value == 'org' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.displayNames[0].value == 'display org' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.URLs[0].value == 'http://org.edu' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + representation = new EntityDescriptorRepresentation().with { + it.organization = new OrganizationRepresentation(name: 'orgUpdated', displayName: 'display org Updated', url: 'http://org2.edu') + it + } + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + then: + entityDescriptorHistory.size() == 2 + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.organizationNames[0].value == 'orgUpdated' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.displayNames[0].value == 'display org Updated' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.URLs[0].value == 'http://org2.edu' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the original revision is intact + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.organizationNames[0].value == 'org' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.displayNames[0].value == 'display org' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.URLs[0].value == 'http://org.edu' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L + } + + def "test versioning with sp sso descriptor"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + NameIDFormat.name, + SPSSODescriptor.name] + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.serviceProviderSsoDescriptor = new ServiceProviderSsoDescriptorRepresentation().with { + it.protocolSupportEnum = 'SAML 1.1' + it.nameIdFormats = ['format'] + it + } + it + } + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + then: + entityDescriptorHistory.size() == 1 + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].nameIDFormats[0].format == 'format' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[1] == null + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + representation = new EntityDescriptorRepresentation().with { + it.serviceProviderSsoDescriptor = new ServiceProviderSsoDescriptorRepresentation().with { + it.protocolSupportEnum = 'SAML 1.1, SAML 2' + it.nameIdFormats = ['formatUPDATED'] + it + } + it + } + + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + then: + entityDescriptorHistory.size() == 2 + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].nameIDFormats[0].format == 'formatUPDATED' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[1] == 'urn:oasis:names:tc:SAML:2.0:protocol' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the original revision is intact + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].nameIDFormats[0].format == 'format' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[1] == null + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + } + + def "test versioning with uiInfo"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + Description.name, + DisplayName.name, + SPSSODescriptor.name, + Extensions.name, + InformationURL.name, + Logo.name, + PrivacyStatementURL.name, + UIInfo.name] + + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.mdui = new MduiRepresentation().with { + it.displayName = 'Initial display name' + it.informationUrl = 'http://info' + it.privacyStatementUrl = 'http://privacy' + it.description = 'Initial desc' + it.logoUrl = 'http://logo' + it.logoHeight = 20 + it.logoWidth = 30 + it + } + it + } + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + //Groovy FTW - able to call any private methods on ANY object. Get first revision + UIInfo uiinfo = entityDescriptorService.getUIInfo(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + + then: + entityDescriptorHistory.size() == 1 + uiinfo.displayNames[0].value == 'Initial display name' + uiinfo.informationURLs[0].value == 'http://info' + uiinfo.privacyStatementURLs[0].value == 'http://privacy' + uiinfo.descriptions[0].value == 'Initial desc' + uiinfo.logos[0].URL == 'http://logo' + uiinfo.logos[0].height == 20 + uiinfo.logos[0].width == 30 + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + representation = new EntityDescriptorRepresentation().with { + it.mdui = new MduiRepresentation().with { + it.displayName = 'Display name UPDATED' + it.informationUrl = 'http://info.updated' + it.privacyStatementUrl = 'http://privacy.updated' + it.description = 'Desc UPDATED' + it.logoUrl = 'http://logo.updated' + it.logoHeight = 30 + it.logoWidth = 40 + it + } + it + } + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + //Get second revision + uiinfo = entityDescriptorService.getUIInfo(getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) + //And initial revision + def uiinfoInitialRevision = entityDescriptorService.getUIInfo(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + + then: + entityDescriptorHistory.size() == 2 + uiinfo.displayNames[0].value == 'Display name UPDATED' + uiinfo.informationURLs[0].value == 'http://info.updated' + uiinfo.privacyStatementURLs[0].value == 'http://privacy.updated' + uiinfo.descriptions[0].value == 'Desc UPDATED' + uiinfo.logos[0].URL == 'http://logo.updated' + uiinfo.logos[0].height == 30 + uiinfo.logos[0].width == 40 + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the initial revision is still intact + uiinfoInitialRevision.displayNames[0].value == 'Initial display name' + uiinfoInitialRevision.informationURLs[0].value == 'http://info' + uiinfoInitialRevision.privacyStatementURLs[0].value == 'http://privacy' + uiinfoInitialRevision.descriptions[0].value == 'Initial desc' + uiinfoInitialRevision.logos[0].URL == 'http://logo' + uiinfoInitialRevision.logos[0].height == 20 + uiinfoInitialRevision.logos[0].width == 30 + } + + def "test versioning with security"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + KeyDescriptor.name, + KeyInfo.name, + SPSSODescriptor.name, + X509Certificate.name, + X509Data.name] + + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.securityInfo = new SecurityInfoRepresentation().with { + it.authenticationRequestsSigned = true + it.x509CertificateAvailable = true + it.x509Certificates = [new SecurityInfoRepresentation.X509CertificateRepresentation(name: 'sign', type: 'signing', value: 'signingValue')] + it + } + it + } + + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + //Get initial revision + SPSSODescriptor spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) + + KeyDescriptor keyDescriptor = spssoDescriptor.keyDescriptors[0] + X509Certificate x509cert = keyDescriptor.keyInfo.x509Datas[0].x509Certificates[0] + + then: + entityDescriptorHistory.size() == 1 + spssoDescriptor.isAuthnRequestsSigned() + keyDescriptor.name == 'sign' + keyDescriptor.usageType == 'signing' + x509cert.value == 'signingValue' + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + representation = new EntityDescriptorRepresentation().with { + it.securityInfo = new SecurityInfoRepresentation().with { + it.authenticationRequestsSigned = false + it.x509CertificateAvailable = true + it.x509Certificates = [new SecurityInfoRepresentation.X509CertificateRepresentation(name: 'sign', type: 'signing', value: 'signingValue'), + new SecurityInfoRepresentation.X509CertificateRepresentation(name: 'encrypt', type: 'encryption', value: 'encryptionValue')] + it + } + it + } + + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + + //Get second revision + SPSSODescriptor spssoDescriptor_second = entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,1)) + + KeyDescriptor keyDescriptor_second1 = spssoDescriptor_second.keyDescriptors[0] + X509Certificate x509cert_second1 = keyDescriptor_second1.keyInfo.x509Datas[0].x509Certificates[0] + KeyDescriptor keyDescriptor_second2 = spssoDescriptor_second.keyDescriptors[1] + X509Certificate x509cert_second2 = keyDescriptor_second2.keyInfo.x509Datas[0].x509Certificates[0] + + + //Get initial revision + spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) + + keyDescriptor = spssoDescriptor.keyDescriptors[0] + x509cert = keyDescriptor.keyInfo.x509Datas[0].x509Certificates[0] + + then: + entityDescriptorHistory.size() == 2 + !spssoDescriptor_second.isAuthnRequestsSigned() + keyDescriptor_second1.name == 'sign' + keyDescriptor_second1.usageType == 'signing' + keyDescriptor_second2.name == 'encrypt' + keyDescriptor_second2.usageType == 'encryption' + x509cert_second1.value == 'signingValue' + x509cert_second2.value == 'encryptionValue' + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the initial version is intact + spssoDescriptor.keyDescriptors.size() == 1 + spssoDescriptor.isAuthnRequestsSigned() + keyDescriptor.name == 'sign' + keyDescriptor.usageType == 'signing' + x509cert.value == 'signingValue' + } + + def "test versioning ACS"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + SPSSODescriptor.name, + AssertionConsumerService.name] + + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.assertionConsumerServices = [ + new AssertionConsumerServiceRepresentation(locationUrl: 'http://acs', binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST')] + it + } + + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + SPSSODescriptor spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) + AssertionConsumerService acs = spssoDescriptor.assertionConsumerServices[0] + + then: + entityDescriptorHistory.size() == 1 + !acs.isDefault() + acs.location == 'http://acs' + acs.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + + when: + representation = new EntityDescriptorRepresentation().with { + it.assertionConsumerServices = [ + new AssertionConsumerServiceRepresentation(locationUrl: 'http://acs.updated', binding: 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS', makeDefault: true), + new AssertionConsumerServiceRepresentation(locationUrl: 'http://acs2', binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact')] + it + } + + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + SPSSODescriptor spssoDescriptor2 = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,1)) + def (acs1, acs2) = [spssoDescriptor2.assertionConsumerServices[0], spssoDescriptor2.assertionConsumerServices[1]] + + //Initial revision + spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) + acs = spssoDescriptor.assertionConsumerServices[0] + + then: + entityDescriptorHistory.size() == 2 + acs1.isDefault() + !acs2.isDefault() + acs1.location == 'http://acs.updated' + acs1.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS' + acs2.location == 'http://acs2' + acs2.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact' + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the initial revision is intact + !acs.isDefault() + acs.location == 'http://acs' + acs.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' + } + + def "test versioning logout"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + SPSSODescriptor.name, + SingleLogoutService.name] + + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.logoutEndpoints = [new LogoutEndpointRepresentation(url: 'http://logout', bindingType: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST')] + it + } + + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + SPSSODescriptor spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + SingleLogoutService slo = spssoDescriptor.singleLogoutServices[0] + + then: + entityDescriptorHistory.size() == 1 + slo.location == 'http://logout' + slo.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + representation = new EntityDescriptorRepresentation().with { + it.logoutEndpoints = [new LogoutEndpointRepresentation(url: 'http://logout.updated', bindingType: 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS'), + new LogoutEndpointRepresentation(url: 'http://logout2', bindingType: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact')] + it + } + + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + SPSSODescriptor spssoDescriptor2 = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) + def (slo1, slo2) = [spssoDescriptor2.singleLogoutServices[0], spssoDescriptor2.singleLogoutServices[1]] + + //Initial revision + spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + slo = spssoDescriptor.singleLogoutServices[0] + + then: + entityDescriptorHistory.size() == 2 + slo1.location == 'http://logout.updated' + slo1.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS' + slo2.location == 'http://logout2' + slo2.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact' + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the initial version is intact + slo.location == 'http://logout' + slo.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' + } + + def "test versioning relying party overrides"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + EntityAttributes.name, + Extensions.name, + Attribute.name, + XSBoolean.name, + XSString.name] + + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.relyingPartyOverrides = [signAssertion: true] + it.attributeRelease = ['attr1'] + it + } + + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + EntityAttributes attrs = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + + then: + entityDescriptorHistory.size() == 1 + attrs.attributes[0].attributeValues[0].storedValue == 'true' + attrs.attributes[1].attributeValues[0].xsStringvalue == 'attr1' + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + representation = new EntityDescriptorRepresentation().with { + it.relyingPartyOverrides = [signAssertion: false] + it.attributeRelease = ['attr1', 'attr2'] + it + } + + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + EntityAttributes attrs2 = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) + + //Initial revision + attrs = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + + expectedModifiedPersistentEntities = [EntityDescriptor.name, + EntityAttributes.name, + Attribute.name, + XSString.name] + then: + entityDescriptorHistory.size() == 2 + attrs2.attributes[0].attributeValues[0].xsStringvalue == 'attr1' + attrs2.attributes[0].attributeValues[1].xsStringvalue == 'attr2' + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the initial revision is intact + attrs.attributes[0].attributeValues[0].storedValue == 'true' + attrs.attributes[1].attributeValues[0].xsStringvalue == 'attr1' + attrs.attributes[1].attributeValues[1] == null + } +} diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy index c59834bda..ce6ad7cc6 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy @@ -22,7 +22,7 @@ import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTes @ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration, EntitiesVersioningConfiguration]) @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") -//@Ignore +@Ignore class EnversEntityDescriptorVersionServiceTests extends Specification { @Autowired diff --git a/envers-tests-module/build.gradle b/envers-tests-module/build.gradle new file mode 100644 index 000000000..975da5e36 --- /dev/null +++ b/envers-tests-module/build.gradle @@ -0,0 +1,34 @@ +plugins { + id 'groovy' + id 'jacoco' + id 'org.springframework.boot' version '2.0.0.RELEASE' apply false + id 'io.spring.dependency-management' version '1.0.6.RELEASE' +} + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +repositories { + jcenter() + maven { + url 'https://build.shibboleth.net/nexus/content/groups/public' + artifactUrls = ['https://build.shibboleth.net/nexus/content/repositories/thirdparty-snapshots'] + } +} + +dependencyManagement { + imports { + mavenBom org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES + } +} + +dependencies { + + compile project(':backend') + //testCompile project(':backend') + testCompile project(':backend').sourceSets.test.output + //testCompile "org.springframework.boot:spring-boot-starter-data-jpa" + testCompile "org.springframework.boot:spring-boot-starter-test" + testCompile "org.spockframework:spock-core:1.1-groovy-2.4" + testCompile "org.spockframework:spock-spring:1.1-groovy-2.4" +} diff --git a/envers-tests-module/out/test/classes/META-INF/edu.internet2.tier.shibboleth.admin.ui.envers-tests-module.main.kotlin_module b/envers-tests-module/out/test/classes/META-INF/edu.internet2.tier.shibboleth.admin.ui.envers-tests-module.main.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..2983af70661ad375cc499ebc4da5a68ca46c532e GIT binary patch literal 16 RcmZQzU|?ooU|@t|egFVe02KfL literal 0 HcmV?d00001 diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy similarity index 99% rename from backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy rename to envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 81d5ad7ab..c1c8e8fd3 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -12,6 +12,7 @@ import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.domain.EntityScan import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest + import org.springframework.data.jpa.repository.config.EnableJpaRepositories import org.springframework.test.annotation.DirtiesContext import org.springframework.test.context.ContextConfiguration @@ -29,11 +30,11 @@ import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHE * Testing entity descriptor envers versioning */ @DataJpaTest -@ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration]) +@ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, SearchConfiguration, TestConfiguration]) @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") //@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) -@Ignore +//@Ignore class EntityDescriptorEnversVersioningTests extends Specification { @Autowired diff --git a/settings.gradle b/settings.gradle index 8fae26617..ba298e3de 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include 'backend', 'ui', 'pac4j-module' \ No newline at end of file +include 'backend', 'ui', 'pac4j-module', 'envers-tests-module' From 91ac793f2db25e6833e9159240d9f12d2e472cde Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Sat, 8 Jun 2019 09:35:38 -0400 Subject: [PATCH 051/112] Optimize tests by separating envers tests into a separate module --- ...ityDescriptorEnversVersioningTestsX.groovy | 617 ------------------ ...tityDescriptorEnversVersioningTests.groovy | 5 - ...verEntityBasicEnversVersioningTests.groovy | 0 ...EntityDescriptorVersionServiceTests.groovy | 8 +- 4 files changed, 3 insertions(+), 627 deletions(-) delete mode 100644 backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTestsX.groovy rename {backend => envers-tests-module}/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy (100%) rename {backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service => envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers}/EnversEntityDescriptorVersionServiceTests.groovy (93%) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTestsX.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTestsX.groovy deleted file mode 100644 index a95ded149..000000000 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTestsX.groovy +++ /dev/null @@ -1,617 +0,0 @@ -package edu.internet2.tier.shibboleth.admin.ui.repository.envers - -import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration -import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration -import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration -import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration -import edu.internet2.tier.shibboleth.admin.ui.domain.* -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.* -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.service.EntityDescriptorService -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.autoconfigure.domain.EntityScan -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest -import org.springframework.data.jpa.repository.config.EnableJpaRepositories -import org.springframework.test.annotation.DirtiesContext -import org.springframework.test.context.ContextConfiguration -import org.springframework.transaction.PlatformTransactionManager -import spock.lang.Ignore -import spock.lang.Specification - -import javax.persistence.EntityManager - -import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.* -import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE -import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHER - -/** - * Testing entity descriptor envers versioning - */ -@DataJpaTest -@ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration]) -@EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) -@EntityScan("edu.internet2.tier.shibboleth.admin.ui") -//@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) -@Ignore -class EntityDescriptorEnversVersioningTestsX extends Specification { - - @Autowired - EntityDescriptorRepository entityDescriptorRepository - - @Autowired - EntityDescriptorService entityDescriptorService - - @Autowired - EntityManager entityManager - - @Autowired - PlatformTransactionManager txMgr - - @Autowired - OpenSamlObjects openSamlObjects - - def "test versioning with contact persons"() { - setup: - def expectedModifiedPersistentEntities = [EntityDescriptor.name, ContactPerson.name, GivenName.name, EmailAddress.name] - - when: - def ed = new EntityDescriptor() - def representation = new EntityDescriptorRepresentation().with { - it.contacts = [new ContactRepresentation(type: 'administrative', name: 'name', emailAddress: 'test@test')] - it - } - def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - then: - entityDescriptorHistory.size() == 1 - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].givenName.name == 'name' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].type == ADMINISTRATIVE - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].emailAddresses[0].address == 'test@test' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L - getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() - - when: - representation = new EntityDescriptorRepresentation().with { - it.contacts = [new ContactRepresentation(type: 'administrative', name: 'nameUPDATED', emailAddress: 'test@test')] - it - } - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - then: - entityDescriptorHistory.size() == 2 - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].type == ADMINISTRATIVE - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].emailAddresses[0].address == 'test@test' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L - getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() - - when: - representation = new EntityDescriptorRepresentation().with { - it.contacts = [new ContactRepresentation(type: 'other', name: 'nameUPDATED2', emailAddress: 'test@test.com')] - it - } - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, - entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - then: - entityDescriptorHistory.size() == 3 - getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].givenName.name == 'nameUPDATED2' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].type == OTHER - getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].emailAddresses[0].address == 'test@test.com' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).principalUserName == 'anonymous' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).timestamp > 0L - getModifiedEntityNames(entityDescriptorHistory, 2).sort() == expectedModifiedPersistentEntities.sort() - - //Also make sure we have our original revision - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].type == ADMINISTRATIVE - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].emailAddresses[0].address == 'test@test' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L - - } - - def "test versioning with organization"() { - setup: - def expectedModifiedPersistentEntities = [EntityDescriptor.name, - Organization.name, - OrganizationDisplayName.name, - OrganizationName.name, - OrganizationURL.name] - - when: - EntityDescriptor ed = new EntityDescriptor() - def representation = new EntityDescriptorRepresentation().with { - it.organization = new OrganizationRepresentation(name: 'org', displayName: 'display org', url: 'http://org.edu') - it - } - def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - then: - entityDescriptorHistory.size() == 1 - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.organizationNames[0].value == 'org' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.displayNames[0].value == 'display org' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.URLs[0].value == 'http://org.edu' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L - getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() - - when: - representation = new EntityDescriptorRepresentation().with { - it.organization = new OrganizationRepresentation(name: 'orgUpdated', displayName: 'display org Updated', url: 'http://org2.edu') - it - } - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - then: - entityDescriptorHistory.size() == 2 - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.organizationNames[0].value == 'orgUpdated' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.displayNames[0].value == 'display org Updated' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.URLs[0].value == 'http://org2.edu' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L - getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() - - //Check the original revision is intact - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.organizationNames[0].value == 'org' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.displayNames[0].value == 'display org' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.URLs[0].value == 'http://org.edu' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L - } - - def "test versioning with sp sso descriptor"() { - setup: - def expectedModifiedPersistentEntities = [EntityDescriptor.name, - NameIDFormat.name, - SPSSODescriptor.name] - when: - EntityDescriptor ed = new EntityDescriptor() - def representation = new EntityDescriptorRepresentation().with { - it.serviceProviderSsoDescriptor = new ServiceProviderSsoDescriptorRepresentation().with { - it.protocolSupportEnum = 'SAML 1.1' - it.nameIdFormats = ['format'] - it - } - it - } - def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - then: - entityDescriptorHistory.size() == 1 - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].nameIDFormats[0].format == 'format' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[1] == null - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L - getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() - - when: - representation = new EntityDescriptorRepresentation().with { - it.serviceProviderSsoDescriptor = new ServiceProviderSsoDescriptorRepresentation().with { - it.protocolSupportEnum = 'SAML 1.1, SAML 2' - it.nameIdFormats = ['formatUPDATED'] - it - } - it - } - - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - then: - entityDescriptorHistory.size() == 2 - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].nameIDFormats[0].format == 'formatUPDATED' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[1] == 'urn:oasis:names:tc:SAML:2.0:protocol' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L - getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() - - //Check the original revision is intact - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].nameIDFormats[0].format == 'format' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[1] == null - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L - } - - def "test versioning with uiInfo"() { - setup: - def expectedModifiedPersistentEntities = [EntityDescriptor.name, - Description.name, - DisplayName.name, - SPSSODescriptor.name, - Extensions.name, - InformationURL.name, - Logo.name, - PrivacyStatementURL.name, - UIInfo.name] - - when: - EntityDescriptor ed = new EntityDescriptor() - def representation = new EntityDescriptorRepresentation().with { - it.mdui = new MduiRepresentation().with { - it.displayName = 'Initial display name' - it.informationUrl = 'http://info' - it.privacyStatementUrl = 'http://privacy' - it.description = 'Initial desc' - it.logoUrl = 'http://logo' - it.logoHeight = 20 - it.logoWidth = 30 - it - } - it - } - def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - //Groovy FTW - able to call any private methods on ANY object. Get first revision - UIInfo uiinfo = entityDescriptorService.getUIInfo(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) - - then: - entityDescriptorHistory.size() == 1 - uiinfo.displayNames[0].value == 'Initial display name' - uiinfo.informationURLs[0].value == 'http://info' - uiinfo.privacyStatementURLs[0].value == 'http://privacy' - uiinfo.descriptions[0].value == 'Initial desc' - uiinfo.logos[0].URL == 'http://logo' - uiinfo.logos[0].height == 20 - uiinfo.logos[0].width == 30 - getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() - - when: - representation = new EntityDescriptorRepresentation().with { - it.mdui = new MduiRepresentation().with { - it.displayName = 'Display name UPDATED' - it.informationUrl = 'http://info.updated' - it.privacyStatementUrl = 'http://privacy.updated' - it.description = 'Desc UPDATED' - it.logoUrl = 'http://logo.updated' - it.logoHeight = 30 - it.logoWidth = 40 - it - } - it - } - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - //Get second revision - uiinfo = entityDescriptorService.getUIInfo(getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) - //And initial revision - def uiinfoInitialRevision = entityDescriptorService.getUIInfo(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) - - then: - entityDescriptorHistory.size() == 2 - uiinfo.displayNames[0].value == 'Display name UPDATED' - uiinfo.informationURLs[0].value == 'http://info.updated' - uiinfo.privacyStatementURLs[0].value == 'http://privacy.updated' - uiinfo.descriptions[0].value == 'Desc UPDATED' - uiinfo.logos[0].URL == 'http://logo.updated' - uiinfo.logos[0].height == 30 - uiinfo.logos[0].width == 40 - getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() - - //Check the initial revision is still intact - uiinfoInitialRevision.displayNames[0].value == 'Initial display name' - uiinfoInitialRevision.informationURLs[0].value == 'http://info' - uiinfoInitialRevision.privacyStatementURLs[0].value == 'http://privacy' - uiinfoInitialRevision.descriptions[0].value == 'Initial desc' - uiinfoInitialRevision.logos[0].URL == 'http://logo' - uiinfoInitialRevision.logos[0].height == 20 - uiinfoInitialRevision.logos[0].width == 30 - } - - def "test versioning with security"() { - setup: - def expectedModifiedPersistentEntities = [EntityDescriptor.name, - KeyDescriptor.name, - KeyInfo.name, - SPSSODescriptor.name, - X509Certificate.name, - X509Data.name] - - when: - EntityDescriptor ed = new EntityDescriptor() - def representation = new EntityDescriptorRepresentation().with { - it.securityInfo = new SecurityInfoRepresentation().with { - it.authenticationRequestsSigned = true - it.x509CertificateAvailable = true - it.x509Certificates = [new SecurityInfoRepresentation.X509CertificateRepresentation(name: 'sign', type: 'signing', value: 'signingValue')] - it - } - it - } - - def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - //Get initial revision - SPSSODescriptor spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) - - KeyDescriptor keyDescriptor = spssoDescriptor.keyDescriptors[0] - X509Certificate x509cert = keyDescriptor.keyInfo.x509Datas[0].x509Certificates[0] - - then: - entityDescriptorHistory.size() == 1 - spssoDescriptor.isAuthnRequestsSigned() - keyDescriptor.name == 'sign' - keyDescriptor.usageType == 'signing' - x509cert.value == 'signingValue' - getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() - - when: - representation = new EntityDescriptorRepresentation().with { - it.securityInfo = new SecurityInfoRepresentation().with { - it.authenticationRequestsSigned = false - it.x509CertificateAvailable = true - it.x509Certificates = [new SecurityInfoRepresentation.X509CertificateRepresentation(name: 'sign', type: 'signing', value: 'signingValue'), - new SecurityInfoRepresentation.X509CertificateRepresentation(name: 'encrypt', type: 'encryption', value: 'encryptionValue')] - it - } - it - } - - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - - //Get second revision - SPSSODescriptor spssoDescriptor_second = entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,1)) - - KeyDescriptor keyDescriptor_second1 = spssoDescriptor_second.keyDescriptors[0] - X509Certificate x509cert_second1 = keyDescriptor_second1.keyInfo.x509Datas[0].x509Certificates[0] - KeyDescriptor keyDescriptor_second2 = spssoDescriptor_second.keyDescriptors[1] - X509Certificate x509cert_second2 = keyDescriptor_second2.keyInfo.x509Datas[0].x509Certificates[0] - - - //Get initial revision - spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) - - keyDescriptor = spssoDescriptor.keyDescriptors[0] - x509cert = keyDescriptor.keyInfo.x509Datas[0].x509Certificates[0] - - then: - entityDescriptorHistory.size() == 2 - !spssoDescriptor_second.isAuthnRequestsSigned() - keyDescriptor_second1.name == 'sign' - keyDescriptor_second1.usageType == 'signing' - keyDescriptor_second2.name == 'encrypt' - keyDescriptor_second2.usageType == 'encryption' - x509cert_second1.value == 'signingValue' - x509cert_second2.value == 'encryptionValue' - getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() - - //Check the initial version is intact - spssoDescriptor.keyDescriptors.size() == 1 - spssoDescriptor.isAuthnRequestsSigned() - keyDescriptor.name == 'sign' - keyDescriptor.usageType == 'signing' - x509cert.value == 'signingValue' - } - - def "test versioning ACS"() { - setup: - def expectedModifiedPersistentEntities = [EntityDescriptor.name, - SPSSODescriptor.name, - AssertionConsumerService.name] - - when: - EntityDescriptor ed = new EntityDescriptor() - def representation = new EntityDescriptorRepresentation().with { - it.assertionConsumerServices = [ - new AssertionConsumerServiceRepresentation(locationUrl: 'http://acs', binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST')] - it - } - - def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - SPSSODescriptor spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) - AssertionConsumerService acs = spssoDescriptor.assertionConsumerServices[0] - - then: - entityDescriptorHistory.size() == 1 - !acs.isDefault() - acs.location == 'http://acs' - acs.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' - getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() - - - when: - representation = new EntityDescriptorRepresentation().with { - it.assertionConsumerServices = [ - new AssertionConsumerServiceRepresentation(locationUrl: 'http://acs.updated', binding: 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS', makeDefault: true), - new AssertionConsumerServiceRepresentation(locationUrl: 'http://acs2', binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact')] - it - } - - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - SPSSODescriptor spssoDescriptor2 = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,1)) - def (acs1, acs2) = [spssoDescriptor2.assertionConsumerServices[0], spssoDescriptor2.assertionConsumerServices[1]] - - //Initial revision - spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) - acs = spssoDescriptor.assertionConsumerServices[0] - - then: - entityDescriptorHistory.size() == 2 - acs1.isDefault() - !acs2.isDefault() - acs1.location == 'http://acs.updated' - acs1.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS' - acs2.location == 'http://acs2' - acs2.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact' - getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() - - //Check the initial revision is intact - !acs.isDefault() - acs.location == 'http://acs' - acs.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' - } - - def "test versioning logout"() { - setup: - def expectedModifiedPersistentEntities = [EntityDescriptor.name, - SPSSODescriptor.name, - SingleLogoutService.name] - - when: - EntityDescriptor ed = new EntityDescriptor() - def representation = new EntityDescriptorRepresentation().with { - it.logoutEndpoints = [new LogoutEndpointRepresentation(url: 'http://logout', bindingType: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST')] - it - } - - def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - SPSSODescriptor spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) - SingleLogoutService slo = spssoDescriptor.singleLogoutServices[0] - - then: - entityDescriptorHistory.size() == 1 - slo.location == 'http://logout' - slo.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' - getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() - - when: - representation = new EntityDescriptorRepresentation().with { - it.logoutEndpoints = [new LogoutEndpointRepresentation(url: 'http://logout.updated', bindingType: 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS'), - new LogoutEndpointRepresentation(url: 'http://logout2', bindingType: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact')] - it - } - - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - SPSSODescriptor spssoDescriptor2 = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) - def (slo1, slo2) = [spssoDescriptor2.singleLogoutServices[0], spssoDescriptor2.singleLogoutServices[1]] - - //Initial revision - spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) - slo = spssoDescriptor.singleLogoutServices[0] - - then: - entityDescriptorHistory.size() == 2 - slo1.location == 'http://logout.updated' - slo1.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS' - slo2.location == 'http://logout2' - slo2.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact' - getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() - - //Check the initial version is intact - slo.location == 'http://logout' - slo.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' - } - - def "test versioning relying party overrides"() { - setup: - def expectedModifiedPersistentEntities = [EntityDescriptor.name, - EntityAttributes.name, - Extensions.name, - Attribute.name, - XSBoolean.name, - XSString.name] - - when: - EntityDescriptor ed = new EntityDescriptor() - def representation = new EntityDescriptorRepresentation().with { - it.relyingPartyOverrides = [signAssertion: true] - it.attributeRelease = ['attr1'] - it - } - - def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - EntityAttributes attrs = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) - - then: - entityDescriptorHistory.size() == 1 - attrs.attributes[0].attributeValues[0].storedValue == 'true' - attrs.attributes[1].attributeValues[0].xsStringvalue == 'attr1' - getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() - - when: - representation = new EntityDescriptorRepresentation().with { - it.relyingPartyOverrides = [signAssertion: false] - it.attributeRelease = ['attr1', 'attr2'] - it - } - - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - EntityAttributes attrs2 = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) - - //Initial revision - attrs = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) - - expectedModifiedPersistentEntities = [EntityDescriptor.name, - EntityAttributes.name, - Attribute.name, - XSString.name] - then: - entityDescriptorHistory.size() == 2 - attrs2.attributes[0].attributeValues[0].xsStringvalue == 'attr1' - attrs2.attributes[0].attributeValues[1].xsStringvalue == 'attr2' - getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() - - //Check the initial revision is intact - attrs.attributes[0].attributeValues[0].storedValue == 'true' - attrs.attributes[1].attributeValues[0].xsStringvalue == 'attr1' - attrs.attributes[1].attributeValues[1] == null - } -} diff --git a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index c1c8e8fd3..b2bcd517e 100644 --- a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -12,12 +12,9 @@ import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.domain.EntityScan import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest - import org.springframework.data.jpa.repository.config.EnableJpaRepositories -import org.springframework.test.annotation.DirtiesContext import org.springframework.test.context.ContextConfiguration import org.springframework.transaction.PlatformTransactionManager -import spock.lang.Ignore import spock.lang.Specification import javax.persistence.EntityManager @@ -33,8 +30,6 @@ import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHE @ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, SearchConfiguration, TestConfiguration]) @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") -//@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) -//@Ignore class EntityDescriptorEnversVersioningTests extends Specification { @Autowired diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy similarity index 100% rename from backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy rename to envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy similarity index 93% rename from backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy rename to envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy index ce6ad7cc6..ce1b918e7 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionServiceTests.groovy +++ b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy @@ -1,17 +1,16 @@ -package edu.internet2.tier.shibboleth.admin.ui.service +package edu.internet2.tier.shibboleth.admin.ui.service.envers import edu.internet2.tier.shibboleth.admin.ui.configuration.* import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository +import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService +import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorVersionService import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.domain.EntityScan import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest -import org.springframework.boot.test.context.SpringBootTest import org.springframework.data.jpa.repository.config.EnableJpaRepositories -import org.springframework.test.annotation.DirtiesContext import org.springframework.test.context.ContextConfiguration import org.springframework.transaction.PlatformTransactionManager -import spock.lang.Ignore import spock.lang.Specification import java.time.LocalDateTime @@ -22,7 +21,6 @@ import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTes @ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration, EntitiesVersioningConfiguration]) @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") -@Ignore class EnversEntityDescriptorVersionServiceTests extends Specification { @Autowired From 2c27f1c2b503f1550ef7f8d3e652c2e20698010e Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Mon, 10 Jun 2019 08:48:06 -0700 Subject: [PATCH 052/112] SHIBUI-1267 Updated translation strings --- backend/src/main/resources/i18n/messages.properties | 1 + .../component/metadata-configuration.component.html | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties index 7cadee855..03ae27513 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -236,6 +236,7 @@ label.filter-name=Filter Name label.filter-enabled=Filter Enabled label.filter-target=FilterTarget label.filter-type=Filter Type +label.option=Option label.value=Value label.binding-type=Binding Type label.sign-assertion=Sign Assertions diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html index 30e133525..136e625d7 100644 --- a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html +++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html @@ -9,13 +9,13 @@

- Edit + Edit
- Option - Value + Option + Value
From 712cb28475651ec092610714369d01b9a2c625d0 Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 10 Jun 2019 13:41:41 -0500 Subject: [PATCH 053/112] [SHIBUI-941] release script update --- backend/build.gradle | 1 - build.gradle | 18 ++++++++++++++++++ gradle.properties | 5 +++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/backend/build.gradle b/backend/build.gradle index c7792db77..4e5822e2e 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -3,7 +3,6 @@ plugins { id 'war' id 'org.springframework.boot' version '2.0.0.RELEASE' id 'com.gorylenko.gradle-git-properties' version '1.4.21' - id 'net.researchgate.release' version '2.6.0' id 'io.franzbecker.gradle-lombok' version '1.13' id 'com.palantir.docker' version '0.20.1' id 'com.palantir.docker-run' version '0.20.1' diff --git a/build.gradle b/build.gradle index b1dad6f5c..bd14f8776 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,21 @@ +plugins { + id 'base' + id 'net.researchgate.release' version '2.6.0' + id 'com.github.breadmoirai.github-release' version '2.2.9' +} + +tasks.findByName('release').dependsOn project.getTasksByName('test', true) + +githubRelease { + token project.'github.token' + owner project.'github.owner' + repo project.'github.repo' + releaseAssets project('backend').getTasksByName('bootWar', false).outputs, project('backend').getTasksByName('bootJar', false).outputs + overwrite true +} + +afterReleaseBuild.dependsOn project.getTasksByName('githubRelease', false) + task wrapper(type: Wrapper) { gradleVersion = '4.8.1' } diff --git a/gradle.properties b/gradle.properties index 01ee65808..7fdfbddf8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,3 +12,8 @@ hibernate.version=5.2.11.Final lucene.version=7.2.1 org.gradle.jvmargs=-Xmx4g -XX:-UseGCOverheadLimit + +# set token in personal global +github.token= +github.owner= +github.repo= \ No newline at end of file From 7c00915c4ff2e2e93ba0ee5fe326ff5d4d33f6cf Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 10 Jun 2019 13:45:45 -0500 Subject: [PATCH 054/112] [SHIBUI-941] release script update --- build.gradle | 6 +++--- gradle.properties | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index bd14f8776..e7990c82b 100644 --- a/build.gradle +++ b/build.gradle @@ -7,9 +7,9 @@ plugins { tasks.findByName('release').dependsOn project.getTasksByName('test', true) githubRelease { - token project.'github.token' - owner project.'github.owner' - repo project.'github.repo' + token project.'i2.github.token' + owner project.'i2.github.owner' + repo project.'i2.github.repo' releaseAssets project('backend').getTasksByName('bootWar', false).outputs, project('backend').getTasksByName('bootJar', false).outputs overwrite true } diff --git a/gradle.properties b/gradle.properties index 7fdfbddf8..6d589c817 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,6 +14,6 @@ lucene.version=7.2.1 org.gradle.jvmargs=-Xmx4g -XX:-UseGCOverheadLimit # set token in personal global -github.token= -github.owner= -github.repo= \ No newline at end of file +i2.github.token= +i2.github.owner=tier +i2.github.repo=shib-idp-ui \ No newline at end of file From 1567a9ee526b0199ae33de1190c987f6a5dc1bc8 Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 10 Jun 2019 13:52:33 -0500 Subject: [PATCH 055/112] [SHIBUI-941] release script update --- build.gradle | 1 + gradle.properties | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e7990c82b..ff3c80edc 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,7 @@ githubRelease { repo project.'i2.github.repo' releaseAssets project('backend').getTasksByName('bootWar', false).outputs, project('backend').getTasksByName('bootJar', false).outputs overwrite true + apiEndpoint project.'i2.github.apiEndpoint' } afterReleaseBuild.dependsOn project.getTasksByName('githubRelease', false) diff --git a/gradle.properties b/gradle.properties index 6d589c817..c2bc345fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,4 +16,5 @@ org.gradle.jvmargs=-Xmx4g -XX:-UseGCOverheadLimit # set token in personal global i2.github.token= i2.github.owner=tier -i2.github.repo=shib-idp-ui \ No newline at end of file +i2.github.repo=shib-idp-ui +i2.github.apiEndpoint=https://github.internet2.edu \ No newline at end of file From 27f83820b3d8038530d522a9c020e4958b99e294 Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 10 Jun 2019 14:11:04 -0500 Subject: [PATCH 056/112] update release script config --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index c2bc345fd..39de3eeab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,6 @@ org.gradle.jvmargs=-Xmx4g -XX:-UseGCOverheadLimit # set token in personal global i2.github.token= -i2.github.owner=tier +i2.github.owner=TIER i2.github.repo=shib-idp-ui -i2.github.apiEndpoint=https://github.internet2.edu \ No newline at end of file +i2.github.apiEndpoint=https://github.internet2.edu From 8f1c64a338a51bdd8b2ca6726103f0d805730fce Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 10 Jun 2019 15:46:06 -0400 Subject: [PATCH 057/112] SHIBUI-1262(1306,1309) --- .../tier/shibboleth/admin/ui/ShibbolethUiApplication.java | 2 +- .../admin/ui/envers/PrincipalEnhancingRevisionListener.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/ShibbolethUiApplication.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/ShibbolethUiApplication.java index 2bd90bcc3..42e7901e7 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/ShibbolethUiApplication.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/ShibbolethUiApplication.java @@ -23,7 +23,7 @@ @SpringBootApplication @ComponentScan(excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = "edu.internet2.tier.shibboleth.admin.ui.configuration.auto.*")) -@EntityScan(basePackages = {"edu.internet2.tier.shibboleth.admin.ui.domain", "edu.internet2.tier.shibboleth.admin.ui.security.model"}) +@EntityScan(basePackages = {"edu.internet2.tier.shibboleth.admin.ui.domain", "edu.internet2.tier.shibboleth.admin.ui.envers", "edu.internet2.tier.shibboleth.admin.ui.security.model"}) @EnableJpaAuditing @EnableScheduling @EnableWebSecurity diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/PrincipalEnhancingRevisionListener.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/PrincipalEnhancingRevisionListener.java index 12af196ed..c1895b052 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/PrincipalEnhancingRevisionListener.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/PrincipalEnhancingRevisionListener.java @@ -9,7 +9,7 @@ */ public class PrincipalEnhancingRevisionListener implements RevisionListener { - private static final String ANONYMOUS = "anonymous"; + private static final String ANONYMOUS = "anonymousUser"; @Override public void newRevision(Object revisionEntity) { From 6de2a1563e782b6e1f09caa0f4d261ce26333e14 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 10 Jun 2019 16:04:51 -0400 Subject: [PATCH 058/112] Fix tests --- ...tityDescriptorEnversVersioningTests.groovy | 20 +++++++++---------- ...verEntityBasicEnversVersioningTests.groovy | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index b2bcd517e..795875962 100644 --- a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -67,7 +67,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].givenName.name == 'name' getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].type == ADMINISTRATIVE getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].emailAddresses[0].address == 'test@test' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() @@ -85,7 +85,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].type == ADMINISTRATIVE getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].emailAddresses[0].address == 'test@test' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() @@ -105,7 +105,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].givenName.name == 'nameUPDATED2' getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].type == OTHER getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].emailAddresses[0].address == 'test@test.com' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).principalUserName == 'anonymousUser' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).timestamp > 0L getModifiedEntityNames(entityDescriptorHistory, 2).sort() == expectedModifiedPersistentEntities.sort() @@ -113,7 +113,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].type == ADMINISTRATIVE getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].emailAddresses[0].address == 'test@test' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L } @@ -141,7 +141,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.organizationNames[0].value == 'org' getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.displayNames[0].value == 'display org' getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.URLs[0].value == 'http://org.edu' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() @@ -159,7 +159,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.organizationNames[0].value == 'orgUpdated' getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.displayNames[0].value == 'display org Updated' getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.URLs[0].value == 'http://org2.edu' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() @@ -167,7 +167,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.organizationNames[0].value == 'org' getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.displayNames[0].value == 'display org' getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.URLs[0].value == 'http://org.edu' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L } @@ -196,7 +196,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].nameIDFormats[0].format == 'format' getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[1] == null - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() @@ -220,7 +220,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].nameIDFormats[0].format == 'formatUPDATED' getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[1] == 'urn:oasis:names:tc:SAML:2.0:protocol' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() @@ -228,7 +228,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].nameIDFormats[0].format == 'format' getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[1] == null - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymous' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L } diff --git a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy index c4f70dbcd..226df4476 100644 --- a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy +++ b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy @@ -55,7 +55,7 @@ class MetadataResolverEntityBasicEnversVersioningTests extends Specification { def rev = metadataResolverHistory[0] then: - rev[1].principalUserName == 'anonymous' + rev[1].principalUserName == 'anonymousUser' when: mdr.name = 'Updated' From 256d7c1b84f010dcdc283822861db11e8a4001e0 Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 10 Jun 2019 15:17:40 -0500 Subject: [PATCH 059/112] update configuration --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 39de3eeab..a3b72a8b0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ org.gradle.jvmargs=-Xmx4g -XX:-UseGCOverheadLimit i2.github.token= i2.github.owner=TIER i2.github.repo=shib-idp-ui -i2.github.apiEndpoint=https://github.internet2.edu +i2.github.apiEndpoint=https://github.internet2.edu/api/v3/ From 9f4196052e6be54ba47580754a5e267e67fa6628 Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 10 Jun 2019 15:38:38 -0500 Subject: [PATCH 060/112] update configuration --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a3b72a8b0..335e4cb7b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ org.gradle.jvmargs=-Xmx4g -XX:-UseGCOverheadLimit i2.github.token= i2.github.owner=TIER i2.github.repo=shib-idp-ui -i2.github.apiEndpoint=https://github.internet2.edu/api/v3/ +i2.github.apiEndpoint=https://github.internet2.edu/api/v3 From 712f537c5ba458dfaead04874758c52fef4c410b Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 10 Jun 2019 15:51:35 -0500 Subject: [PATCH 061/112] [Gradle Release Plugin] - pre tag commit: '1.5.3'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 335e4cb7b..2b79a1117 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=1.6.0-SNAPSHOT +version=1.5.3 shibboleth.version=3.4.0 opensaml.version=3.4.0 From df3abf73502e58840f62851e36286f03b1317528 Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 10 Jun 2019 15:52:08 -0500 Subject: [PATCH 062/112] [Gradle Release Plugin] - new version commit: '1.6.0-SNAPSHOT'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2b79a1117..335e4cb7b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=1.5.3 +version=1.6.0-SNAPSHOT shibboleth.version=3.4.0 opensaml.version=3.4.0 From 0b387ccb2bef42d69eda2b2b339ff027b4c196f9 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Tue, 11 Jun 2019 07:36:48 -0700 Subject: [PATCH 063/112] SHIBUI-1269 Implemented configuration xml component --- .../action/configuration.action.ts | 41 +++++++++++ .../metadata-configuration.component.html | 2 +- .../configuration/configuration.module.ts | 4 ++ .../configuration/configuration.routing.ts | 18 ++++- .../container/configuration.component.html | 2 +- .../container/configuration.component.spec.ts | 9 --- .../container/configuration.component.ts | 6 +- .../container/metadata-options.component.html | 3 + .../metadata-options.component.spec.ts | 70 +++++++++++++++++++ .../container/metadata-options.component.ts | 23 ++++++ .../container/metadata-xml.component.html | 7 ++ .../container/metadata-xml.component.spec.ts | 61 ++++++++++++++++ .../container/metadata-xml.component.ts | 33 +++++++++ .../effect/configuration.effect.ts | 63 +++++++++++++++-- .../reducer/configuration.reducer.spec.ts | 39 +++++++++++ .../reducer/configuration.reducer.ts | 10 ++- .../metadata/configuration/reducer/index.ts | 1 + .../dashboard-resolvers-list.component.ts | 3 +- 18 files changed, 372 insertions(+), 23 deletions(-) create mode 100644 ui/src/app/metadata/configuration/container/metadata-options.component.html create mode 100644 ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts create mode 100644 ui/src/app/metadata/configuration/container/metadata-options.component.ts create mode 100644 ui/src/app/metadata/configuration/container/metadata-xml.component.html create mode 100644 ui/src/app/metadata/configuration/container/metadata-xml.component.spec.ts create mode 100644 ui/src/app/metadata/configuration/container/metadata-xml.component.ts diff --git a/ui/src/app/metadata/configuration/action/configuration.action.ts b/ui/src/app/metadata/configuration/action/configuration.action.ts index 6c71b61a6..1aa442601 100644 --- a/ui/src/app/metadata/configuration/action/configuration.action.ts +++ b/ui/src/app/metadata/configuration/action/configuration.action.ts @@ -12,9 +12,17 @@ export enum ConfigurationActionTypes { LOAD_SCHEMA_SUCCESS = '[Metadata Configuration] Load Schema Success', LOAD_SCHEMA_ERROR = '[Metadata Configuration] Load Schema Error', + LOAD_XML_REQUEST = '[Metadata Configuration] Load XML Request', + LOAD_XML_SUCCESS = '[Metadata Configuration] Load XML Success', + LOAD_XML_ERROR = '[Metadata Configuration] Load XML Error', + SET_METADATA = '[Metadata Configuration] Set Metadata Model', SET_DEFINITION = '[Metadata Configuration] Set Metadata Definition', SET_SCHEMA = '[Metadata Configuration] Set Metadata Schema', + SET_XML = '[Metadata Configuration] Set Metadata Xml', + + DOWNLOAD_XML = '[Metadata Configuration] Download Metadata Xml', + CLEAR = '[Metadata Configuration] Clear' } @@ -54,6 +62,24 @@ export class LoadSchemaError implements Action { constructor(public payload: any) { } } +export class LoadXmlRequest implements Action { + readonly type = ConfigurationActionTypes.LOAD_XML_REQUEST; + + constructor(public payload: string) { } +} + +export class LoadXmlSuccess implements Action { + readonly type = ConfigurationActionTypes.LOAD_XML_SUCCESS; + + constructor(public payload: string) { } +} + +export class LoadXmlError implements Action { + readonly type = ConfigurationActionTypes.LOAD_XML_ERROR; + + constructor(public payload: any) { } +} + export class SetMetadata implements Action { readonly type = ConfigurationActionTypes.SET_METADATA; @@ -72,6 +98,16 @@ export class SetSchema implements Action { constructor(public payload: Schema) { } } +export class SetXml implements Action { + readonly type = ConfigurationActionTypes.SET_XML; + + constructor(public payload: string) { } +} + +export class DownloadXml implements Action { + readonly type = ConfigurationActionTypes.DOWNLOAD_XML; +} + export class ClearConfiguration implements Action { readonly type = ConfigurationActionTypes.CLEAR; } @@ -83,7 +119,12 @@ export type ConfigurationActionsUnion = | LoadSchemaRequest | LoadSchemaSuccess | LoadSchemaError + | LoadXmlRequest + | LoadXmlSuccess + | LoadXmlError | SetMetadata | SetDefinition | SetSchema + | SetXml + | DownloadXml | ClearConfiguration; diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html index 136e625d7..258b9aa77 100644 --- a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html +++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/ui/src/app/metadata/configuration/configuration.module.ts b/ui/src/app/metadata/configuration/configuration.module.ts index eb69b14af..2cf56580d 100644 --- a/ui/src/app/metadata/configuration/configuration.module.ts +++ b/ui/src/app/metadata/configuration/configuration.module.ts @@ -17,10 +17,14 @@ import { PrimitivePropertyComponent } from './component/primitive-property.compo import { ObjectPropertyComponent } from './component/object-property.component'; import { ArrayPropertyComponent } from './component/array-property.component'; import { RouterModule } from '@angular/router'; +import { MetadataOptionsComponent } from './container/metadata-options.component'; +import { MetadataXmlComponent } from './container/metadata-xml.component'; @NgModule({ declarations: [ MetadataConfigurationComponent, + MetadataOptionsComponent, + MetadataXmlComponent, ConfigurationPropertyComponent, PrimitivePropertyComponent, ObjectPropertyComponent, diff --git a/ui/src/app/metadata/configuration/configuration.routing.ts b/ui/src/app/metadata/configuration/configuration.routing.ts index c1e6e138d..8e7327792 100644 --- a/ui/src/app/metadata/configuration/configuration.routing.ts +++ b/ui/src/app/metadata/configuration/configuration.routing.ts @@ -1,9 +1,25 @@ import { Routes } from '@angular/router'; import { ConfigurationComponent } from './container/configuration.component'; +import { MetadataOptionsComponent } from './container/metadata-options.component'; +import { MetadataXmlComponent } from './container/metadata-xml.component'; export const ConfigurationRoutes: Routes = [ { path: ':type/:id/configuration', - component: ConfigurationComponent + component: ConfigurationComponent, + children: [ + { + path: '', + redirectTo: 'options' + }, + { + path: 'options', + component: MetadataOptionsComponent + }, + { + path: 'xml', + component: MetadataXmlComponent + } + ] } ]; diff --git a/ui/src/app/metadata/configuration/container/configuration.component.html b/ui/src/app/metadata/configuration/container/configuration.component.html index 1e9f67486..36626f240 100644 --- a/ui/src/app/metadata/configuration/container/configuration.component.html +++ b/ui/src/app/metadata/configuration/container/configuration.component.html @@ -11,7 +11,7 @@
- +
\ No newline at end of file diff --git a/ui/src/app/metadata/configuration/container/configuration.component.spec.ts b/ui/src/app/metadata/configuration/container/configuration.component.spec.ts index a61db7b7c..c399fbacf 100644 --- a/ui/src/app/metadata/configuration/container/configuration.component.spec.ts +++ b/ui/src/app/metadata/configuration/container/configuration.component.spec.ts @@ -9,14 +9,6 @@ import { ConfigurationComponent } from './configuration.component'; import * as fromConfiguration from '../reducer'; import { MockI18nModule } from '../../../../testing/i18n.stub'; -@Component({ - selector: 'metadata-configuration', - template: `` -}) -class MetadataConfigurationComponent { - @Input() configuration: MetadataConfiguration; -} - @Component({ template: ` @@ -47,7 +39,6 @@ describe('Metadata Configuration Page Component', () => { ], declarations: [ ConfigurationComponent, - MetadataConfigurationComponent, TestHostComponent ], }).compileComponents(); diff --git a/ui/src/app/metadata/configuration/container/configuration.component.ts b/ui/src/app/metadata/configuration/container/configuration.component.ts index e22f23861..d18e5ab34 100644 --- a/ui/src/app/metadata/configuration/container/configuration.component.ts +++ b/ui/src/app/metadata/configuration/container/configuration.component.ts @@ -1,7 +1,7 @@ import { Store } from '@ngrx/store'; import { Component, ChangeDetectionStrategy, OnDestroy } from '@angular/core'; import { Observable, Subject } from 'rxjs'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Params } from '@angular/router'; import * as fromConfiguration from '../reducer'; import { MetadataConfiguration } from '../model/metadata-configuration'; @@ -17,14 +17,10 @@ import { LoadMetadataRequest, ClearConfiguration } from '../action/configuration export class ConfigurationComponent implements OnDestroy { private ngUnsubscribe: Subject = new Subject(); - configuration$: Observable; - constructor( private store: Store, private routerState: ActivatedRoute ) { - this.configuration$ = this.store.select(fromConfiguration.getConfigurationSections); - this.routerState.params.pipe( takeUntil(this.ngUnsubscribe), map(params => new LoadMetadataRequest({id: params.id, type: params.type})) diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.html b/ui/src/app/metadata/configuration/container/metadata-options.component.html new file mode 100644 index 000000000..5e6b85384 --- /dev/null +++ b/ui/src/app/metadata/configuration/container/metadata-options.component.html @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts b/ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts new file mode 100644 index 000000000..2e35d8c75 --- /dev/null +++ b/ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts @@ -0,0 +1,70 @@ +import { Component, ViewChild, Input } from '@angular/core'; +import { TestBed, async, ComponentFixture } from '@angular/core/testing'; +import { RouterTestingModule } from '@angular/router/testing'; +import { StoreModule, combineReducers, Store } from '@ngrx/store'; +import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; + +import { MetadataConfiguration } from '../model/metadata-configuration'; +import * as fromConfiguration from '../reducer'; +import { MockI18nModule } from '../../../../testing/i18n.stub'; +import { MetadataOptionsComponent } from './metadata-options.component'; + +@Component({ + selector: 'metadata-configuration', + template: `` +}) +class MetadataConfigurationComponent { + @Input() configuration: MetadataConfiguration; +} + +@Component({ + template: ` + + ` +}) +class TestHostComponent { + @ViewChild(MetadataOptionsComponent) + public componentUnderTest: MetadataOptionsComponent; + + configuration: MetadataConfiguration = { sections: [] }; +} + +describe('Metadata Options Page Component', () => { + + let fixture: ComponentFixture; + let instance: TestHostComponent; + let app: MetadataOptionsComponent; + let store: Store; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + NgbDropdownModule, + StoreModule.forRoot({ + 'metadata-configuration': combineReducers(fromConfiguration.reducers), + }), + MockI18nModule, + RouterTestingModule + ], + declarations: [ + MetadataOptionsComponent, + MetadataConfigurationComponent, + TestHostComponent + ], + }).compileComponents(); + + store = TestBed.get(Store); + spyOn(store, 'dispatch'); + spyOn(store, 'select'); + + fixture = TestBed.createComponent(TestHostComponent); + instance = fixture.componentInstance; + app = instance.componentUnderTest; + fixture.detectChanges(); + })); + + it('should load metadata objects', async(() => { + expect(app).toBeTruthy(); + expect(store.select).toHaveBeenCalled(); + })); +}); diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.ts b/ui/src/app/metadata/configuration/container/metadata-options.component.ts new file mode 100644 index 000000000..bc2d0bb0d --- /dev/null +++ b/ui/src/app/metadata/configuration/container/metadata-options.component.ts @@ -0,0 +1,23 @@ +import { Store } from '@ngrx/store'; +import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { Observable } from 'rxjs'; + +import * as fromConfiguration from '../reducer'; +import { MetadataConfiguration } from '../model/metadata-configuration'; + +@Component({ + selector: 'metadata-options-page', + changeDetection: ChangeDetectionStrategy.OnPush, + templateUrl: './metadata-options.component.html', + styleUrls: [] +}) +export class MetadataOptionsComponent { + + configuration$: Observable; + + constructor( + private store: Store + ) { + this.configuration$ = this.store.select(fromConfiguration.getConfigurationSections); + } +} diff --git a/ui/src/app/metadata/configuration/container/metadata-xml.component.html b/ui/src/app/metadata/configuration/container/metadata-xml.component.html new file mode 100644 index 000000000..c76b4627b --- /dev/null +++ b/ui/src/app/metadata/configuration/container/metadata-xml.component.html @@ -0,0 +1,7 @@ +
+ 
{{ xml$ | async }}
+ +
\ No newline at end of file diff --git a/ui/src/app/metadata/configuration/container/metadata-xml.component.spec.ts b/ui/src/app/metadata/configuration/container/metadata-xml.component.spec.ts new file mode 100644 index 000000000..81fbd836f --- /dev/null +++ b/ui/src/app/metadata/configuration/container/metadata-xml.component.spec.ts @@ -0,0 +1,61 @@ +import { Component, ViewChild, Input } from '@angular/core'; +import { TestBed, async, ComponentFixture } from '@angular/core/testing'; +import { RouterTestingModule } from '@angular/router/testing'; +import { StoreModule, combineReducers, Store } from '@ngrx/store'; +import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; + +import { MetadataConfiguration } from '../model/metadata-configuration'; +import * as fromConfiguration from '../reducer'; +import { MockI18nModule } from '../../../../testing/i18n.stub'; +import { MetadataXmlComponent } from './metadata-xml.component'; + +@Component({ + template: ` + + ` +}) +class TestHostComponent { + @ViewChild(MetadataXmlComponent) + public componentUnderTest: MetadataXmlComponent; + + configuration: MetadataConfiguration = { sections: [] }; +} + +describe('Metadata Xml Page Component', () => { + + let fixture: ComponentFixture; + let instance: TestHostComponent; + let app: MetadataXmlComponent; + let store: Store; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + NgbDropdownModule, + StoreModule.forRoot({ + 'metadata-configuration': combineReducers(fromConfiguration.reducers), + }), + MockI18nModule, + RouterTestingModule + ], + declarations: [ + MetadataXmlComponent, + TestHostComponent + ], + }).compileComponents(); + + store = TestBed.get(Store); + spyOn(store, 'dispatch'); + spyOn(store, 'select'); + + fixture = TestBed.createComponent(TestHostComponent); + instance = fixture.componentInstance; + app = instance.componentUnderTest; + fixture.detectChanges(); + })); + + it('should load metadata objects', async(() => { + expect(app).toBeTruthy(); + expect(store.select).toHaveBeenCalledTimes(2); + })); +}); diff --git a/ui/src/app/metadata/configuration/container/metadata-xml.component.ts b/ui/src/app/metadata/configuration/container/metadata-xml.component.ts new file mode 100644 index 000000000..26b62323e --- /dev/null +++ b/ui/src/app/metadata/configuration/container/metadata-xml.component.ts @@ -0,0 +1,33 @@ +import { Store } from '@ngrx/store'; +import { Component } from '@angular/core'; +import { Observable, Subject } from 'rxjs'; + +import * as fromConfiguration from '../reducer'; +import { Metadata } from '../../domain/domain.type'; +import { DownloadXml } from '../action/configuration.action'; + +@Component({ + selector: 'metadata-xml-page', + templateUrl: './metadata-xml.component.html', + styleUrls: [] +}) +export class MetadataXmlComponent { + + private ngUnsubscribe: Subject = new Subject(); + + entity: Metadata; + entity$: Observable; + xml: string; + xml$: Observable; + + constructor( + private store: Store + ) { + this.xml$ = this.store.select(fromConfiguration.getConfigurationXml); + this.entity$ = this.store.select(fromConfiguration.getConfigurationModel); + } + + preview(): void { + this.store.dispatch(new DownloadXml()); + } +} diff --git a/ui/src/app/metadata/configuration/effect/configuration.effect.ts b/ui/src/app/metadata/configuration/effect/configuration.effect.ts index 781d9a7b9..ff76c8125 100644 --- a/ui/src/app/metadata/configuration/effect/configuration.effect.ts +++ b/ui/src/app/metadata/configuration/effect/configuration.effect.ts @@ -1,7 +1,9 @@ import { Injectable } from '@angular/core'; import { Effect, Actions, ofType } from '@ngrx/effects'; -import { switchMap, catchError, map } from 'rxjs/operators'; -import { of } from 'rxjs'; +import { switchMap, catchError, map, tap, withLatestFrom } from 'rxjs/operators'; +import { of, Observable } from 'rxjs'; +import * as FileSaver from 'file-saver'; +import { Store } from '@ngrx/store'; import { MetadataConfigurationService } from '../service/configuration.service'; import { @@ -14,8 +16,17 @@ import { LoadSchemaRequest, LoadSchemaSuccess, SetSchema, - LoadSchemaError + LoadSchemaError, + LoadXmlSuccess, + LoadXmlError, + SetXml, + DownloadXml } from '../action/configuration.action'; +import { ResolverService } from '../../domain/service/resolver.service'; +import { EntityIdService } from '../../domain/service/entity-id.service'; +import { State } from '../reducer/configuration.reducer'; +import { getConfigurationModel, getConfigurationXml } from '../reducer'; +import { MetadataResolver } from '../../domain/model'; @Injectable() export class MetadataConfigurationEffects { @@ -33,6 +44,33 @@ export class MetadataConfigurationEffects { ) ); + @Effect() + loadMetadataXml$ = this.actions$.pipe( + ofType(ConfigurationActionTypes.LOAD_METADATA_REQUEST), + switchMap(action => { + let loader: Observable; + switch (action.payload.type) { + case 'filter': + loader = this.entityService.preview(action.payload.id); + break; + default: + loader = this.providerService.preview(action.payload.id); + break; + } + + return loader.pipe( + map(xml => new LoadXmlSuccess(xml)), + catchError(error => of(new LoadXmlError(error))) + ); + }) + ); + + @Effect() + setXmlOnLoad$ = this.actions$.pipe( + ofType(ConfigurationActionTypes.LOAD_XML_SUCCESS), + map(action => new SetXml(action.payload)) + ); + @Effect() setMetadataOnLoad$ = this.actions$.pipe( ofType(ConfigurationActionTypes.LOAD_METADATA_SUCCESS), @@ -70,8 +108,25 @@ export class MetadataConfigurationEffects { map(action => new SetSchema(action.payload)) ); + @Effect({dispatch: false}) + downloadXml$ = this.actions$.pipe( + ofType(ConfigurationActionTypes.DOWNLOAD_XML), + withLatestFrom( + this.store.select(getConfigurationModel), + this.store.select(getConfigurationXml) + ), + tap(([action, entity, xml]) => { + const name = entity.name ? entity.name : (entity as MetadataResolver).serviceProviderName; + const blob = new Blob([xml], { type: 'text/xml;charset=utf-8' }); + FileSaver.saveAs(blob, `${name}.xml`); + }) + ); + constructor( private configService: MetadataConfigurationService, - private actions$: Actions + private actions$: Actions, + private providerService: ResolverService, + private entityService: EntityIdService, + private store: Store ) { } } diff --git a/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts b/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts index d02b99560..fed39ff3f 100644 --- a/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts +++ b/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts @@ -14,6 +14,7 @@ describe('Configuration Reducer', () => { serviceProviderName: 'foo', '@type': 'MetadataResolver' }; + const xml = ``; describe('undefined action', () => { it('should return the default state', () => { @@ -50,6 +51,15 @@ describe('Configuration Reducer', () => { }); }); + describe('SET_XML action', () => { + it('should set the state metadata model', () => { + const action = new actions.SetXml(xml); + const result = reducer(initialState, action); + + expect(result).toEqual({ ...initialState, xml }); + }); + }); + describe('CLEAR action', () => { it('should clear the state and reset to initial state', () => { const action = new actions.ClearConfiguration(); @@ -63,4 +73,33 @@ describe('Configuration Reducer', () => { expect(result).toEqual(initialState); }); }); + + describe('selector functions', () => { + /* + export const getModel = (state: State) => state.model; + export const getDefinition = (state: State) => state.definition; + export const getSchema = (state: State) => state.schema; + export const getXml = (state: State) => state.xml; + */ + describe('getModel', () => { + it('should retrieve the model from state', () => { + expect(fromConfig.getModel({...initialState, model})).toBe(model); + }); + }); + describe('getDefinition', () => { + it('should retrieve the definition from state', () => { + expect(fromConfig.getDefinition({ ...initialState, definition })).toBe(definition); + }); + }); + describe('getSchema', () => { + it('should retrieve the schema from state', () => { + expect(fromConfig.getSchema({ ...initialState, schema })).toBe(schema); + }); + }); + describe('getXml', () => { + it('should retrieve the schema from state', () => { + expect(fromConfig.getXml({ ...initialState, xml })).toBe(xml); + }); + }); + }); }); diff --git a/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts b/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts index 966cf634c..a35e20dd7 100644 --- a/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts +++ b/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts @@ -7,12 +7,14 @@ export interface State { model: Metadata; schema: Schema; definition: Wizard; + xml: string; } export const initialState: State = { model: null, schema: null, - definition: null + definition: null, + xml: '' }; export function reducer(state = initialState, action: ConfigurationActionsUnion): State { @@ -32,6 +34,11 @@ export function reducer(state = initialState, action: ConfigurationActionsUnion) ...state, model: action.payload }; + case ConfigurationActionTypes.SET_XML: + return { + ...state, + xml: action.payload + }; case ConfigurationActionTypes.CLEAR: return { ...initialState @@ -45,3 +52,4 @@ export function reducer(state = initialState, action: ConfigurationActionsUnion) export const getModel = (state: State) => state.model; export const getDefinition = (state: State) => state.definition; export const getSchema = (state: State) => state.schema; +export const getXml = (state: State) => state.xml; diff --git a/ui/src/app/metadata/configuration/reducer/index.ts b/ui/src/app/metadata/configuration/reducer/index.ts index e8ba98467..d4c2fcc9c 100644 --- a/ui/src/app/metadata/configuration/reducer/index.ts +++ b/ui/src/app/metadata/configuration/reducer/index.ts @@ -28,6 +28,7 @@ export const getConfigurationState = createSelector(getState, getConfigurationSt export const getConfigurationModel = createSelector(getConfigurationState, fromConfiguration.getModel); export const getConfigurationDefinition = createSelector(getConfigurationState, fromConfiguration.getDefinition); export const getConfigurationSchema = createSelector(getConfigurationState, fromConfiguration.getSchema); +export const getConfigurationXml = createSelector(getConfigurationState, fromConfiguration.getXml); export const getConfigurationSectionsFn = (model, definition, schema) => !definition || !schema ? null : ({ diff --git a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts index 0c20310c7..4de58be3a 100644 --- a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts +++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts @@ -87,7 +87,8 @@ export class DashboardResolversListComponent implements OnInit { } viewConfiguration(entity: MetadataEntity): void { - this.router.navigate(['metadata', 'resolver', entity.getId(), 'configuration']); + // this.store.dispatch(new PreviewEntity({ id: entity.getId(), entity })); + this.router.navigate(['metadata', 'resolver', entity.getId(), 'configuration', 'options']); } viewMetadataHistory(entity: MetadataEntity): void { From de3d93b7ed614b1dfa687e6f6fb93d82d188eab9 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Tue, 11 Jun 2019 07:42:36 -0700 Subject: [PATCH 064/112] SHIBUI-1267 fixed compile error --- .../configuration/container/metadata-xml.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/app/metadata/configuration/container/metadata-xml.component.html b/ui/src/app/metadata/configuration/container/metadata-xml.component.html index c76b4627b..57560ea78 100644 --- a/ui/src/app/metadata/configuration/container/metadata-xml.component.html +++ b/ui/src/app/metadata/configuration/container/metadata-xml.component.html @@ -1,6 +1,6 @@ 
{{ xml$ | async }}
- From 079f6455172a2cdb05e5616426b44052c3a4bd83 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 11 Jun 2019 11:23:09 -0400 Subject: [PATCH 065/112] SHIBUI-1262(1310) --- .../admin/ui/configuration/DevConfig.groovy | 7 -- ...lerVersionEndpointsIntegrationTests.groovy | 81 +++++++++++++++++++ 2 files changed, 81 insertions(+), 7 deletions(-) create mode 100644 envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy index b49d5b858..f748de09f 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy @@ -161,11 +161,4 @@ class DevConfig { it }) } - - /*@Profile('dev-ed-versioning') - @Bean - EntityDescriptorVersionService stubEntityDescriptorVersionService(EntityDescriptorService entityDescriptorService, - EntityDescriptorRepository entityDescriptorRepository) { - return EntityDescriptorVersionService.stubImpl(entityDescriptorService, entityDescriptorRepository) - }*/ } diff --git a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy new file mode 100644 index 000000000..550604777 --- /dev/null +++ b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy @@ -0,0 +1,81 @@ +package edu.internet2.tier.shibboleth.admin.ui.controller + +import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository +import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository +import edu.internet2.tier.shibboleth.admin.ui.util.TestObjectGenerator +import edu.internet2.tier.shibboleth.admin.util.AttributeUtility +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.test.context.ActiveProfiles +import spock.lang.Specification + +/** + * @author Dmitriy Kopylenko + */ +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@ActiveProfiles(['no-auth', 'dev']) +class EntityDescriptorControllerVersionEndpointsIntegrationTests extends Specification { + + @Autowired + private TestRestTemplate restTemplate + + @Autowired + EntityDescriptorRepository entityDescriptorRepository + + static BASE_URI = '/api/EntityDescriptor' + + static ALL_VERSIONS_URI = "$BASE_URI/%s/Versions" + + def "GET /api/EntityDescriptor/{resourceId}/Versions with non-existent entity descriptor"() { + when: + def result = getAllEntityDescriptorVersions('non-existent-ed-id', String) + + then: + result.statusCodeValue == 404 + } + + def "GET /api/EntityDescriptor{resourceId}/Versions with 1 entity descriptor version"() { + given: + EntityDescriptor ed = new EntityDescriptor(entityID: 'http://test/controller', createdBy: 'anonymousUser') + entityDescriptorRepository.save(ed) + + when: + def result = getAllEntityDescriptorVersions(ed.resourceId, List) + + then: + result.statusCodeValue == 200 + result.body.size == 1 + result.body[0].id && result.body[0].creator && result.body[0].date + } + + def "GET /api/EntityDescriptor{resourceId}/Versions with 2 entity descriptor versions"() { + given: + EntityDescriptor ed = new EntityDescriptor(entityID: 'http://test/controller', createdBy: 'anonymousUser') + ed = entityDescriptorRepository.save(ed) + //Will created a second version for UPDATE revision + ed.serviceEnabled = true + entityDescriptorRepository.save(ed) + + when: + def result = getAllEntityDescriptorVersions(ed.resourceId, List) + + then: + result.statusCodeValue == 200 + result.body.size == 2 + result.body[0].id < result.body[1].id + result.body[0].date < result.body[1].date + } + + + + private getAllEntityDescriptorVersions(String resourceId, responseType) { + this.restTemplate.getForEntity(resourceUriFor(ALL_VERSIONS_URI, resourceId), responseType) + } + + + private static resourceUriFor(String uriTemplate, String resourceId) { + String.format(uriTemplate, resourceId) + } +} From 17e10a0d8c07bd9a542047f52aded677c0711b98 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 11 Jun 2019 16:40:03 -0400 Subject: [PATCH 066/112] SHIBUI-1262(1315, 1316) --- .../EntitiesVersioningConfiguration.java | 5 ++- .../EntityDescriptorVersionService.java | 24 ----------- .../EnversEntityDescriptorVersionService.java | 18 ++++++++- ...lerVersionEndpointsIntegrationTests.groovy | 40 +++++++++++++++++++ ...EntityDescriptorVersionServiceTests.groovy | 38 ++++++++++++++++++ 5 files changed, 97 insertions(+), 28 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java index b73448e5e..b190f2f5d 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java @@ -1,5 +1,6 @@ package edu.internet2.tier.shibboleth.admin.ui.configuration; +import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService; import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorVersionService; import edu.internet2.tier.shibboleth.admin.ui.service.EnversEntityDescriptorVersionService; import org.springframework.context.annotation.Bean; @@ -15,7 +16,7 @@ public class EntitiesVersioningConfiguration { private EntityManager entityManager; @Bean - EntityDescriptorVersionService entityDescriptorVersionService() { - return new EnversEntityDescriptorVersionService(entityManager); + EntityDescriptorVersionService entityDescriptorVersionService(EntityDescriptorService entityDescriptorService) { + return new EnversEntityDescriptorVersionService(entityManager, entityDescriptorService); } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java index e53072f99..6803796fa 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java @@ -17,28 +17,4 @@ public interface EntityDescriptorVersionService { List findVersionsForEntityDescriptor(String resourceId); EntityDescriptorRepresentation findSpecificVersionOfEntityDescriptor(String resourceId, String versionId); - - /* Factory method to return stub impl for dev and testing purposes */ - static EntityDescriptorVersionService stubImpl(final EntityDescriptorService entityDescriptorService, - final EntityDescriptorRepository entityDescriptorRepository) { - return new EntityDescriptorVersionService() { - @Override - public List findVersionsForEntityDescriptor(String resourceId) { - return Arrays.asList( - new Version("1", "kramer", LocalDateTime.now().minusDays(10)), - new Version("2", "newman", LocalDateTime.now().minusDays(5)) - ); - } - - @Override - public EntityDescriptorRepresentation findSpecificVersionOfEntityDescriptor(String resourceId, String versionId) { - EntityDescriptor ed = new EntityDescriptor(); - ed.setID("1"); - ed.setEntityID("http://versioning/stub"); - ed.setCreatedBy("kramer"); - ed.setCreatedDate(LocalDateTime.now().minusDays(10)); - return entityDescriptorService.createRepresentationFromDescriptor(ed); - } - }; - } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java index fced0645f..ec1e8ceb8 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java @@ -11,6 +11,7 @@ import org.springframework.data.jpa.repository.JpaContext; import javax.persistence.EntityManager; +import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import java.time.LocalDateTime; import java.time.ZoneId; @@ -29,8 +30,11 @@ public class EnversEntityDescriptorVersionService implements EntityDescriptorVer private EntityManager entityManager; - public EnversEntityDescriptorVersionService(EntityManager entityManager) { + private EntityDescriptorService entityDescriptorService; + + public EnversEntityDescriptorVersionService(EntityManager entityManager, EntityDescriptorService entityDescriptorService) { this.entityManager = entityManager; + this.entityDescriptorService = entityDescriptorService; } @Override @@ -58,6 +62,16 @@ public List findVersionsForEntityDescriptor(String resourceId) { @Override public EntityDescriptorRepresentation findSpecificVersionOfEntityDescriptor(String resourceId, String versionId) { - return null; + try { + Object revision = AuditReaderFactory.get(entityManager).createQuery() + .forEntitiesAtRevision(EntityDescriptor.class, Integer.valueOf(versionId)) + .add(AuditEntity.property("resourceId").eq(resourceId)) + .add(AuditEntity.revisionNumber().eq(Integer.valueOf(versionId))) + .getSingleResult(); + return entityDescriptorService.createRepresentationFromDescriptor((EntityDescriptor) revision); + } + catch (NoResultException e) { + return null; + } } } diff --git a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy index 550604777..f7b2c90b0 100644 --- a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy +++ b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.controller 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.repository.EntityDescriptorRepository import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository import edu.internet2.tier.shibboleth.admin.ui.util.TestObjectGenerator @@ -28,6 +29,8 @@ class EntityDescriptorControllerVersionEndpointsIntegrationTests extends Specifi static ALL_VERSIONS_URI = "$BASE_URI/%s/Versions" + static SPECIFIC_VERSION_URI = "$BASE_URI/%s/Versions/%s" + def "GET /api/EntityDescriptor/{resourceId}/Versions with non-existent entity descriptor"() { when: def result = getAllEntityDescriptorVersions('non-existent-ed-id', String) @@ -68,12 +71,49 @@ class EntityDescriptorControllerVersionEndpointsIntegrationTests extends Specifi result.body[0].date < result.body[1].date } + def "GET /api/EntityDescriptor{resourceId}/Versions/{version} for non existent version"() { + given: + EntityDescriptor ed = new EntityDescriptor(entityID: 'http://test/controller', createdBy: 'anonymousUser') + ed = entityDescriptorRepository.save(ed) + + when: + def result = getEntityDescriptorForVersion(ed.resourceId, '1000', EntityDescriptorRepresentation) + + then: + result.statusCodeValue == 404 + } + + def "GET /api/EntityDescriptor{resourceId}/Versions/{version} with 2 entity descriptor versions returns correct ED for specific versions"() { + given: + EntityDescriptor ed = new EntityDescriptor(entityID: 'http://test/controller', createdBy: 'anonymousUser', serviceProviderName: 'SP1') + ed = entityDescriptorRepository.save(ed) + //Will created a second version for UPDATE revision + ed.serviceProviderName = 'SP2' + entityDescriptorRepository.save(ed) + when: + def allVersions = getAllEntityDescriptorVersions(ed.resourceId, List) + def edv1 = getEntityDescriptorForVersion(ed.resourceId, allVersions.body[0].id, EntityDescriptorRepresentation) + def edv2 = getEntityDescriptorForVersion(ed.resourceId, allVersions.body[1].id, EntityDescriptorRepresentation) + + then: + edv1.statusCodeValue == 200 + edv1.body.serviceProviderName == 'SP1' + edv2.statusCodeValue == 200 + edv2.body.serviceProviderName == 'SP2' + } private getAllEntityDescriptorVersions(String resourceId, responseType) { this.restTemplate.getForEntity(resourceUriFor(ALL_VERSIONS_URI, resourceId), responseType) } + private getEntityDescriptorForVersion(String resourceId, String version, responseType) { + this.restTemplate.getForEntity(resourceUriFor(SPECIFIC_VERSION_URI, resourceId, version), responseType) + } + + private static resourceUriFor(String uriTemplate, String resourceId, String version) { + String.format(uriTemplate, resourceId, version) + } private static resourceUriFor(String uriTemplate, String resourceId) { String.format(uriTemplate, resourceId) diff --git a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy index ce1b918e7..738187741 100644 --- a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy +++ b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy @@ -75,4 +75,42 @@ class EnversEntityDescriptorVersionServiceTests extends Specification { versions[0].creator && versions[1].creator && versions[2].creator (versions[0].date < versions[1].date) && (versions[1].date < versions[2].date) } + + def "versioning service returns correct entity descriptor for version number"() { + when: 'Initial version' + EntityDescriptor ed = new EntityDescriptor(entityID: 'ed', serviceProviderName: 'SP1', createdBy: 'anonymousUser') + ed = doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(ed) + } + def versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) + def v1EdRepresentation = entityDescriptorVersionService.findSpecificVersionOfEntityDescriptor(ed.resourceId, versions[0].id) + + then: + v1EdRepresentation.serviceProviderName == 'SP1' + v1EdRepresentation.id == ed.resourceId + + when: 'Update the original' + ed.serviceProviderName = 'SP2' + ed = doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(ed) + } + versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) + def v2EdRepresentation = entityDescriptorVersionService.findSpecificVersionOfEntityDescriptor(ed.resourceId, versions[1].id) + + then: + v2EdRepresentation.serviceProviderName == 'SP2' + v2EdRepresentation.id == ed.resourceId + } + + def "versioning service returns null for non existent version number"() { + when: 'Initial version' + EntityDescriptor ed = new EntityDescriptor(entityID: 'ed', serviceProviderName: 'SP1', createdBy: 'anonymousUser') + ed = doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(ed) + } + def edRepresentation = entityDescriptorVersionService.findSpecificVersionOfEntityDescriptor(ed.resourceId, '1000') + + then: + !edRepresentation + } } From a4da87d49b0938f0c08bfcd297df097de719f1c6 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Wed, 12 Jun 2019 11:11:02 -0400 Subject: [PATCH 067/112] WIP1 --- .../admin/ui/configuration/DevConfig.groovy | 18 +++++++++--------- ...JsonSchemaValidatingControllerAdvice.groovy | 7 ++----- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy index f748de09f..9267ceeae 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy @@ -1,6 +1,5 @@ package edu.internet2.tier.shibboleth.admin.ui.configuration - import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget @@ -12,14 +11,10 @@ import edu.internet2.tier.shibboleth.admin.ui.security.model.Role import edu.internet2.tier.shibboleth.admin.ui.security.model.User import edu.internet2.tier.shibboleth.admin.ui.security.repository.RoleRepository import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository -import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService -import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorVersionService import edu.internet2.tier.shibboleth.admin.util.ModelRepresentationConversions -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.context.event.ApplicationStartedEvent + import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Profile -import org.springframework.context.event.EventListener import org.springframework.stereotype.Component import org.springframework.transaction.annotation.Transactional @@ -34,14 +29,19 @@ class DevConfig { private final MetadataResolverRepository metadataResolverRepository private final EntityDescriptorRepository entityDescriptorRepository - @Autowired - private OpenSamlObjects openSamlObjects + private final OpenSamlObjects openSamlObjects + + DevConfig(UserRepository adminUserRepository, + MetadataResolverRepository metadataResolverRepository, + RoleRepository roleRepository, + EntityDescriptorRepository entityDescriptorRepository, + OpenSamlObjects openSamlObjects) { - DevConfig(UserRepository adminUserRepository, MetadataResolverRepository metadataResolverRepository, RoleRepository roleRepository, EntityDescriptorRepository entityDescriptorRepository) { this.adminUserRepository = adminUserRepository this.metadataResolverRepository = metadataResolverRepository this.roleRepository = roleRepository this.entityDescriptorRepository = entityDescriptorRepository + this.openSamlObjects = openSamlObjects } @Transactional diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/RelyingPartyOverridesJsonSchemaValidatingControllerAdvice.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/RelyingPartyOverridesJsonSchemaValidatingControllerAdvice.groovy index bd3050cfd..620d2252c 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/RelyingPartyOverridesJsonSchemaValidatingControllerAdvice.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/RelyingPartyOverridesJsonSchemaValidatingControllerAdvice.groovy @@ -1,16 +1,13 @@ package edu.internet2.tier.shibboleth.admin.ui.jsonschema -import edu.internet2.tier.shibboleth.admin.ui.controller.ErrorResponse + import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation import mjson.Json import org.springframework.beans.factory.annotation.Autowired import org.springframework.core.MethodParameter import org.springframework.http.HttpInputMessage -import org.springframework.http.HttpStatus -import org.springframework.http.ResponseEntity import org.springframework.http.converter.HttpMessageConverter import org.springframework.web.bind.annotation.ControllerAdvice -import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.servlet.mvc.method.annotation.RequestBodyAdviceAdapter import javax.annotation.PostConstruct @@ -24,7 +21,7 @@ import static edu.internet2.tier.shibboleth.admin.ui.jsonschema.JsonSchemaLocati * * @author Dmitriy Kopylenko */ -//@ControllerAdvice +@ControllerAdvice class RelyingPartyOverridesJsonSchemaValidatingControllerAdvice extends RequestBodyAdviceAdapter { @Autowired From 22dc54acc77bdadd900d057bfd7518694e2f9b69 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Wed, 12 Jun 2019 11:18:51 -0400 Subject: [PATCH 068/112] WIP2 --- .../shibboleth/admin/ui/configuration/DevConfig.groovy | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy index 9267ceeae..e6ef57980 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy @@ -3,7 +3,12 @@ package edu.internet2.tier.shibboleth.admin.ui.configuration import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget -import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.* +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.HttpMetadataResolverAttributes +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataQueryProtocolScheme +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.ui.opensaml.OpenSamlObjects import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository From 43864f8d43bb1bb193c3689905b4f166dd4fa84c Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Wed, 12 Jun 2019 11:27:51 -0400 Subject: [PATCH 069/112] WIP3 --- .../JPAEntityDescriptorServiceImplTests.groovy | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests.groovy index 38dfb821e..1c1778c60 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests.groovy @@ -4,8 +4,20 @@ import com.fasterxml.jackson.databind.ObjectMapper import edu.internet2.tier.shibboleth.admin.ui.ShibbolethUiApplication import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.CustomPropertiesConfiguration -import edu.internet2.tier.shibboleth.admin.ui.domain.* -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.* +import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.XSAny +import edu.internet2.tier.shibboleth.admin.ui.domain.XSAnyBuilder +import edu.internet2.tier.shibboleth.admin.ui.domain.XSBoolean +import edu.internet2.tier.shibboleth.admin.ui.domain.XSBooleanBuilder +import edu.internet2.tier.shibboleth.admin.ui.domain.XSStringBuilder +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.AssertionConsumerServiceRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.LogoutEndpointRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.MduiRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.OrganizationRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.SecurityInfoRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ServiceProviderSsoDescriptorRepresentation import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects import edu.internet2.tier.shibboleth.admin.ui.security.repository.RoleRepository import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository From 23a863d6310bf71593bfec3ebdce0184f1b2edab Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Wed, 12 Jun 2019 11:29:57 -0400 Subject: [PATCH 070/112] WIP4 --- .../admin/ui/service/EnversEntityDescriptorVersionService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java index ec1e8ceb8..91dccd5af 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java @@ -21,7 +21,7 @@ import java.util.stream.Collectors; import static java.util.Comparator.comparing; -import static java.util.stream.Collectors.*; +import static java.util.stream.Collectors.toList; /** * Hibernate Envers based implementation of {@link EntityDescriptorVersionService}. From 15db654cdcb00b5ec75e35dd62a32de8557c5819 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Wed, 12 Jun 2019 13:52:52 -0400 Subject: [PATCH 071/112] WIP5 --- backend/build.gradle | 26 + ...lerVersionEndpointsIntegrationTests.groovy | 118 ++++ ...tityDescriptorEnversVersioningTests.groovy | 609 ++++++++++++++++++ ...verEntityBasicEnversVersioningTests.groovy | 104 +++ ...EntityDescriptorVersionServiceTests.groovy | 114 ++++ settings.gradle | 2 +- 6 files changed, 972 insertions(+), 1 deletion(-) create mode 100644 backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy create mode 100644 backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy create mode 100644 backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy create mode 100644 backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy diff --git a/backend/build.gradle b/backend/build.gradle index 4e5822e2e..6dd21a097 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -44,6 +44,13 @@ configurations { integrationTestRuntime { extendsFrom testRuntime } + enversTestCompile { + extendsFrom testCompile + + } + enversTestRuntime { + extendsFrom testRuntime + } } processResources.dependsOn(':ui:npm_run_buildProd') @@ -197,6 +204,13 @@ sourceSets { srcDir 'src/integration/resources' } } + enversTest { + groovy { + srcDirs = ['src/enversTest/groovy'] + compileClasspath += main.output + test.output + runtimeClasspath += main.output + test.output + } + } } task integrationTest(type: Test) { @@ -210,6 +224,18 @@ task integrationTest(type: Test) { systemProperties['user.dir'] = workingDir } +task enversTest(type: Test) { + group = 'verification' + description = 'Run tests pertaing to envers versioning engine' + testClassesDirs = sourceSets.enversTest.output.classesDirs + classpath = sourceSets.enversTest.runtimeClasspath + systemProperties = System.properties + systemProperties['user.dir'] = workingDir +} +test.finalizedBy enversTest + + + task generateSources { inputs.dir('src/main/templates') inputs.files fileTree('src/main/resources') { diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy new file mode 100644 index 000000000..705f50021 --- /dev/null +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy @@ -0,0 +1,118 @@ +package edu.internet2.tier.shibboleth.admin.ui.controller + +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.repository.EntityDescriptorRepository +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.test.context.ActiveProfiles +import spock.lang.Specification + +/** + * @author Dmitriy Kopylenko + */ +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@ActiveProfiles(['no-auth', 'dev']) +class EntityDescriptorControllerVersionEndpointsIntegrationTests extends Specification { + + @Autowired + private TestRestTemplate restTemplate + + @Autowired + EntityDescriptorRepository entityDescriptorRepository + + static BASE_URI = '/api/EntityDescriptor' + + static ALL_VERSIONS_URI = "$BASE_URI/%s/Versions" + + static SPECIFIC_VERSION_URI = "$BASE_URI/%s/Versions/%s" + + def "GET /api/EntityDescriptor/{resourceId}/Versions with non-existent entity descriptor"() { + when: + def result = getAllEntityDescriptorVersions('non-existent-ed-id', String) + + then: + result.statusCodeValue == 404 + } + + def "GET /api/EntityDescriptor{resourceId}/Versions with 1 entity descriptor version"() { + given: + EntityDescriptor ed = new EntityDescriptor(entityID: 'http://test/controller', createdBy: 'anonymousUser') + entityDescriptorRepository.save(ed) + + when: + def result = getAllEntityDescriptorVersions(ed.resourceId, List) + + then: + result.statusCodeValue == 200 + result.body.size == 1 + result.body[0].id && result.body[0].creator && result.body[0].date + } + + def "GET /api/EntityDescriptor{resourceId}/Versions with 2 entity descriptor versions"() { + given: + EntityDescriptor ed = new EntityDescriptor(entityID: 'http://test/controller', createdBy: 'anonymousUser') + ed = entityDescriptorRepository.save(ed) + //Will created a second version for UPDATE revision + ed.serviceEnabled = true + entityDescriptorRepository.save(ed) + + when: + def result = getAllEntityDescriptorVersions(ed.resourceId, List) + + then: + result.statusCodeValue == 200 + result.body.size == 2 + result.body[0].id < result.body[1].id + result.body[0].date < result.body[1].date + } + + def "GET /api/EntityDescriptor{resourceId}/Versions/{version} for non existent version"() { + given: + EntityDescriptor ed = new EntityDescriptor(entityID: 'http://test/controller', createdBy: 'anonymousUser') + ed = entityDescriptorRepository.save(ed) + + when: + def result = getEntityDescriptorForVersion(ed.resourceId, '1000', EntityDescriptorRepresentation) + + then: + result.statusCodeValue == 404 + } + + def "GET /api/EntityDescriptor{resourceId}/Versions/{version} with 2 entity descriptor versions returns correct ED for specific versions"() { + given: + EntityDescriptor ed = new EntityDescriptor(entityID: 'http://test/controller', createdBy: 'anonymousUser', serviceProviderName: 'SP1') + ed = entityDescriptorRepository.save(ed) + //Will created a second version for UPDATE revision + ed.serviceProviderName = 'SP2' + entityDescriptorRepository.save(ed) + + when: + def allVersions = getAllEntityDescriptorVersions(ed.resourceId, List) + def edv1 = getEntityDescriptorForVersion(ed.resourceId, allVersions.body[0].id, EntityDescriptorRepresentation) + def edv2 = getEntityDescriptorForVersion(ed.resourceId, allVersions.body[1].id, EntityDescriptorRepresentation) + + then: + edv1.statusCodeValue == 200 + edv1.body.serviceProviderName == 'SP1' + edv2.statusCodeValue == 200 + edv2.body.serviceProviderName == 'SP2' + } + + private getAllEntityDescriptorVersions(String resourceId, responseType) { + this.restTemplate.getForEntity(resourceUriFor(ALL_VERSIONS_URI, resourceId), responseType) + } + + private getEntityDescriptorForVersion(String resourceId, String version, responseType) { + this.restTemplate.getForEntity(resourceUriFor(SPECIFIC_VERSION_URI, resourceId, version), responseType) + } + + private static resourceUriFor(String uriTemplate, String resourceId, String version) { + String.format(uriTemplate, resourceId, version) + } + + private static resourceUriFor(String uriTemplate, String resourceId) { + String.format(uriTemplate, resourceId) + } +} diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy new file mode 100644 index 000000000..f8f97b0fc --- /dev/null +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -0,0 +1,609 @@ +package edu.internet2.tier.shibboleth.admin.ui.repository.envers + +import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration +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.service.EntityDescriptorService +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.autoconfigure.domain.EntityScan +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest +import org.springframework.data.jpa.repository.config.EnableJpaRepositories +import org.springframework.test.context.ContextConfiguration +import org.springframework.transaction.PlatformTransactionManager +import spock.lang.Specification + +import javax.persistence.EntityManager + +import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.* + +/** + * Testing entity descriptor envers versioning + */ +@DataJpaTest +@ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, SearchConfiguration, TestConfiguration]) +@EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) +@EntityScan("edu.internet2.tier.shibboleth.admin.ui") +class EntityDescriptorEnversVersioningTests extends Specification { + + @Autowired + EntityDescriptorRepository entityDescriptorRepository + + @Autowired + EntityDescriptorService entityDescriptorService + + @Autowired + EntityManager entityManager + + @Autowired + PlatformTransactionManager txMgr + + @Autowired + OpenSamlObjects openSamlObjects + + def "test versioning with contact persons"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, ContactPerson.name, GivenName.name, EmailAddress.name] + + when: + def ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.contacts = [new ContactRepresentation(type: 'administrative', name: 'name', emailAddress: 'test@test')] + it + } + def entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + then: + entityDescriptorHistory.size() == 1 + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].givenName.name == 'name' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].type == org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].emailAddresses[0].address == 'test@test' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + representation = new EntityDescriptorRepresentation().with { + it.contacts = [new ContactRepresentation(type: 'administrative', name: 'nameUPDATED', emailAddress: 'test@test')] + it + } + entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + then: + entityDescriptorHistory.size() == 2 + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].type == org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].emailAddresses[0].address == 'test@test' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + when: + representation = new EntityDescriptorRepresentation().with { + it.contacts = [new ContactRepresentation(type: 'other', name: 'nameUPDATED2', emailAddress: 'test@test.com')] + it + } + entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, + entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + then: + entityDescriptorHistory.size() == 3 + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].givenName.name == 'nameUPDATED2' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].type == org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHER + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].emailAddresses[0].address == 'test@test.com' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).principalUserName == 'anonymousUser' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).timestamp > 0L + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 2).sort() == expectedModifiedPersistentEntities.sort() + + //Also make sure we have our original revision + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].type == org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].emailAddresses[0].address == 'test@test' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L + + } + + def "test versioning with organization"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + Organization.name, + OrganizationDisplayName.name, + OrganizationName.name, + OrganizationURL.name] + + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.organization = new OrganizationRepresentation(name: 'org', displayName: 'display org', url: 'http://org.edu') + it + } + def entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + then: + entityDescriptorHistory.size() == 1 + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.organizationNames[0].value == 'org' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.displayNames[0].value == 'display org' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.URLs[0].value == 'http://org.edu' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + representation = new EntityDescriptorRepresentation().with { + it.organization = new OrganizationRepresentation(name: 'orgUpdated', displayName: 'display org Updated', url: 'http://org2.edu') + it + } + entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + then: + entityDescriptorHistory.size() == 2 + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.organizationNames[0].value == 'orgUpdated' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.displayNames[0].value == 'display org Updated' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.URLs[0].value == 'http://org2.edu' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the original revision is intact + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.organizationNames[0].value == 'org' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.displayNames[0].value == 'display org' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.URLs[0].value == 'http://org.edu' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L + } + + def "test versioning with sp sso descriptor"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + NameIDFormat.name, + SPSSODescriptor.name] + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.serviceProviderSsoDescriptor = new ServiceProviderSsoDescriptorRepresentation().with { + it.protocolSupportEnum = 'SAML 1.1' + it.nameIdFormats = ['format'] + it + } + it + } + def entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + then: + entityDescriptorHistory.size() == 1 + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].nameIDFormats[0].format == 'format' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[1] == null + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + representation = new EntityDescriptorRepresentation().with { + it.serviceProviderSsoDescriptor = new ServiceProviderSsoDescriptorRepresentation().with { + it.protocolSupportEnum = 'SAML 1.1, SAML 2' + it.nameIdFormats = ['formatUPDATED'] + it + } + it + } + + entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + then: + entityDescriptorHistory.size() == 2 + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].nameIDFormats[0].format == 'formatUPDATED' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[1] == 'urn:oasis:names:tc:SAML:2.0:protocol' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the original revision is intact + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].nameIDFormats[0].format == 'format' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[1] == null + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + } + + def "test versioning with uiInfo"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + Description.name, + DisplayName.name, + SPSSODescriptor.name, + Extensions.name, + InformationURL.name, + Logo.name, + PrivacyStatementURL.name, + UIInfo.name] + + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.mdui = new MduiRepresentation().with { + it.displayName = 'Initial display name' + it.informationUrl = 'http://info' + it.privacyStatementUrl = 'http://privacy' + it.description = 'Initial desc' + it.logoUrl = 'http://logo' + it.logoHeight = 20 + it.logoWidth = 30 + it + } + it + } + def entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + //Groovy FTW - able to call any private methods on ANY object. Get first revision + UIInfo uiinfo = entityDescriptorService.getUIInfo(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + + then: + entityDescriptorHistory.size() == 1 + uiinfo.displayNames[0].value == 'Initial display name' + uiinfo.informationURLs[0].value == 'http://info' + uiinfo.privacyStatementURLs[0].value == 'http://privacy' + uiinfo.descriptions[0].value == 'Initial desc' + uiinfo.logos[0].URL == 'http://logo' + uiinfo.logos[0].height == 20 + uiinfo.logos[0].width == 30 + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + representation = new EntityDescriptorRepresentation().with { + it.mdui = new MduiRepresentation().with { + it.displayName = 'Display name UPDATED' + it.informationUrl = 'http://info.updated' + it.privacyStatementUrl = 'http://privacy.updated' + it.description = 'Desc UPDATED' + it.logoUrl = 'http://logo.updated' + it.logoHeight = 30 + it.logoWidth = 40 + it + } + it + } + entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + //Get second revision + uiinfo = entityDescriptorService.getUIInfo(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) + //And initial revision + def uiinfoInitialRevision = entityDescriptorService.getUIInfo(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + + then: + entityDescriptorHistory.size() == 2 + uiinfo.displayNames[0].value == 'Display name UPDATED' + uiinfo.informationURLs[0].value == 'http://info.updated' + uiinfo.privacyStatementURLs[0].value == 'http://privacy.updated' + uiinfo.descriptions[0].value == 'Desc UPDATED' + uiinfo.logos[0].URL == 'http://logo.updated' + uiinfo.logos[0].height == 30 + uiinfo.logos[0].width == 40 + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the initial revision is still intact + uiinfoInitialRevision.displayNames[0].value == 'Initial display name' + uiinfoInitialRevision.informationURLs[0].value == 'http://info' + uiinfoInitialRevision.privacyStatementURLs[0].value == 'http://privacy' + uiinfoInitialRevision.descriptions[0].value == 'Initial desc' + uiinfoInitialRevision.logos[0].URL == 'http://logo' + uiinfoInitialRevision.logos[0].height == 20 + uiinfoInitialRevision.logos[0].width == 30 + } + + def "test versioning with security"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + KeyDescriptor.name, + KeyInfo.name, + SPSSODescriptor.name, + X509Certificate.name, + X509Data.name] + + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.securityInfo = new SecurityInfoRepresentation().with { + it.authenticationRequestsSigned = true + it.x509CertificateAvailable = true + it.x509Certificates = [new SecurityInfoRepresentation.X509CertificateRepresentation(name: 'sign', type: 'signing', value: 'signingValue')] + it + } + it + } + + def entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + //Get initial revision + SPSSODescriptor spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) + + KeyDescriptor keyDescriptor = spssoDescriptor.keyDescriptors[0] + X509Certificate x509cert = keyDescriptor.keyInfo.x509Datas[0].x509Certificates[0] + + then: + entityDescriptorHistory.size() == 1 + spssoDescriptor.isAuthnRequestsSigned() + keyDescriptor.name == 'sign' + keyDescriptor.usageType == 'signing' + x509cert.value == 'signingValue' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + representation = new EntityDescriptorRepresentation().with { + it.securityInfo = new SecurityInfoRepresentation().with { + it.authenticationRequestsSigned = false + it.x509CertificateAvailable = true + it.x509Certificates = [new SecurityInfoRepresentation.X509CertificateRepresentation(name: 'sign', type: 'signing', value: 'signingValue'), + new SecurityInfoRepresentation.X509CertificateRepresentation(name: 'encrypt', type: 'encryption', value: 'encryptionValue')] + it + } + it + } + + entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + + //Get second revision + SPSSODescriptor spssoDescriptor_second = entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory,1)) + + KeyDescriptor keyDescriptor_second1 = spssoDescriptor_second.keyDescriptors[0] + X509Certificate x509cert_second1 = keyDescriptor_second1.keyInfo.x509Datas[0].x509Certificates[0] + KeyDescriptor keyDescriptor_second2 = spssoDescriptor_second.keyDescriptors[1] + X509Certificate x509cert_second2 = keyDescriptor_second2.keyInfo.x509Datas[0].x509Certificates[0] + + + //Get initial revision + spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) + + keyDescriptor = spssoDescriptor.keyDescriptors[0] + x509cert = keyDescriptor.keyInfo.x509Datas[0].x509Certificates[0] + + then: + entityDescriptorHistory.size() == 2 + !spssoDescriptor_second.isAuthnRequestsSigned() + keyDescriptor_second1.name == 'sign' + keyDescriptor_second1.usageType == 'signing' + keyDescriptor_second2.name == 'encrypt' + keyDescriptor_second2.usageType == 'encryption' + x509cert_second1.value == 'signingValue' + x509cert_second2.value == 'encryptionValue' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the initial version is intact + spssoDescriptor.keyDescriptors.size() == 1 + spssoDescriptor.isAuthnRequestsSigned() + keyDescriptor.name == 'sign' + keyDescriptor.usageType == 'signing' + x509cert.value == 'signingValue' + } + + def "test versioning ACS"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + SPSSODescriptor.name, + AssertionConsumerService.name] + + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.assertionConsumerServices = [ + new AssertionConsumerServiceRepresentation(locationUrl: 'http://acs', binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST')] + it + } + + def entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + SPSSODescriptor spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) + AssertionConsumerService acs = spssoDescriptor.assertionConsumerServices[0] + + then: + entityDescriptorHistory.size() == 1 + !acs.isDefault() + acs.location == 'http://acs' + acs.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + + when: + representation = new EntityDescriptorRepresentation().with { + it.assertionConsumerServices = [ + new AssertionConsumerServiceRepresentation(locationUrl: 'http://acs.updated', binding: 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS', makeDefault: true), + new AssertionConsumerServiceRepresentation(locationUrl: 'http://acs2', binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact')] + it + } + + entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + SPSSODescriptor spssoDescriptor2 = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory,1)) + def (acs1, acs2) = [spssoDescriptor2.assertionConsumerServices[0], spssoDescriptor2.assertionConsumerServices[1]] + + //Initial revision + spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) + acs = spssoDescriptor.assertionConsumerServices[0] + + then: + entityDescriptorHistory.size() == 2 + acs1.isDefault() + !acs2.isDefault() + acs1.location == 'http://acs.updated' + acs1.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS' + acs2.location == 'http://acs2' + acs2.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the initial revision is intact + !acs.isDefault() + acs.location == 'http://acs' + acs.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' + } + + def "test versioning logout"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + SPSSODescriptor.name, + SingleLogoutService.name] + + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.logoutEndpoints = [new LogoutEndpointRepresentation(url: 'http://logout', bindingType: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST')] + it + } + + def entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + SPSSODescriptor spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + SingleLogoutService slo = spssoDescriptor.singleLogoutServices[0] + + then: + entityDescriptorHistory.size() == 1 + slo.location == 'http://logout' + slo.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + representation = new EntityDescriptorRepresentation().with { + it.logoutEndpoints = [new LogoutEndpointRepresentation(url: 'http://logout.updated', bindingType: 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS'), + new LogoutEndpointRepresentation(url: 'http://logout2', bindingType: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact')] + it + } + + entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + SPSSODescriptor spssoDescriptor2 = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) + def (slo1, slo2) = [spssoDescriptor2.singleLogoutServices[0], spssoDescriptor2.singleLogoutServices[1]] + + //Initial revision + spssoDescriptor = + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + slo = spssoDescriptor.singleLogoutServices[0] + + then: + entityDescriptorHistory.size() == 2 + slo1.location == 'http://logout.updated' + slo1.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS' + slo2.location == 'http://logout2' + slo2.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the initial version is intact + slo.location == 'http://logout' + slo.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' + } + + def "test versioning relying party overrides"() { + setup: + def expectedModifiedPersistentEntities = [EntityDescriptor.name, + EntityAttributes.name, + Extensions.name, + Attribute.name, + XSBoolean.name, + XSString.name] + + when: + EntityDescriptor ed = new EntityDescriptor() + def representation = new EntityDescriptorRepresentation().with { + it.relyingPartyOverrides = [signAssertion: true] + it.attributeRelease = ['attr1'] + it + } + + def entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + EntityAttributes attrs = entityDescriptorService.getEntityAttributes(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + + then: + entityDescriptorHistory.size() == 1 + attrs.attributes[0].attributeValues[0].storedValue == 'true' + attrs.attributes[1].attributeValues[0].xsStringvalue == 'attr1' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + representation = new EntityDescriptorRepresentation().with { + it.relyingPartyOverrides = [signAssertion: false] + it.attributeRelease = ['attr1', 'attr2'] + it + } + + entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorRepository, + txMgr, + entityManager) + + EntityAttributes attrs2 = entityDescriptorService.getEntityAttributes(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) + + //Initial revision + attrs = entityDescriptorService.getEntityAttributes(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + + expectedModifiedPersistentEntities = [EntityDescriptor.name, + EntityAttributes.name, + Attribute.name, + XSString.name] + then: + entityDescriptorHistory.size() == 2 + attrs2.attributes[0].attributeValues[0].xsStringvalue == 'attr1' + attrs2.attributes[0].attributeValues[1].xsStringvalue == 'attr2' + edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the initial revision is intact + attrs.attributes[0].attributeValues[0].storedValue == 'true' + attrs.attributes[1].attributeValues[0].xsStringvalue == 'attr1' + attrs.attributes[1].attributeValues[1] == null + } +} diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy new file mode 100644 index 000000000..f8ac3b431 --- /dev/null +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy @@ -0,0 +1,104 @@ +package edu.internet2.tier.shibboleth.admin.ui.repository.envers + +import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration +import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter +import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository +import org.hibernate.envers.AuditReaderFactory +import org.hibernate.envers.query.AuditQuery +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.autoconfigure.domain.EntityScan +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest +import org.springframework.data.jpa.repository.config.EnableJpaRepositories +import org.springframework.test.context.ContextConfiguration +import org.springframework.transaction.PlatformTransactionManager +import org.springframework.transaction.support.DefaultTransactionDefinition +import spock.lang.Specification + +import javax.persistence.EntityManager + +/** + * Testing metadata resolvers basic versioning by envers is functioning. + */ +@DataJpaTest +@ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration]) +@EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) +@EntityScan("edu.internet2.tier.shibboleth.admin.ui") +class MetadataResolverEntityBasicEnversVersioningTests extends Specification { + + @Autowired + MetadataResolverRepository metadataResolverRepository + + @Autowired + EntityManager entityManager + + @Autowired + PlatformTransactionManager txMgr + + def "test basic audit and version data is created when persisting base metadata resolver with envers enabled"() { + when: + MetadataResolver mdr = doInExplicitTransaction { + metadataResolverRepository.save(create {new MetadataResolver()}) + } + def metadataResolverHistory = resolverHistory() + + then: + metadataResolverHistory.size() == 1 + + when: + def rev = metadataResolverHistory[0] + + then: + rev[1].principalUserName == 'anonymousUser' + + when: + mdr.name = 'Updated' + doInExplicitTransaction { + metadataResolverRepository.save(mdr) + } + metadataResolverHistory = resolverHistory() + + then: + metadataResolverHistory.size == 2 + } + + private resolverHistory() { + def auditReader = AuditReaderFactory.get(entityManager) + AuditQuery auditQuery = auditReader + .createQuery() + .forRevisionsOfEntity(MetadataResolver, false, true) + auditQuery.resultList + + } + + private static create(Closure concreteResolverSupplier) { + MetadataResolver resolver = concreteResolverSupplier() + resolver.with { + it.name = "testme" + it.metadataFilters.add(new EntityAttributesFilter().with { + it.entityAttributesFilterTarget = new EntityAttributesFilterTarget().with { + it.entityAttributesFilterTargetType = EntityAttributesFilterTarget.EntityAttributesFilterTargetType.ENTITY + it.value = ["hola"] + return it + } + return it + }) + } + resolver + } + + //This explicit low level transaction dance is required in order to verify history/version data that envers + //writes out only after the explicit transaction is committed, therefore making it impossible to verify within the main tx + //boundary of the test method which commits tx only after an execution of the test method. This let's us explicitly + //start/commit transaction making envers data written out and verifiable + private doInExplicitTransaction(Closure uow) { + def txStatus = txMgr.getTransaction(new DefaultTransactionDefinition(org.springframework.transaction.TransactionDefinition.PROPAGATION_REQUIRES_NEW)) + def entity = uow() + txMgr.commit(txStatus) + entity + } +} diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy new file mode 100644 index 000000000..58cd83704 --- /dev/null +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy @@ -0,0 +1,114 @@ +package edu.internet2.tier.shibboleth.admin.ui.service.envers + + +import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository +import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService +import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorVersionService +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.autoconfigure.domain.EntityScan +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest +import org.springframework.data.jpa.repository.config.EnableJpaRepositories +import org.springframework.test.context.ContextConfiguration +import org.springframework.transaction.PlatformTransactionManager +import spock.lang.Specification + +import java.time.LocalDateTime + +@DataJpaTest +@ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration, EntitiesVersioningConfiguration]) +@EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) +@EntityScan("edu.internet2.tier.shibboleth.admin.ui") +class EnversEntityDescriptorVersionServiceTests extends Specification { + + @Autowired + EntityDescriptorVersionService entityDescriptorVersionService + + @Autowired + EntityDescriptorRepository entityDescriptorRepository + + @Autowired + EntityDescriptorService entityDescriptorService + + @Autowired + PlatformTransactionManager txMgr + + def "versioning service returns correct number of versions sorted by modified date in natural order"() { + when: 'Initial version' + EntityDescriptor ed = new EntityDescriptor(entityID: 'ed', serviceProviderName: 'SP1') + ed = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(ed) + } + def versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) + + then: + versions.size() == 1 + versions[0].id + versions[0].creator + versions[0].date < LocalDateTime.now() + + when: 'Second version' + ed.serviceProviderName = 'SP2' + ed = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(ed) + } + versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) + + then: + versions.size() == 2 + versions[0].id && versions[1].id + versions[0].creator && versions[1].creator + versions[0].date < versions[1].date + + when: 'Third version' + ed.serviceProviderName = 'SP3' + ed = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(ed) + } + versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) + + then: + versions.size() == 3 + versions[0].id && versions[1].id && versions[2].id + versions[0].creator && versions[1].creator && versions[2].creator + (versions[0].date < versions[1].date) && (versions[1].date < versions[2].date) + } + + def "versioning service returns correct entity descriptor for version number"() { + when: 'Initial version' + EntityDescriptor ed = new EntityDescriptor(entityID: 'ed', serviceProviderName: 'SP1', createdBy: 'anonymousUser') + ed = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(ed) + } + def versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) + def v1EdRepresentation = entityDescriptorVersionService.findSpecificVersionOfEntityDescriptor(ed.resourceId, versions[0].id) + + then: + v1EdRepresentation.serviceProviderName == 'SP1' + v1EdRepresentation.id == ed.resourceId + + when: 'Update the original' + ed.serviceProviderName = 'SP2' + ed = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(ed) + } + versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) + def v2EdRepresentation = entityDescriptorVersionService.findSpecificVersionOfEntityDescriptor(ed.resourceId, versions[1].id) + + then: + v2EdRepresentation.serviceProviderName == 'SP2' + v2EdRepresentation.id == ed.resourceId + } + + def "versioning service returns null for non existent version number"() { + when: 'Initial version' + EntityDescriptor ed = new EntityDescriptor(entityID: 'ed', serviceProviderName: 'SP1', createdBy: 'anonymousUser') + ed = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(ed) + } + def edRepresentation = entityDescriptorVersionService.findSpecificVersionOfEntityDescriptor(ed.resourceId, '1000') + + then: + !edRepresentation + } +} diff --git a/settings.gradle b/settings.gradle index ba298e3de..b3ab3e757 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include 'backend', 'ui', 'pac4j-module', 'envers-tests-module' +include 'backend', 'ui', 'pac4j-module' From f08592315196250b0e0c3a6b75ea6779a409427a Mon Sep 17 00:00:00 2001 From: Jj! Date: Wed, 12 Jun 2019 16:39:43 -0500 Subject: [PATCH 072/112] [SHIBUI-1262] refigure the build.gradle add missing imports --- backend/build.gradle | 70 ++++++++++--------- ...tityDescriptorEnversVersioningTests.groovy | 18 ++++- ...EntityDescriptorVersionServiceTests.groovy | 6 +- 3 files changed, 57 insertions(+), 37 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index 6dd21a097..3af60585e 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -44,12 +44,35 @@ configurations { integrationTestRuntime { extendsFrom testRuntime } - enversTestCompile { - extendsFrom testCompile +} + +def generatedSrcDir = new File(buildDir, 'generated/src/main/java') +sourceSets { + main { + groovy { + srcDirs = ['src/main/groovy', 'src/main/java', generatedSrcDir] + } + java { + srcDirs = [] + } } - enversTestRuntime { - extendsFrom testRuntime + integrationTest { + groovy { + srcDirs = ['src/integration/groovy'] + compileClasspath += main.output + test.output + runtimeClasspath += main.output + test.output + } + resources { + srcDir 'src/integration/resources' + } + } + + enversTest { + groovy { + srcDir 'src/enversTest/groovy' + } + resources.srcDir 'src/enversTest/resources' } } @@ -181,36 +204,14 @@ dependencies { // Envers for persistent entities versioning compile 'org.hibernate:hibernate-envers' -} -def generatedSrcDir = new File(buildDir, 'generated/src/main/java') + enversTestCompile sourceSets.main.output + enversTestCompile sourceSets.test.output + enversTestCompile configurations.compile + enversTestCompile configurations.testCompile -sourceSets { - main { - groovy { - srcDirs = ['src/main/groovy', 'src/main/java', generatedSrcDir] - } - java { - srcDirs = [] - } - } - integrationTest { - groovy { - srcDirs = ['src/integration/groovy'] - compileClasspath += main.output + test.output - runtimeClasspath += main.output + test.output - } - resources { - srcDir 'src/integration/resources' - } - } - enversTest { - groovy { - srcDirs = ['src/enversTest/groovy'] - compileClasspath += main.output + test.output - runtimeClasspath += main.output + test.output - } - } + enversTestRuntime configurations.runtime + enversTestRuntime configurations.testRuntime } task integrationTest(type: Test) { @@ -232,9 +233,10 @@ task enversTest(type: Test) { systemProperties = System.properties systemProperties['user.dir'] = workingDir } -test.finalizedBy enversTest - +check { + dependsOn enversTest +} task generateSources { inputs.dir('src/main/templates') diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index f8f97b0fc..579620b44 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -4,6 +4,22 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfigurat import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration +import edu.internet2.tier.shibboleth.admin.ui.domain.AssertionConsumerService +import edu.internet2.tier.shibboleth.admin.ui.domain.EntityAttributes +import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.KeyDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.SPSSODescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.SingleLogoutService +import edu.internet2.tier.shibboleth.admin.ui.domain.UIInfo +import edu.internet2.tier.shibboleth.admin.ui.domain.X509Certificate +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.AssertionConsumerServiceRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.LogoutEndpointRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.MduiRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.OrganizationRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.SecurityInfoRepresentation +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ServiceProviderSsoDescriptorRepresentation 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.service.EntityDescriptorService @@ -17,8 +33,6 @@ import spock.lang.Specification import javax.persistence.EntityManager -import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.* - /** * Testing entity descriptor envers versioning */ diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy index 58cd83704..d88a604f3 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy @@ -1,6 +1,10 @@ package edu.internet2.tier.shibboleth.admin.ui.service.envers - +import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.EntitiesVersioningConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService From f8481abc6ff4380ef808b54ed58d544b193712c5 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Thu, 13 Jun 2019 09:30:40 -0400 Subject: [PATCH 073/112] Fix tests --- ...tityDescriptorEnversVersioningTests.groovy | 222 ++++--- envers-tests-module/build.gradle | 34 - ....ui.envers-tests-module.main.kotlin_module | Bin 16 -> 0 bytes ...lerVersionEndpointsIntegrationTests.groovy | 121 ---- ...tityDescriptorEnversVersioningTests.groovy | 613 ------------------ ...verEntityBasicEnversVersioningTests.groovy | 106 --- ...EntityDescriptorVersionServiceTests.groovy | 116 ---- 7 files changed, 123 insertions(+), 1089 deletions(-) delete mode 100644 envers-tests-module/build.gradle delete mode 100644 envers-tests-module/out/test/classes/META-INF/edu.internet2.tier.shibboleth.admin.ui.envers-tests-module.main.kotlin_module delete mode 100644 envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy delete mode 100644 envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy delete mode 100644 envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy delete mode 100644 envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 579620b44..05e3ad139 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -5,13 +5,32 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.Internationalization import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration import edu.internet2.tier.shibboleth.admin.ui.domain.AssertionConsumerService +import edu.internet2.tier.shibboleth.admin.ui.domain.Attribute +import edu.internet2.tier.shibboleth.admin.ui.domain.ContactPerson +import edu.internet2.tier.shibboleth.admin.ui.domain.Description +import edu.internet2.tier.shibboleth.admin.ui.domain.DisplayName +import edu.internet2.tier.shibboleth.admin.ui.domain.EmailAddress import edu.internet2.tier.shibboleth.admin.ui.domain.EntityAttributes import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.Extensions +import edu.internet2.tier.shibboleth.admin.ui.domain.GivenName +import edu.internet2.tier.shibboleth.admin.ui.domain.InformationURL import edu.internet2.tier.shibboleth.admin.ui.domain.KeyDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.KeyInfo +import edu.internet2.tier.shibboleth.admin.ui.domain.Logo +import edu.internet2.tier.shibboleth.admin.ui.domain.NameIDFormat +import edu.internet2.tier.shibboleth.admin.ui.domain.Organization +import edu.internet2.tier.shibboleth.admin.ui.domain.OrganizationDisplayName +import edu.internet2.tier.shibboleth.admin.ui.domain.OrganizationName +import edu.internet2.tier.shibboleth.admin.ui.domain.OrganizationURL +import edu.internet2.tier.shibboleth.admin.ui.domain.PrivacyStatementURL import edu.internet2.tier.shibboleth.admin.ui.domain.SPSSODescriptor import edu.internet2.tier.shibboleth.admin.ui.domain.SingleLogoutService import edu.internet2.tier.shibboleth.admin.ui.domain.UIInfo import edu.internet2.tier.shibboleth.admin.ui.domain.X509Certificate +import edu.internet2.tier.shibboleth.admin.ui.domain.X509Data +import edu.internet2.tier.shibboleth.admin.ui.domain.XSBoolean +import edu.internet2.tier.shibboleth.admin.ui.domain.XSString import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.AssertionConsumerServiceRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation @@ -33,6 +52,11 @@ import spock.lang.Specification import javax.persistence.EntityManager +import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames +import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex +import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex +import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor + /** * Testing entity descriptor envers versioning */ @@ -67,44 +91,44 @@ class EntityDescriptorEnversVersioningTests extends Specification { it.contacts = [new ContactRepresentation(type: 'administrative', name: 'name', emailAddress: 'test@test')] it } - def entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) then: entityDescriptorHistory.size() == 1 - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].givenName.name == 'name' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].type == org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].emailAddresses[0].address == 'test@test' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].givenName.name == 'name' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].type == org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].emailAddresses[0].address == 'test@test' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() when: representation = new EntityDescriptorRepresentation().with { it.contacts = [new ContactRepresentation(type: 'administrative', name: 'nameUPDATED', emailAddress: 'test@test')] it } - entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) then: entityDescriptorHistory.size() == 2 - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].type == org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].emailAddresses[0].address == 'test@test' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].type == org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].emailAddresses[0].address == 'test@test' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() when: representation = new EntityDescriptorRepresentation().with { it.contacts = [new ContactRepresentation(type: 'other', name: 'nameUPDATED2', emailAddress: 'test@test.com')] it } - entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, @@ -112,19 +136,19 @@ class EntityDescriptorEnversVersioningTests extends Specification { then: entityDescriptorHistory.size() == 3 - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].givenName.name == 'nameUPDATED2' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].type == org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHER - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].emailAddresses[0].address == 'test@test.com' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).principalUserName == 'anonymousUser' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).timestamp > 0L - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 2).sort() == expectedModifiedPersistentEntities.sort() + getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].givenName.name == 'nameUPDATED2' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].type == org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHER + getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].emailAddresses[0].address == 'test@test.com' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 2).sort() == expectedModifiedPersistentEntities.sort() //Also make sure we have our original revision - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].type == org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].emailAddresses[0].address == 'test@test' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].type == org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].emailAddresses[0].address == 'test@test' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L } @@ -142,43 +166,43 @@ class EntityDescriptorEnversVersioningTests extends Specification { it.organization = new OrganizationRepresentation(name: 'org', displayName: 'display org', url: 'http://org.edu') it } - def entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) then: entityDescriptorHistory.size() == 1 - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.organizationNames[0].value == 'org' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.displayNames[0].value == 'display org' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.URLs[0].value == 'http://org.edu' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.organizationNames[0].value == 'org' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.displayNames[0].value == 'display org' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.URLs[0].value == 'http://org.edu' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() when: representation = new EntityDescriptorRepresentation().with { it.organization = new OrganizationRepresentation(name: 'orgUpdated', displayName: 'display org Updated', url: 'http://org2.edu') it } - entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) then: entityDescriptorHistory.size() == 2 - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.organizationNames[0].value == 'orgUpdated' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.displayNames[0].value == 'display org Updated' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.URLs[0].value == 'http://org2.edu' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.organizationNames[0].value == 'orgUpdated' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.displayNames[0].value == 'display org Updated' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.URLs[0].value == 'http://org2.edu' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() //Check the original revision is intact - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.organizationNames[0].value == 'org' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.displayNames[0].value == 'display org' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.URLs[0].value == 'http://org.edu' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.organizationNames[0].value == 'org' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.displayNames[0].value == 'display org' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.URLs[0].value == 'http://org.edu' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L } def "test versioning with sp sso descriptor"() { @@ -196,19 +220,19 @@ class EntityDescriptorEnversVersioningTests extends Specification { } it } - def entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) then: entityDescriptorHistory.size() == 1 - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].nameIDFormats[0].format == 'format' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[1] == null - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].nameIDFormats[0].format == 'format' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[1] == null + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() when: representation = new EntityDescriptorRepresentation().with { @@ -220,26 +244,26 @@ class EntityDescriptorEnversVersioningTests extends Specification { it } - entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) then: entityDescriptorHistory.size() == 2 - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].nameIDFormats[0].format == 'formatUPDATED' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[1] == 'urn:oasis:names:tc:SAML:2.0:protocol' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].nameIDFormats[0].format == 'formatUPDATED' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[1] == 'urn:oasis:names:tc:SAML:2.0:protocol' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() //Check the original revision is intact - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].nameIDFormats[0].format == 'format' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[1] == null - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].nameIDFormats[0].format == 'format' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' + getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[1] == null + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L } def "test versioning with uiInfo"() { @@ -269,13 +293,13 @@ class EntityDescriptorEnversVersioningTests extends Specification { } it } - def entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) //Groovy FTW - able to call any private methods on ANY object. Get first revision - UIInfo uiinfo = entityDescriptorService.getUIInfo(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + UIInfo uiinfo = entityDescriptorService.getUIInfo(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) then: entityDescriptorHistory.size() == 1 @@ -286,7 +310,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { uiinfo.logos[0].URL == 'http://logo' uiinfo.logos[0].height == 20 uiinfo.logos[0].width == 30 - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() when: representation = new EntityDescriptorRepresentation().with { @@ -302,15 +326,15 @@ class EntityDescriptorEnversVersioningTests extends Specification { } it } - entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) //Get second revision - uiinfo = entityDescriptorService.getUIInfo(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) + uiinfo = entityDescriptorService.getUIInfo(getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) //And initial revision - def uiinfoInitialRevision = entityDescriptorService.getUIInfo(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + def uiinfoInitialRevision = entityDescriptorService.getUIInfo(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) then: entityDescriptorHistory.size() == 2 @@ -321,7 +345,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { uiinfo.logos[0].URL == 'http://logo.updated' uiinfo.logos[0].height == 30 uiinfo.logos[0].width == 40 - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() //Check the initial revision is still intact uiinfoInitialRevision.displayNames[0].value == 'Initial display name' @@ -354,14 +378,14 @@ class EntityDescriptorEnversVersioningTests extends Specification { it } - def entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) //Get initial revision SPSSODescriptor spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) KeyDescriptor keyDescriptor = spssoDescriptor.keyDescriptors[0] X509Certificate x509cert = keyDescriptor.keyInfo.x509Datas[0].x509Certificates[0] @@ -372,7 +396,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { keyDescriptor.name == 'sign' keyDescriptor.usageType == 'signing' x509cert.value == 'signingValue' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() when: representation = new EntityDescriptorRepresentation().with { @@ -386,14 +410,14 @@ class EntityDescriptorEnversVersioningTests extends Specification { it } - entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) //Get second revision - SPSSODescriptor spssoDescriptor_second = entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory,1)) + SPSSODescriptor spssoDescriptor_second = entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,1)) KeyDescriptor keyDescriptor_second1 = spssoDescriptor_second.keyDescriptors[0] X509Certificate x509cert_second1 = keyDescriptor_second1.keyInfo.x509Datas[0].x509Certificates[0] @@ -403,7 +427,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { //Get initial revision spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) keyDescriptor = spssoDescriptor.keyDescriptors[0] x509cert = keyDescriptor.keyInfo.x509Datas[0].x509Certificates[0] @@ -417,7 +441,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { keyDescriptor_second2.usageType == 'encryption' x509cert_second1.value == 'signingValue' x509cert_second2.value == 'encryptionValue' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() //Check the initial version is intact spssoDescriptor.keyDescriptors.size() == 1 @@ -441,13 +465,13 @@ class EntityDescriptorEnversVersioningTests extends Specification { it } - def entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) SPSSODescriptor spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) AssertionConsumerService acs = spssoDescriptor.assertionConsumerServices[0] then: @@ -455,7 +479,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { !acs.isDefault() acs.location == 'http://acs' acs.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() when: @@ -466,18 +490,18 @@ class EntityDescriptorEnversVersioningTests extends Specification { it } - entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) SPSSODescriptor spssoDescriptor2 = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory,1)) + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,1)) def (acs1, acs2) = [spssoDescriptor2.assertionConsumerServices[0], spssoDescriptor2.assertionConsumerServices[1]] //Initial revision spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) acs = spssoDescriptor.assertionConsumerServices[0] then: @@ -488,7 +512,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { acs1.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS' acs2.location == 'http://acs2' acs2.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() //Check the initial revision is intact !acs.isDefault() @@ -509,20 +533,20 @@ class EntityDescriptorEnversVersioningTests extends Specification { it } - def entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) SPSSODescriptor spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) SingleLogoutService slo = spssoDescriptor.singleLogoutServices[0] then: entityDescriptorHistory.size() == 1 slo.location == 'http://logout' slo.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() when: representation = new EntityDescriptorRepresentation().with { @@ -531,18 +555,18 @@ class EntityDescriptorEnversVersioningTests extends Specification { it } - entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) SPSSODescriptor spssoDescriptor2 = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) def (slo1, slo2) = [spssoDescriptor2.singleLogoutServices[0], spssoDescriptor2.singleLogoutServices[1]] //Initial revision spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) slo = spssoDescriptor.singleLogoutServices[0] then: @@ -551,7 +575,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { slo1.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS' slo2.location == 'http://logout2' slo2.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() //Check the initial version is intact slo.location == 'http://logout' @@ -575,18 +599,18 @@ class EntityDescriptorEnversVersioningTests extends Specification { it } - def entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) - EntityAttributes attrs = entityDescriptorService.getEntityAttributes(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + EntityAttributes attrs = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) then: entityDescriptorHistory.size() == 1 attrs.attributes[0].attributeValues[0].storedValue == 'true' attrs.attributes[1].attributeValues[0].xsStringvalue == 'attr1' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() when: representation = new EntityDescriptorRepresentation().with { @@ -595,15 +619,15 @@ class EntityDescriptorEnversVersioningTests extends Specification { it } - entityDescriptorHistory = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, + entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, entityDescriptorRepository, txMgr, entityManager) - EntityAttributes attrs2 = entityDescriptorService.getEntityAttributes(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) + EntityAttributes attrs2 = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) //Initial revision - attrs = entityDescriptorService.getEntityAttributes(edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) + attrs = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) expectedModifiedPersistentEntities = [EntityDescriptor.name, EntityAttributes.name, @@ -613,7 +637,7 @@ class EntityDescriptorEnversVersioningTests extends Specification { entityDescriptorHistory.size() == 2 attrs2.attributes[0].attributeValues[0].xsStringvalue == 'attr1' attrs2.attributes[0].attributeValues[1].xsStringvalue == 'attr2' - edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() //Check the initial revision is intact attrs.attributes[0].attributeValues[0].storedValue == 'true' diff --git a/envers-tests-module/build.gradle b/envers-tests-module/build.gradle deleted file mode 100644 index 975da5e36..000000000 --- a/envers-tests-module/build.gradle +++ /dev/null @@ -1,34 +0,0 @@ -plugins { - id 'groovy' - id 'jacoco' - id 'org.springframework.boot' version '2.0.0.RELEASE' apply false - id 'io.spring.dependency-management' version '1.0.6.RELEASE' -} - -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - -repositories { - jcenter() - maven { - url 'https://build.shibboleth.net/nexus/content/groups/public' - artifactUrls = ['https://build.shibboleth.net/nexus/content/repositories/thirdparty-snapshots'] - } -} - -dependencyManagement { - imports { - mavenBom org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES - } -} - -dependencies { - - compile project(':backend') - //testCompile project(':backend') - testCompile project(':backend').sourceSets.test.output - //testCompile "org.springframework.boot:spring-boot-starter-data-jpa" - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile "org.spockframework:spock-core:1.1-groovy-2.4" - testCompile "org.spockframework:spock-spring:1.1-groovy-2.4" -} diff --git a/envers-tests-module/out/test/classes/META-INF/edu.internet2.tier.shibboleth.admin.ui.envers-tests-module.main.kotlin_module b/envers-tests-module/out/test/classes/META-INF/edu.internet2.tier.shibboleth.admin.ui.envers-tests-module.main.kotlin_module deleted file mode 100644 index 2983af70661ad375cc499ebc4da5a68ca46c532e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 RcmZQzU|?ooU|@t|egFVe02KfL diff --git a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy deleted file mode 100644 index f7b2c90b0..000000000 --- a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy +++ /dev/null @@ -1,121 +0,0 @@ -package edu.internet2.tier.shibboleth.admin.ui.controller - -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.repository.EntityDescriptorRepository -import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository -import edu.internet2.tier.shibboleth.admin.ui.util.TestObjectGenerator -import edu.internet2.tier.shibboleth.admin.util.AttributeUtility -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.web.client.TestRestTemplate -import org.springframework.test.context.ActiveProfiles -import spock.lang.Specification - -/** - * @author Dmitriy Kopylenko - */ -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@ActiveProfiles(['no-auth', 'dev']) -class EntityDescriptorControllerVersionEndpointsIntegrationTests extends Specification { - - @Autowired - private TestRestTemplate restTemplate - - @Autowired - EntityDescriptorRepository entityDescriptorRepository - - static BASE_URI = '/api/EntityDescriptor' - - static ALL_VERSIONS_URI = "$BASE_URI/%s/Versions" - - static SPECIFIC_VERSION_URI = "$BASE_URI/%s/Versions/%s" - - def "GET /api/EntityDescriptor/{resourceId}/Versions with non-existent entity descriptor"() { - when: - def result = getAllEntityDescriptorVersions('non-existent-ed-id', String) - - then: - result.statusCodeValue == 404 - } - - def "GET /api/EntityDescriptor{resourceId}/Versions with 1 entity descriptor version"() { - given: - EntityDescriptor ed = new EntityDescriptor(entityID: 'http://test/controller', createdBy: 'anonymousUser') - entityDescriptorRepository.save(ed) - - when: - def result = getAllEntityDescriptorVersions(ed.resourceId, List) - - then: - result.statusCodeValue == 200 - result.body.size == 1 - result.body[0].id && result.body[0].creator && result.body[0].date - } - - def "GET /api/EntityDescriptor{resourceId}/Versions with 2 entity descriptor versions"() { - given: - EntityDescriptor ed = new EntityDescriptor(entityID: 'http://test/controller', createdBy: 'anonymousUser') - ed = entityDescriptorRepository.save(ed) - //Will created a second version for UPDATE revision - ed.serviceEnabled = true - entityDescriptorRepository.save(ed) - - when: - def result = getAllEntityDescriptorVersions(ed.resourceId, List) - - then: - result.statusCodeValue == 200 - result.body.size == 2 - result.body[0].id < result.body[1].id - result.body[0].date < result.body[1].date - } - - def "GET /api/EntityDescriptor{resourceId}/Versions/{version} for non existent version"() { - given: - EntityDescriptor ed = new EntityDescriptor(entityID: 'http://test/controller', createdBy: 'anonymousUser') - ed = entityDescriptorRepository.save(ed) - - when: - def result = getEntityDescriptorForVersion(ed.resourceId, '1000', EntityDescriptorRepresentation) - - then: - result.statusCodeValue == 404 - } - - def "GET /api/EntityDescriptor{resourceId}/Versions/{version} with 2 entity descriptor versions returns correct ED for specific versions"() { - given: - EntityDescriptor ed = new EntityDescriptor(entityID: 'http://test/controller', createdBy: 'anonymousUser', serviceProviderName: 'SP1') - ed = entityDescriptorRepository.save(ed) - //Will created a second version for UPDATE revision - ed.serviceProviderName = 'SP2' - entityDescriptorRepository.save(ed) - - when: - def allVersions = getAllEntityDescriptorVersions(ed.resourceId, List) - def edv1 = getEntityDescriptorForVersion(ed.resourceId, allVersions.body[0].id, EntityDescriptorRepresentation) - def edv2 = getEntityDescriptorForVersion(ed.resourceId, allVersions.body[1].id, EntityDescriptorRepresentation) - - then: - edv1.statusCodeValue == 200 - edv1.body.serviceProviderName == 'SP1' - edv2.statusCodeValue == 200 - edv2.body.serviceProviderName == 'SP2' - } - - private getAllEntityDescriptorVersions(String resourceId, responseType) { - this.restTemplate.getForEntity(resourceUriFor(ALL_VERSIONS_URI, resourceId), responseType) - } - - private getEntityDescriptorForVersion(String resourceId, String version, responseType) { - this.restTemplate.getForEntity(resourceUriFor(SPECIFIC_VERSION_URI, resourceId, version), responseType) - } - - private static resourceUriFor(String uriTemplate, String resourceId, String version) { - String.format(uriTemplate, resourceId, version) - } - - private static resourceUriFor(String uriTemplate, String resourceId) { - String.format(uriTemplate, resourceId) - } -} diff --git a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy deleted file mode 100644 index 795875962..000000000 --- a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ /dev/null @@ -1,613 +0,0 @@ -package edu.internet2.tier.shibboleth.admin.ui.repository.envers - -import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration -import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration -import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration -import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration -import edu.internet2.tier.shibboleth.admin.ui.domain.* -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.* -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.service.EntityDescriptorService -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.autoconfigure.domain.EntityScan -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest -import org.springframework.data.jpa.repository.config.EnableJpaRepositories -import org.springframework.test.context.ContextConfiguration -import org.springframework.transaction.PlatformTransactionManager -import spock.lang.Specification - -import javax.persistence.EntityManager - -import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.* -import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.ADMINISTRATIVE -import static org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration.OTHER - -/** - * Testing entity descriptor envers versioning - */ -@DataJpaTest -@ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, SearchConfiguration, TestConfiguration]) -@EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) -@EntityScan("edu.internet2.tier.shibboleth.admin.ui") -class EntityDescriptorEnversVersioningTests extends Specification { - - @Autowired - EntityDescriptorRepository entityDescriptorRepository - - @Autowired - EntityDescriptorService entityDescriptorService - - @Autowired - EntityManager entityManager - - @Autowired - PlatformTransactionManager txMgr - - @Autowired - OpenSamlObjects openSamlObjects - - def "test versioning with contact persons"() { - setup: - def expectedModifiedPersistentEntities = [EntityDescriptor.name, ContactPerson.name, GivenName.name, EmailAddress.name] - - when: - def ed = new EntityDescriptor() - def representation = new EntityDescriptorRepresentation().with { - it.contacts = [new ContactRepresentation(type: 'administrative', name: 'name', emailAddress: 'test@test')] - it - } - def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - then: - entityDescriptorHistory.size() == 1 - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].givenName.name == 'name' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].type == ADMINISTRATIVE - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).contactPersons[0].emailAddresses[0].address == 'test@test' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L - getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() - - when: - representation = new EntityDescriptorRepresentation().with { - it.contacts = [new ContactRepresentation(type: 'administrative', name: 'nameUPDATED', emailAddress: 'test@test')] - it - } - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - then: - entityDescriptorHistory.size() == 2 - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].type == ADMINISTRATIVE - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].emailAddresses[0].address == 'test@test' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L - getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() - - when: - representation = new EntityDescriptorRepresentation().with { - it.contacts = [new ContactRepresentation(type: 'other', name: 'nameUPDATED2', emailAddress: 'test@test.com')] - it - } - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, - entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - then: - entityDescriptorHistory.size() == 3 - getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].givenName.name == 'nameUPDATED2' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].type == OTHER - getTargetEntityForRevisionIndex(entityDescriptorHistory, 2).contactPersons[0].emailAddresses[0].address == 'test@test.com' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).principalUserName == 'anonymousUser' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 2).timestamp > 0L - getModifiedEntityNames(entityDescriptorHistory, 2).sort() == expectedModifiedPersistentEntities.sort() - - //Also make sure we have our original revision - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].givenName.name == 'nameUPDATED' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].type == ADMINISTRATIVE - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).contactPersons[0].emailAddresses[0].address == 'test@test' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L - - } - - def "test versioning with organization"() { - setup: - def expectedModifiedPersistentEntities = [EntityDescriptor.name, - Organization.name, - OrganizationDisplayName.name, - OrganizationName.name, - OrganizationURL.name] - - when: - EntityDescriptor ed = new EntityDescriptor() - def representation = new EntityDescriptorRepresentation().with { - it.organization = new OrganizationRepresentation(name: 'org', displayName: 'display org', url: 'http://org.edu') - it - } - def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - then: - entityDescriptorHistory.size() == 1 - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.organizationNames[0].value == 'org' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.displayNames[0].value == 'display org' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.URLs[0].value == 'http://org.edu' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L - getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() - - when: - representation = new EntityDescriptorRepresentation().with { - it.organization = new OrganizationRepresentation(name: 'orgUpdated', displayName: 'display org Updated', url: 'http://org2.edu') - it - } - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - then: - entityDescriptorHistory.size() == 2 - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.organizationNames[0].value == 'orgUpdated' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.displayNames[0].value == 'display org Updated' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).organization.URLs[0].value == 'http://org2.edu' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L - getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() - - //Check the original revision is intact - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.organizationNames[0].value == 'org' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.displayNames[0].value == 'display org' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).organization.URLs[0].value == 'http://org.edu' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L - } - - def "test versioning with sp sso descriptor"() { - setup: - def expectedModifiedPersistentEntities = [EntityDescriptor.name, - NameIDFormat.name, - SPSSODescriptor.name] - when: - EntityDescriptor ed = new EntityDescriptor() - def representation = new EntityDescriptorRepresentation().with { - it.serviceProviderSsoDescriptor = new ServiceProviderSsoDescriptorRepresentation().with { - it.protocolSupportEnum = 'SAML 1.1' - it.nameIdFormats = ['format'] - it - } - it - } - def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - then: - entityDescriptorHistory.size() == 1 - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].nameIDFormats[0].format == 'format' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[1] == null - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L - getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() - - when: - representation = new EntityDescriptorRepresentation().with { - it.serviceProviderSsoDescriptor = new ServiceProviderSsoDescriptorRepresentation().with { - it.protocolSupportEnum = 'SAML 1.1, SAML 2' - it.nameIdFormats = ['formatUPDATED'] - it - } - it - } - - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - then: - entityDescriptorHistory.size() == 2 - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].nameIDFormats[0].format == 'formatUPDATED' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 1).roleDescriptors[0].supportedProtocols[1] == 'urn:oasis:names:tc:SAML:2.0:protocol' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).principalUserName == 'anonymousUser' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 1).timestamp > 0L - getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() - - //Check the original revision is intact - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].nameIDFormats[0].format == 'format' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[0] == 'urn:oasis:names:tc:SAML:1.1:protocol' - getTargetEntityForRevisionIndex(entityDescriptorHistory, 0).roleDescriptors[0].supportedProtocols[1] == null - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).principalUserName == 'anonymousUser' - getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L - } - - def "test versioning with uiInfo"() { - setup: - def expectedModifiedPersistentEntities = [EntityDescriptor.name, - Description.name, - DisplayName.name, - SPSSODescriptor.name, - Extensions.name, - InformationURL.name, - Logo.name, - PrivacyStatementURL.name, - UIInfo.name] - - when: - EntityDescriptor ed = new EntityDescriptor() - def representation = new EntityDescriptorRepresentation().with { - it.mdui = new MduiRepresentation().with { - it.displayName = 'Initial display name' - it.informationUrl = 'http://info' - it.privacyStatementUrl = 'http://privacy' - it.description = 'Initial desc' - it.logoUrl = 'http://logo' - it.logoHeight = 20 - it.logoWidth = 30 - it - } - it - } - def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - //Groovy FTW - able to call any private methods on ANY object. Get first revision - UIInfo uiinfo = entityDescriptorService.getUIInfo(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) - - then: - entityDescriptorHistory.size() == 1 - uiinfo.displayNames[0].value == 'Initial display name' - uiinfo.informationURLs[0].value == 'http://info' - uiinfo.privacyStatementURLs[0].value == 'http://privacy' - uiinfo.descriptions[0].value == 'Initial desc' - uiinfo.logos[0].URL == 'http://logo' - uiinfo.logos[0].height == 20 - uiinfo.logos[0].width == 30 - getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() - - when: - representation = new EntityDescriptorRepresentation().with { - it.mdui = new MduiRepresentation().with { - it.displayName = 'Display name UPDATED' - it.informationUrl = 'http://info.updated' - it.privacyStatementUrl = 'http://privacy.updated' - it.description = 'Desc UPDATED' - it.logoUrl = 'http://logo.updated' - it.logoHeight = 30 - it.logoWidth = 40 - it - } - it - } - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - //Get second revision - uiinfo = entityDescriptorService.getUIInfo(getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) - //And initial revision - def uiinfoInitialRevision = entityDescriptorService.getUIInfo(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) - - then: - entityDescriptorHistory.size() == 2 - uiinfo.displayNames[0].value == 'Display name UPDATED' - uiinfo.informationURLs[0].value == 'http://info.updated' - uiinfo.privacyStatementURLs[0].value == 'http://privacy.updated' - uiinfo.descriptions[0].value == 'Desc UPDATED' - uiinfo.logos[0].URL == 'http://logo.updated' - uiinfo.logos[0].height == 30 - uiinfo.logos[0].width == 40 - getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() - - //Check the initial revision is still intact - uiinfoInitialRevision.displayNames[0].value == 'Initial display name' - uiinfoInitialRevision.informationURLs[0].value == 'http://info' - uiinfoInitialRevision.privacyStatementURLs[0].value == 'http://privacy' - uiinfoInitialRevision.descriptions[0].value == 'Initial desc' - uiinfoInitialRevision.logos[0].URL == 'http://logo' - uiinfoInitialRevision.logos[0].height == 20 - uiinfoInitialRevision.logos[0].width == 30 - } - - def "test versioning with security"() { - setup: - def expectedModifiedPersistentEntities = [EntityDescriptor.name, - KeyDescriptor.name, - KeyInfo.name, - SPSSODescriptor.name, - X509Certificate.name, - X509Data.name] - - when: - EntityDescriptor ed = new EntityDescriptor() - def representation = new EntityDescriptorRepresentation().with { - it.securityInfo = new SecurityInfoRepresentation().with { - it.authenticationRequestsSigned = true - it.x509CertificateAvailable = true - it.x509Certificates = [new SecurityInfoRepresentation.X509CertificateRepresentation(name: 'sign', type: 'signing', value: 'signingValue')] - it - } - it - } - - def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - //Get initial revision - SPSSODescriptor spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) - - KeyDescriptor keyDescriptor = spssoDescriptor.keyDescriptors[0] - X509Certificate x509cert = keyDescriptor.keyInfo.x509Datas[0].x509Certificates[0] - - then: - entityDescriptorHistory.size() == 1 - spssoDescriptor.isAuthnRequestsSigned() - keyDescriptor.name == 'sign' - keyDescriptor.usageType == 'signing' - x509cert.value == 'signingValue' - getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() - - when: - representation = new EntityDescriptorRepresentation().with { - it.securityInfo = new SecurityInfoRepresentation().with { - it.authenticationRequestsSigned = false - it.x509CertificateAvailable = true - it.x509Certificates = [new SecurityInfoRepresentation.X509CertificateRepresentation(name: 'sign', type: 'signing', value: 'signingValue'), - new SecurityInfoRepresentation.X509CertificateRepresentation(name: 'encrypt', type: 'encryption', value: 'encryptionValue')] - it - } - it - } - - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - - //Get second revision - SPSSODescriptor spssoDescriptor_second = entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,1)) - - KeyDescriptor keyDescriptor_second1 = spssoDescriptor_second.keyDescriptors[0] - X509Certificate x509cert_second1 = keyDescriptor_second1.keyInfo.x509Datas[0].x509Certificates[0] - KeyDescriptor keyDescriptor_second2 = spssoDescriptor_second.keyDescriptors[1] - X509Certificate x509cert_second2 = keyDescriptor_second2.keyInfo.x509Datas[0].x509Certificates[0] - - - //Get initial revision - spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) - - keyDescriptor = spssoDescriptor.keyDescriptors[0] - x509cert = keyDescriptor.keyInfo.x509Datas[0].x509Certificates[0] - - then: - entityDescriptorHistory.size() == 2 - !spssoDescriptor_second.isAuthnRequestsSigned() - keyDescriptor_second1.name == 'sign' - keyDescriptor_second1.usageType == 'signing' - keyDescriptor_second2.name == 'encrypt' - keyDescriptor_second2.usageType == 'encryption' - x509cert_second1.value == 'signingValue' - x509cert_second2.value == 'encryptionValue' - getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() - - //Check the initial version is intact - spssoDescriptor.keyDescriptors.size() == 1 - spssoDescriptor.isAuthnRequestsSigned() - keyDescriptor.name == 'sign' - keyDescriptor.usageType == 'signing' - x509cert.value == 'signingValue' - } - - def "test versioning ACS"() { - setup: - def expectedModifiedPersistentEntities = [EntityDescriptor.name, - SPSSODescriptor.name, - AssertionConsumerService.name] - - when: - EntityDescriptor ed = new EntityDescriptor() - def representation = new EntityDescriptorRepresentation().with { - it.assertionConsumerServices = [ - new AssertionConsumerServiceRepresentation(locationUrl: 'http://acs', binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST')] - it - } - - def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - SPSSODescriptor spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) - AssertionConsumerService acs = spssoDescriptor.assertionConsumerServices[0] - - then: - entityDescriptorHistory.size() == 1 - !acs.isDefault() - acs.location == 'http://acs' - acs.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' - getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() - - - when: - representation = new EntityDescriptorRepresentation().with { - it.assertionConsumerServices = [ - new AssertionConsumerServiceRepresentation(locationUrl: 'http://acs.updated', binding: 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS', makeDefault: true), - new AssertionConsumerServiceRepresentation(locationUrl: 'http://acs2', binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact')] - it - } - - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - SPSSODescriptor spssoDescriptor2 = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,1)) - def (acs1, acs2) = [spssoDescriptor2.assertionConsumerServices[0], spssoDescriptor2.assertionConsumerServices[1]] - - //Initial revision - spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory,0)) - acs = spssoDescriptor.assertionConsumerServices[0] - - then: - entityDescriptorHistory.size() == 2 - acs1.isDefault() - !acs2.isDefault() - acs1.location == 'http://acs.updated' - acs1.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS' - acs2.location == 'http://acs2' - acs2.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact' - getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() - - //Check the initial revision is intact - !acs.isDefault() - acs.location == 'http://acs' - acs.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' - } - - def "test versioning logout"() { - setup: - def expectedModifiedPersistentEntities = [EntityDescriptor.name, - SPSSODescriptor.name, - SingleLogoutService.name] - - when: - EntityDescriptor ed = new EntityDescriptor() - def representation = new EntityDescriptorRepresentation().with { - it.logoutEndpoints = [new LogoutEndpointRepresentation(url: 'http://logout', bindingType: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST')] - it - } - - def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - SPSSODescriptor spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) - SingleLogoutService slo = spssoDescriptor.singleLogoutServices[0] - - then: - entityDescriptorHistory.size() == 1 - slo.location == 'http://logout' - slo.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' - getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() - - when: - representation = new EntityDescriptorRepresentation().with { - it.logoutEndpoints = [new LogoutEndpointRepresentation(url: 'http://logout.updated', bindingType: 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS'), - new LogoutEndpointRepresentation(url: 'http://logout2', bindingType: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact')] - it - } - - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - SPSSODescriptor spssoDescriptor2 = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) - def (slo1, slo2) = [spssoDescriptor2.singleLogoutServices[0], spssoDescriptor2.singleLogoutServices[1]] - - //Initial revision - spssoDescriptor = - entityDescriptorService.getSPSSODescriptorFromEntityDescriptor(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) - slo = spssoDescriptor.singleLogoutServices[0] - - then: - entityDescriptorHistory.size() == 2 - slo1.location == 'http://logout.updated' - slo1.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS' - slo2.location == 'http://logout2' - slo2.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact' - getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() - - //Check the initial version is intact - slo.location == 'http://logout' - slo.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST' - } - - def "test versioning relying party overrides"() { - setup: - def expectedModifiedPersistentEntities = [EntityDescriptor.name, - EntityAttributes.name, - Extensions.name, - Attribute.name, - XSBoolean.name, - XSString.name] - - when: - EntityDescriptor ed = new EntityDescriptor() - def representation = new EntityDescriptorRepresentation().with { - it.relyingPartyOverrides = [signAssertion: true] - it.attributeRelease = ['attr1'] - it - } - - def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - EntityAttributes attrs = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) - - then: - entityDescriptorHistory.size() == 1 - attrs.attributes[0].attributeValues[0].storedValue == 'true' - attrs.attributes[1].attributeValues[0].xsStringvalue == 'attr1' - getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() - - when: - representation = new EntityDescriptorRepresentation().with { - it.relyingPartyOverrides = [signAssertion: false] - it.attributeRelease = ['attr1', 'attr2'] - it - } - - entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService, - entityDescriptorRepository, - txMgr, - entityManager) - - EntityAttributes attrs2 = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 1)) - - //Initial revision - attrs = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0)) - - expectedModifiedPersistentEntities = [EntityDescriptor.name, - EntityAttributes.name, - Attribute.name, - XSString.name] - then: - entityDescriptorHistory.size() == 2 - attrs2.attributes[0].attributeValues[0].xsStringvalue == 'attr1' - attrs2.attributes[0].attributeValues[1].xsStringvalue == 'attr2' - getModifiedEntityNames(entityDescriptorHistory, 1).sort() == expectedModifiedPersistentEntities.sort() - - //Check the initial revision is intact - attrs.attributes[0].attributeValues[0].storedValue == 'true' - attrs.attributes[1].attributeValues[0].xsStringvalue == 'attr1' - attrs.attributes[1].attributeValues[1] == null - } -} diff --git a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy deleted file mode 100644 index 226df4476..000000000 --- a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEntityBasicEnversVersioningTests.groovy +++ /dev/null @@ -1,106 +0,0 @@ -package edu.internet2.tier.shibboleth.admin.ui.repository.envers - -import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration -import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration -import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration -import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration -import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter -import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget -import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver -import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository -import org.hibernate.envers.AuditReaderFactory -import org.hibernate.envers.query.AuditQuery -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.autoconfigure.domain.EntityScan -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest -import org.springframework.data.jpa.repository.config.EnableJpaRepositories -import org.springframework.test.context.ContextConfiguration -import org.springframework.transaction.PlatformTransactionManager -import org.springframework.transaction.support.DefaultTransactionDefinition -import spock.lang.Specification - -import javax.persistence.EntityManager - -import static org.springframework.transaction.TransactionDefinition.PROPAGATION_REQUIRES_NEW - -/** - * Testing metadata resolvers basic versioning by envers is functioning. - */ -@DataJpaTest -@ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration]) -@EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) -@EntityScan("edu.internet2.tier.shibboleth.admin.ui") -class MetadataResolverEntityBasicEnversVersioningTests extends Specification { - - @Autowired - MetadataResolverRepository metadataResolverRepository - - @Autowired - EntityManager entityManager - - @Autowired - PlatformTransactionManager txMgr - - def "test basic audit and version data is created when persisting base metadata resolver with envers enabled"() { - when: - MetadataResolver mdr = doInExplicitTransaction { - metadataResolverRepository.save(create {new MetadataResolver()}) - } - def metadataResolverHistory = resolverHistory() - - then: - metadataResolverHistory.size() == 1 - - when: - def rev = metadataResolverHistory[0] - - then: - rev[1].principalUserName == 'anonymousUser' - - when: - mdr.name = 'Updated' - doInExplicitTransaction { - metadataResolverRepository.save(mdr) - } - metadataResolverHistory = resolverHistory() - - then: - metadataResolverHistory.size == 2 - } - - private resolverHistory() { - def auditReader = AuditReaderFactory.get(entityManager) - AuditQuery auditQuery = auditReader - .createQuery() - .forRevisionsOfEntity(MetadataResolver, false, true) - auditQuery.resultList - - } - - private static create(Closure concreteResolverSupplier) { - MetadataResolver resolver = concreteResolverSupplier() - resolver.with { - it.name = "testme" - it.metadataFilters.add(new EntityAttributesFilter().with { - it.entityAttributesFilterTarget = new EntityAttributesFilterTarget().with { - it.entityAttributesFilterTargetType = EntityAttributesFilterTarget.EntityAttributesFilterTargetType.ENTITY - it.value = ["hola"] - return it - } - return it - }) - } - resolver - } - - //This explicit low level transaction dance is required in order to verify history/version data that envers - //writes out only after the explicit transaction is committed, therefore making it impossible to verify within the main tx - //boundary of the test method which commits tx only after an execution of the test method. This let's us explicitly - //start/commit transaction making envers data written out and verifiable - private doInExplicitTransaction(Closure uow) { - def txStatus = txMgr.getTransaction(new DefaultTransactionDefinition(PROPAGATION_REQUIRES_NEW)) - def entity = uow() - txMgr.commit(txStatus) - entity - } -} diff --git a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy b/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy deleted file mode 100644 index 738187741..000000000 --- a/envers-tests-module/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy +++ /dev/null @@ -1,116 +0,0 @@ -package edu.internet2.tier.shibboleth.admin.ui.service.envers - -import edu.internet2.tier.shibboleth.admin.ui.configuration.* -import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor -import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository -import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService -import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorVersionService -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.autoconfigure.domain.EntityScan -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest -import org.springframework.data.jpa.repository.config.EnableJpaRepositories -import org.springframework.test.context.ContextConfiguration -import org.springframework.transaction.PlatformTransactionManager -import spock.lang.Specification - -import java.time.LocalDateTime - -import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction - -@DataJpaTest -@ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration, EntitiesVersioningConfiguration]) -@EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) -@EntityScan("edu.internet2.tier.shibboleth.admin.ui") -class EnversEntityDescriptorVersionServiceTests extends Specification { - - @Autowired - EntityDescriptorVersionService entityDescriptorVersionService - - @Autowired - EntityDescriptorRepository entityDescriptorRepository - - @Autowired - EntityDescriptorService entityDescriptorService - - @Autowired - PlatformTransactionManager txMgr - - def "versioning service returns correct number of versions sorted by modified date in natural order"() { - when: 'Initial version' - EntityDescriptor ed = new EntityDescriptor(entityID: 'ed', serviceProviderName: 'SP1') - ed = doInExplicitTransaction(txMgr) { - entityDescriptorRepository.save(ed) - } - def versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) - - then: - versions.size() == 1 - versions[0].id - versions[0].creator - versions[0].date < LocalDateTime.now() - - when: 'Second version' - ed.serviceProviderName = 'SP2' - ed = doInExplicitTransaction(txMgr) { - entityDescriptorRepository.save(ed) - } - versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) - - then: - versions.size() == 2 - versions[0].id && versions[1].id - versions[0].creator && versions[1].creator - versions[0].date < versions[1].date - - when: 'Third version' - ed.serviceProviderName = 'SP3' - ed = doInExplicitTransaction(txMgr) { - entityDescriptorRepository.save(ed) - } - versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) - - then: - versions.size() == 3 - versions[0].id && versions[1].id && versions[2].id - versions[0].creator && versions[1].creator && versions[2].creator - (versions[0].date < versions[1].date) && (versions[1].date < versions[2].date) - } - - def "versioning service returns correct entity descriptor for version number"() { - when: 'Initial version' - EntityDescriptor ed = new EntityDescriptor(entityID: 'ed', serviceProviderName: 'SP1', createdBy: 'anonymousUser') - ed = doInExplicitTransaction(txMgr) { - entityDescriptorRepository.save(ed) - } - def versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) - def v1EdRepresentation = entityDescriptorVersionService.findSpecificVersionOfEntityDescriptor(ed.resourceId, versions[0].id) - - then: - v1EdRepresentation.serviceProviderName == 'SP1' - v1EdRepresentation.id == ed.resourceId - - when: 'Update the original' - ed.serviceProviderName = 'SP2' - ed = doInExplicitTransaction(txMgr) { - entityDescriptorRepository.save(ed) - } - versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) - def v2EdRepresentation = entityDescriptorVersionService.findSpecificVersionOfEntityDescriptor(ed.resourceId, versions[1].id) - - then: - v2EdRepresentation.serviceProviderName == 'SP2' - v2EdRepresentation.id == ed.resourceId - } - - def "versioning service returns null for non existent version number"() { - when: 'Initial version' - EntityDescriptor ed = new EntityDescriptor(entityID: 'ed', serviceProviderName: 'SP1', createdBy: 'anonymousUser') - ed = doInExplicitTransaction(txMgr) { - entityDescriptorRepository.save(ed) - } - def edRepresentation = entityDescriptorVersionService.findSpecificVersionOfEntityDescriptor(ed.resourceId, '1000') - - then: - !edRepresentation - } -} From 31b3228cfbc272e3c6db73f8341f5d23b963f30e Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Thu, 13 Jun 2019 09:44:33 -0400 Subject: [PATCH 074/112] Change order of tests --- backend/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/build.gradle b/backend/build.gradle index 3af60585e..965816952 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -233,6 +233,7 @@ task enversTest(type: Test) { systemProperties = System.properties systemProperties['user.dir'] = workingDir } +enversTest.mustRunAfter test check { dependsOn enversTest From c37e28d923eec5ad9ae2a668de3e347b9e64c626 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Thu, 13 Jun 2019 10:07:12 -0400 Subject: [PATCH 075/112] Remove order of tests --- backend/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/build.gradle b/backend/build.gradle index 965816952..3af60585e 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -233,7 +233,6 @@ task enversTest(type: Test) { systemProperties = System.properties systemProperties['user.dir'] = workingDir } -enversTest.mustRunAfter test check { dependsOn enversTest From 34482660cd140938adb15be8e89f64229987cb32 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Thu, 13 Jun 2019 11:16:54 -0400 Subject: [PATCH 076/112] Add cleanWs() to Jenkins pipeline --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index bc032671c..8c6befc98 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,5 +48,8 @@ pipeline { success { emailext body: '''${SCRIPT, template="groovy-text.template"}''', recipientProviders: [[$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']], subject: '[SHIBUI] Build Success' } + always { + cleanWs() + } } -} \ No newline at end of file +} From 7d4bd616ef1ce3853a1efd09e43e3bf0f971a38e Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Thu, 13 Jun 2019 13:58:55 -0400 Subject: [PATCH 077/112] Check against static date format --- .../domain/versioning/VersionJsonSerializationBasicTests.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy index 07c37a55c..585369249 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy @@ -24,7 +24,7 @@ class VersionJsonSerializationBasicTests extends Specification { { "id": "2", "creator": "kramer", - "date": "${staticDate.toString()}" + "date": "2019-05-20T15:00" } """ From 3670d579b1bdc26fe044791e7dc5972888f02977 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 17 Jun 2019 16:00:01 -0400 Subject: [PATCH 078/112] SHIBUI-1263(1319) wip... --- ...tityDescriptorEnversVersioningTests.groovy | 4 + ...tadataResolverEnversVersioningTests.groovy | 94 +++++++++++++++++++ .../LocalDynamicMetadataResolver.java | 3 + .../envers/EnversTestsSupport.groovy | 15 ++- 4 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 05e3ad139..b7f31270a 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -179,6 +179,10 @@ class EntityDescriptorEnversVersioningTests extends Specification { getRevisionEntityForRevisionIndex(entityDescriptorHistory, 0).timestamp > 0L getModifiedEntityNames(entityDescriptorHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + + + when: representation = new EntityDescriptorRepresentation().with { it.organization = new OrganizationRepresentation(name: 'orgUpdated', displayName: 'display org Updated', url: 'http://org2.edu') diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy new file mode 100644 index 000000000..3a6fe394b --- /dev/null +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy @@ -0,0 +1,94 @@ +package edu.internet2.tier.shibboleth.admin.ui.repository.envers + +import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration +import edu.internet2.tier.shibboleth.admin.ui.domain.* +import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.* +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicMetadataResolverAttributes +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver +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.repository.MetadataResolverRepository +import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.autoconfigure.domain.EntityScan +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest +import org.springframework.data.jpa.repository.config.EnableJpaRepositories +import org.springframework.test.context.ContextConfiguration +import org.springframework.transaction.PlatformTransactionManager +import spock.lang.Specification + +import javax.persistence.EntityManager + +import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.* + +/** + * Testing metadata resolver envers versioning + */ +@DataJpaTest +@ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, SearchConfiguration, TestConfiguration]) +@EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) +@EntityScan("edu.internet2.tier.shibboleth.admin.ui") +class MetadataResolverEnversVersioningTests extends Specification { + + @Autowired + MetadataResolverRepository metadataResolverRepository + + @Autowired + EntityManager entityManager + + @Autowired + PlatformTransactionManager txMgr + + @Autowired + OpenSamlObjects openSamlObjects + + def "test versioning of LocalDynamicMetadataResolver"() { + setup: + def expectedModifiedPersistentEntities = [LocalDynamicMetadataResolver.name] + + when: + LocalDynamicMetadataResolver resolver = new LocalDynamicMetadataResolver(name: 'ldmr').with { + it.dynamicMetadataResolverAttributes = new DynamicMetadataResolverAttributes() + it + } + def resolverHistory = updateAndGetRevisionHistoryOfMetadataResolver(resolver, + metadataResolverRepository, + LocalDynamicMetadataResolver, + txMgr, + entityManager) + + then: + resolverHistory.size() == 1 + getTargetEntityForRevisionIndex(resolverHistory, 0).name == 'ldmr' + getTargetEntityForRevisionIndex(resolverHistory, 0).dynamicMetadataResolverAttributes.refreshDelayFactor == 0.75 + getRevisionEntityForRevisionIndex(resolverHistory, 0).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(resolverHistory, 0).timestamp > 0L + getModifiedEntityNames(resolverHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + resolver.name = 'ldmr_UPDATED' + resolver.dynamicMetadataResolverAttributes.refreshDelayFactor = 1.00 + resolverHistory = updateAndGetRevisionHistoryOfMetadataResolver(resolver, + metadataResolverRepository, + LocalDynamicMetadataResolver, + txMgr, + entityManager) + + then: + resolverHistory.size() == 2 + getTargetEntityForRevisionIndex(resolverHistory, 1).name == 'ldmr_UPDATED' + getTargetEntityForRevisionIndex(resolverHistory, 1).dynamicMetadataResolverAttributes.refreshDelayFactor == 1.00 + getRevisionEntityForRevisionIndex(resolverHistory, 1).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(resolverHistory, 1).timestamp > 0L + + //Check the original revision is intact + getTargetEntityForRevisionIndex(resolverHistory, 0).name == 'ldmr' + getTargetEntityForRevisionIndex(resolverHistory, 0).dynamicMetadataResolverAttributes.refreshDelayFactor == 0.75 + getRevisionEntityForRevisionIndex(resolverHistory, 0).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(resolverHistory, 0).timestamp > 0L + } +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/LocalDynamicMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/LocalDynamicMetadataResolver.java index 6b722803a..49cc09642 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/LocalDynamicMetadataResolver.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/LocalDynamicMetadataResolver.java @@ -8,11 +8,14 @@ import javax.persistence.Embedded; import javax.persistence.Entity; +import org.hibernate.envers.Audited; + @Entity @EqualsAndHashCode(callSuper = true) @Getter @Setter @ToString +@Audited public class LocalDynamicMetadataResolver extends MetadataResolver { public LocalDynamicMetadataResolver() { type = "LocalDynamicMetadataResolver"; diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy index ca447e7f0..2052cf9d1 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy @@ -2,7 +2,9 @@ package edu.internet2.tier.shibboleth.admin.ui.repository.envers 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.resolvers.MetadataResolver import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository +import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService import org.hibernate.envers.AuditReaderFactory import org.hibernate.envers.query.AuditEntity @@ -36,10 +38,21 @@ class EnversTestsSupport { doInExplicitTransaction(txMgr) { edr.save(ed) } - getRevisionHistoryForEntityType(em, EntityDescriptor, ed.resourceId) } + static updateAndGetRevisionHistoryOfMetadataResolver(MetadataResolver mr, + MetadataResolverRepository mrr, + Class < ? > type, + PlatformTransactionManager + txMgr, EntityManager em) { + + doInExplicitTransaction(txMgr) { + mrr.save(mr) + } + getRevisionHistoryForEntityType(em, type, mr.resourceId) + } + static getRevisionHistoryForEntityType(EntityManager em, Class entityType, String resourceId) { def auditReader = AuditReaderFactory.get(em) AuditQuery auditQuery = auditReader From ae984cc266acc4cd76e0b2a585c7bddcd36112c6 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Wed, 19 Jun 2019 09:43:36 -0700 Subject: [PATCH 079/112] SHIBUI-1281 Updated dashboard display --- .../main/resources/i18n/messages.properties | 5 ++ ui/package-lock.json | 13 +++ ui/package.json | 1 + ui/src/app/app.component.html | 2 +- ui/src/app/app.component.scss | 12 +++ .../entity/filter/entity-attributes-filter.ts | 1 + .../entity/filter/nameid-format-filter.ts | 1 + .../file-backed-http-metadata-resolver.ts | 5 +- .../metadata/domain/model/metadata-base.ts | 1 + .../metadata/domain/model/metadata-entity.ts | 2 + .../component/provider-search.component.html | 4 +- .../dashboard-resolvers-list.component.html | 80 ++++++++++--------- ...dashboard-resolvers-list.component.spec.ts | 2 - .../dashboard-resolvers-list.component.ts | 17 ++-- ui/src/app/metadata/manager/manager.module.ts | 4 +- ui/src/theme/utility.scss | 8 ++ 16 files changed, 104 insertions(+), 54 deletions(-) diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties index 03ae27513..89c5cd00b 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -385,6 +385,11 @@ label.email=Email label.role=Role label.delete=Delete? +label.title=Title +label.enabled=Enabled +label.author=Author +label.creation-date=Creation Date + label.metadata-resolver-history=Metadata resolver history label.metadata-version-history=Metadata Version History label.select-version=Select Version diff --git a/ui/package-lock.json b/ui/package-lock.json index fc76f65cc..5b8942a76 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -10232,6 +10232,14 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, + "ngx-infinite-scroll": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/ngx-infinite-scroll/-/ngx-infinite-scroll-7.2.0.tgz", + "integrity": "sha512-EcqjKpU1ukRV3YXOW8cTVtbzPpa9UPaRtYBCg0ZQH3ceCDm+xzLbd4pXy6oKAIN4zN1r/pyGuf5XOJkA8vr6yg==", + "requires": { + "opencollective-postinstall": "^2.0.2" + } + }, "ngx-schema-form": { "version": "2.2.0-beta.1", "resolved": "https://registry.npmjs.org/ngx-schema-form/-/ngx-schema-form-2.2.0-beta.1.tgz", @@ -10748,6 +10756,11 @@ "is-wsl": "^1.1.0" } }, + "opencollective-postinstall": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz", + "integrity": "sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==" + }, "opener": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz", diff --git a/ui/package.json b/ui/package.json index 60a73244f..9881e1fb7 100644 --- a/ui/package.json +++ b/ui/package.json @@ -43,6 +43,7 @@ "deepmerge": "^2.2.1", "file-saver": "^1.3.3", "font-awesome": "^4.7.0", + "ngx-infinite-scroll": "^7.2.0", "ngx-schema-form": "^2.2.0-beta.1", "rxjs": "^6.5.1", "rxjs-compat": "^6.5.1", diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html index fb19ae16a..6af7be5ab 100644 --- a/ui/src/app/app.component.html +++ b/ui/src/app/app.component.html @@ -58,7 +58,7 @@
-
+
diff --git a/ui/src/app/app.component.scss b/ui/src/app/app.component.scss index dbe420760..fcee7de97 100644 --- a/ui/src/app/app.component.scss +++ b/ui/src/app/app.component.scss @@ -13,3 +13,15 @@ nav.navbar { max-height: 60px; } } + +@media only screen and (min-width: 1024px) { + .pad-content { + padding: 1rem 3rem; + } +} + +@media only screen and (min-width: 1200px) { + .pad-content { + padding: 2rem 5rem; + } +} diff --git a/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts b/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts index 304e6055e..839324879 100644 --- a/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts +++ b/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts @@ -7,6 +7,7 @@ export class EntityAttributesFilterEntity implements MetadataFilter, MetadataEnt modifiedDate?: string; version: string; resourceId: string; + createdBy: string; name = ''; filterEnabled = false; diff --git a/ui/src/app/metadata/domain/entity/filter/nameid-format-filter.ts b/ui/src/app/metadata/domain/entity/filter/nameid-format-filter.ts index d57b1e345..3d745f725 100644 --- a/ui/src/app/metadata/domain/entity/filter/nameid-format-filter.ts +++ b/ui/src/app/metadata/domain/entity/filter/nameid-format-filter.ts @@ -7,6 +7,7 @@ export class NameIDFormatFilterEntity implements MetadataFilter, MetadataEntity modifiedDate?: string; version: string; resourceId: string; + createdBy: string; name = ''; filterEnabled = false; diff --git a/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts b/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts index 8a59cb691..81a2a2ca7 100644 --- a/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts +++ b/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts @@ -18,6 +18,7 @@ export class FileBackedHttpMetadataResolver implements MetadataResolver, Metadat createdDate?: string; modifiedDate?: string; version: string; + createdBy: string; entityId = ''; serviceProviderName = ''; @@ -48,6 +49,8 @@ export class FileBackedHttpMetadataResolver implements MetadataResolver, Metadat attributeRelease = [] as string[]; + [property: string]: unknown; + constructor(descriptor?: Partial) { Object.assign(this, descriptor); } @@ -65,7 +68,7 @@ export class FileBackedHttpMetadataResolver implements MetadataResolver, Metadat } getCreationDate(): Date { - return new Date(this.createdDate); + return this.createdDate ? new Date(this.createdDate) : null; } get name(): string { diff --git a/ui/src/app/metadata/domain/model/metadata-base.ts b/ui/src/app/metadata/domain/model/metadata-base.ts index 2de4e32bf..e8847a6ee 100644 --- a/ui/src/app/metadata/domain/model/metadata-base.ts +++ b/ui/src/app/metadata/domain/model/metadata-base.ts @@ -1,6 +1,7 @@ export interface MetadataBase { id?: string; createdDate?: string; + createdBy: string; modifiedDate?: string; version?: string; } diff --git a/ui/src/app/metadata/domain/model/metadata-entity.ts b/ui/src/app/metadata/domain/model/metadata-entity.ts index 49d34a78a..699502c8f 100644 --- a/ui/src/app/metadata/domain/model/metadata-entity.ts +++ b/ui/src/app/metadata/domain/model/metadata-entity.ts @@ -3,6 +3,8 @@ export interface MetadataEntity { enabled: boolean; kind: string; + createdBy: string; + getId(): string; getDisplayId(): string; isDraft(): boolean; diff --git a/ui/src/app/metadata/manager/component/provider-search.component.html b/ui/src/app/metadata/manager/component/provider-search.component.html index 29479de5d..381aa8568 100644 --- a/ui/src/app/metadata/manager/component/provider-search.component.html +++ b/ui/src/app/metadata/manager/component/provider-search.component.html @@ -1,5 +1,5 @@
-
+
- +
+ + +
+
\ No newline at end of file diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.ts b/ui/src/app/metadata/configuration/container/metadata-options.component.ts index bc2d0bb0d..13b27c1d2 100644 --- a/ui/src/app/metadata/configuration/container/metadata-options.component.ts +++ b/ui/src/app/metadata/configuration/container/metadata-options.component.ts @@ -4,6 +4,7 @@ import { Observable } from 'rxjs'; import * as fromConfiguration from '../reducer'; import { MetadataConfiguration } from '../model/metadata-configuration'; +import { Metadata } from '../../domain/domain.type'; @Component({ selector: 'metadata-options-page', @@ -14,10 +15,12 @@ import { MetadataConfiguration } from '../model/metadata-configuration'; export class MetadataOptionsComponent { configuration$: Observable; + model$: Observable; constructor( private store: Store ) { this.configuration$ = this.store.select(fromConfiguration.getConfigurationSections); + this.model$ = this.store.select(fromConfiguration.getConfigurationModel); } } From 9fd7eca43ca8d39b2a8b0942de86a96c65fa78fe Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Thu, 20 Jun 2019 12:01:17 -0400 Subject: [PATCH 081/112] SHIBUI-1263(1319) --- ...tadataResolverEnversVersioningTests.groovy | 117 +++++++++++++++++- .../DynamicHttpMetadataResolver.java | 1 + .../FileBackedHttpMetadataResolver.java | 4 +- .../MetadataRequestURLConstructionScheme.java | 4 + 4 files changed, 119 insertions(+), 7 deletions(-) diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy index 3a6fe394b..1cea18a62 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy @@ -4,15 +4,14 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfigurat import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration -import edu.internet2.tier.shibboleth.admin.ui.domain.* -import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.* +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicMetadataResolverAttributes +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.HttpMetadataResolverAttributes import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver -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.ui.opensaml.OpenSamlObjects -import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository -import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.domain.EntityScan import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest @@ -23,6 +22,8 @@ import spock.lang.Specification import javax.persistence.EntityManager +import static edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.HttpMetadataResolverAttributes.HttpCachingType.file +import static edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.HttpMetadataResolverAttributes.HttpCachingType.none import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.* /** @@ -91,4 +92,110 @@ class MetadataResolverEnversVersioningTests extends Specification { getRevisionEntityForRevisionIndex(resolverHistory, 0).principalUserName == 'anonymousUser' getRevisionEntityForRevisionIndex(resolverHistory, 0).timestamp > 0L } + + def "test versioning of FileBackedHttpMetadataResolver"() { + setup: + def expectedModifiedPersistentEntities = [FileBackedHttpMetadataResolver.name] + + when: + FileBackedHttpMetadataResolver resolver = new FileBackedHttpMetadataResolver(name: 'fbmr').with { + it.httpMetadataResolverAttributes = new HttpMetadataResolverAttributes(proxyUser: 'proxyUser', + proxyPassword: 'proxyPass', + httpCaching: none) + it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes(indexesRef: 'indexRef') + it + } + def resolverHistory = updateAndGetRevisionHistoryOfMetadataResolver(resolver, + metadataResolverRepository, + FileBackedHttpMetadataResolver, + txMgr, + entityManager) + + then: + resolverHistory.size() == 1 + getTargetEntityForRevisionIndex(resolverHistory, 0).name == 'fbmr' + getTargetEntityForRevisionIndex(resolverHistory, 0).httpMetadataResolverAttributes.proxyUser == 'proxyUser' + getTargetEntityForRevisionIndex(resolverHistory, 0).httpMetadataResolverAttributes.proxyPassword == 'proxyPass' + getTargetEntityForRevisionIndex(resolverHistory, 0).httpMetadataResolverAttributes.httpCaching == none + getTargetEntityForRevisionIndex(resolverHistory, 0).reloadableMetadataResolverAttributes.indexesRef == 'indexRef' + getRevisionEntityForRevisionIndex(resolverHistory, 0).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(resolverHistory, 0).timestamp > 0L + getModifiedEntityNames(resolverHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + resolver.name = 'fbmrUPDATED' + resolver.httpMetadataResolverAttributes.proxyUser = 'proxyUserUPDATED' + resolver.httpMetadataResolverAttributes.proxyPassword = 'proxyPassUPDATED' + resolver.httpMetadataResolverAttributes.httpCaching = file + resolver.reloadableMetadataResolverAttributes.indexesRef = 'indexRefUPDATED' + + resolverHistory = updateAndGetRevisionHistoryOfMetadataResolver(resolver, + metadataResolverRepository, + FileBackedHttpMetadataResolver, + txMgr, + entityManager) + + then: + resolverHistory.size() == 2 + getTargetEntityForRevisionIndex(resolverHistory, 1).name == 'fbmrUPDATED' + getTargetEntityForRevisionIndex(resolverHistory, 1).httpMetadataResolverAttributes.proxyUser == 'proxyUserUPDATED' + getTargetEntityForRevisionIndex(resolverHistory, 1).httpMetadataResolverAttributes.proxyPassword == 'proxyPassUPDATED' + getTargetEntityForRevisionIndex(resolverHistory, 1).httpMetadataResolverAttributes.httpCaching == file + getTargetEntityForRevisionIndex(resolverHistory, 1).reloadableMetadataResolverAttributes.indexesRef == 'indexRefUPDATED' + getRevisionEntityForRevisionIndex(resolverHistory, 1).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(resolverHistory, 1).timestamp > 0L + getModifiedEntityNames(resolverHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the original revision is intact + getTargetEntityForRevisionIndex(resolverHistory, 0).name == 'fbmr' + getTargetEntityForRevisionIndex(resolverHistory, 0).httpMetadataResolverAttributes.proxyUser == 'proxyUser' + getTargetEntityForRevisionIndex(resolverHistory, 0).httpMetadataResolverAttributes.proxyPassword == 'proxyPass' + getTargetEntityForRevisionIndex(resolverHistory, 0).httpMetadataResolverAttributes.httpCaching == none + getTargetEntityForRevisionIndex(resolverHistory, 0).reloadableMetadataResolverAttributes.indexesRef == 'indexRef' + getRevisionEntityForRevisionIndex(resolverHistory, 0).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(resolverHistory, 0).timestamp > 0L + } + + def "test versioning of DynamicHttpMetadataResolver"() { + setup: + def expectedModifiedPersistentEntities = [DynamicHttpMetadataResolver.name] + + when: + DynamicHttpMetadataResolver resolver = new DynamicHttpMetadataResolver(name: 'dhmr') + + def resolverHistory = updateAndGetRevisionHistoryOfMetadataResolver(resolver, + metadataResolverRepository, + DynamicHttpMetadataResolver, + txMgr, + entityManager) + + then: + resolverHistory.size() == 1 + getTargetEntityForRevisionIndex(resolverHistory, 0).name == 'dhmr' + getRevisionEntityForRevisionIndex(resolverHistory, 0).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(resolverHistory, 0).timestamp > 0L + getModifiedEntityNames(resolverHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + resolver.name = 'dhmrUPDATED' + + resolverHistory = updateAndGetRevisionHistoryOfMetadataResolver(resolver, + metadataResolverRepository, + DynamicHttpMetadataResolver, + txMgr, + entityManager) + + then: + resolverHistory.size() == 2 + getTargetEntityForRevisionIndex(resolverHistory, 1).name == 'dhmrUPDATED' + getRevisionEntityForRevisionIndex(resolverHistory, 1).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(resolverHistory, 1).timestamp > 0L + getModifiedEntityNames(resolverHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the original revision is intact + getTargetEntityForRevisionIndex(resolverHistory, 0).name == 'dhmr' + getRevisionEntityForRevisionIndex(resolverHistory, 0).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(resolverHistory, 0).timestamp > 0L + getModifiedEntityNames(resolverHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/DynamicHttpMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/DynamicHttpMetadataResolver.java index e8deb0e3e..732078747 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/DynamicHttpMetadataResolver.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/DynamicHttpMetadataResolver.java @@ -22,6 +22,7 @@ @Getter @Setter @ToString +@Audited public class DynamicHttpMetadataResolver extends MetadataResolver { public static final String DEFAULT_TIMEOUT = "PT5S"; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/FileBackedHttpMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/FileBackedHttpMetadataResolver.java index b80b8190f..17fe28ab9 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/FileBackedHttpMetadataResolver.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/FileBackedHttpMetadataResolver.java @@ -1,11 +1,10 @@ package edu.internet2.tier.shibboleth.admin.ui.domain.resolvers; -import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.hibernate.envers.AuditOverride; + import org.hibernate.envers.Audited; import javax.persistence.Embedded; @@ -16,6 +15,7 @@ @Getter @Setter @ToString +@Audited public class FileBackedHttpMetadataResolver extends MetadataResolver { public FileBackedHttpMetadataResolver() { type = "FileBackedHttpMetadataResolver"; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataRequestURLConstructionScheme.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataRequestURLConstructionScheme.java index adddcc5aa..af3b0eab5 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataRequestURLConstructionScheme.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataRequestURLConstructionScheme.java @@ -7,6 +7,8 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import org.hibernate.envers.AuditOverride; +import org.hibernate.envers.Audited; import javax.persistence.Entity; import javax.persistence.Transient; @@ -24,6 +26,8 @@ @JsonSubTypes({@JsonSubTypes.Type(value=MetadataQueryProtocolScheme.class, name="MetadataQueryProtocol"), @JsonSubTypes.Type(value=TemplateScheme.class, name="Template"), @JsonSubTypes.Type(value=RegexScheme.class, name="Regex")}) +@Audited +@AuditOverride(forClass = AbstractAuditable.class) public abstract class MetadataRequestURLConstructionScheme extends AbstractAuditable { public enum SchemeType { METADATA_QUERY_PROTOCOL("MetadataQueryProtocol"), From 926e946afae61132cb21715bce9d4782a88a6185 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Thu, 20 Jun 2019 13:34:20 -0700 Subject: [PATCH 082/112] SHIBUI-1268 Integrated header with version history --- .../action/configuration.action.ts | 2 +- .../configuration/action/history.action.ts | 52 +++++++++++++++++++ .../component/history-list.component.html | 12 ++--- .../component/history-list.component.spec.ts | 0 .../component/history-list.component.ts | 2 +- .../metadata-configuration.component.html | 6 +-- .../metadata-configuration.component.ts | 10 +++- .../component/metadata-header.component.html | 9 ++-- .../component/metadata-header.component.ts | 6 ++- .../configuration/configuration.module.ts | 14 +++-- .../configuration/configuration.routing.ts | 5 ++ .../configuration/configuration.values.ts | 10 ++++ .../container/configuration.component.ts | 29 ++++++++++- .../container/metadata-history.component.html | 3 ++ .../metadata-history.component.spec.ts} | 14 ++--- .../container/metadata-history.component.ts | 22 ++++++++ .../container/metadata-options.component.html | 15 ++++-- .../container/metadata-options.component.ts | 23 ++++++-- .../container/metadata-xml.component.html | 18 +++++-- .../container/metadata-xml.component.ts | 2 - .../configuration/effect/history.effect.ts | 34 ++++++++++++ .../model/history.ts | 0 .../metadata/configuration/model/version.ts | 5 ++ .../reducer/history.reducer.spec.ts | 0 .../configuration/reducer/history.reducer.ts | 52 +++++++++++++++++++ .../metadata/configuration/reducer/index.ts | 31 ++++++++++- .../service/configuration.service.ts | 10 +--- .../service/history.service.spec.ts | 10 ++-- .../configuration/service/history.service.ts | 27 ++++++++++ ui/src/app/metadata/metadata.module.ts | 2 - ui/src/app/metadata/metadata.routing.ts | 2 - .../container/resolver-edit.component.ts | 2 +- .../resolver/effect/collection.effects.ts | 2 +- .../container/version-history.component.html | 18 ------- .../container/version-history.component.ts | 21 -------- ui/src/app/metadata/version/model/version.ts | 6 --- .../version/service/history.service.ts | 34 ------------ ui/src/app/metadata/version/version.module.ts | 42 --------------- .../app/metadata/version/version.routing.ts | 9 ---- 39 files changed, 364 insertions(+), 197 deletions(-) create mode 100644 ui/src/app/metadata/configuration/action/history.action.ts rename ui/src/app/metadata/{version => configuration}/component/history-list.component.html (83%) rename ui/src/app/metadata/{version => configuration}/component/history-list.component.spec.ts (100%) rename ui/src/app/metadata/{version => configuration}/component/history-list.component.ts (96%) create mode 100644 ui/src/app/metadata/configuration/configuration.values.ts create mode 100644 ui/src/app/metadata/configuration/container/metadata-history.component.html rename ui/src/app/metadata/{version/container/version-history.component.spec.ts => configuration/container/metadata-history.component.spec.ts} (76%) create mode 100644 ui/src/app/metadata/configuration/container/metadata-history.component.ts create mode 100644 ui/src/app/metadata/configuration/effect/history.effect.ts rename ui/src/app/metadata/{version => configuration}/model/history.ts (100%) create mode 100644 ui/src/app/metadata/configuration/model/version.ts create mode 100644 ui/src/app/metadata/configuration/reducer/history.reducer.spec.ts create mode 100644 ui/src/app/metadata/configuration/reducer/history.reducer.ts rename ui/src/app/metadata/{version => configuration}/service/history.service.spec.ts (65%) create mode 100644 ui/src/app/metadata/configuration/service/history.service.ts delete mode 100644 ui/src/app/metadata/version/container/version-history.component.html delete mode 100644 ui/src/app/metadata/version/container/version-history.component.ts delete mode 100644 ui/src/app/metadata/version/model/version.ts delete mode 100644 ui/src/app/metadata/version/service/history.service.ts delete mode 100644 ui/src/app/metadata/version/version.module.ts delete mode 100644 ui/src/app/metadata/version/version.routing.ts diff --git a/ui/src/app/metadata/configuration/action/configuration.action.ts b/ui/src/app/metadata/configuration/action/configuration.action.ts index 1aa442601..b5b86ade1 100644 --- a/ui/src/app/metadata/configuration/action/configuration.action.ts +++ b/ui/src/app/metadata/configuration/action/configuration.action.ts @@ -65,7 +65,7 @@ export class LoadSchemaError implements Action { export class LoadXmlRequest implements Action { readonly type = ConfigurationActionTypes.LOAD_XML_REQUEST; - constructor(public payload: string) { } + constructor(public payload: { id: string, type: string }) { } } export class LoadXmlSuccess implements Action { diff --git a/ui/src/app/metadata/configuration/action/history.action.ts b/ui/src/app/metadata/configuration/action/history.action.ts new file mode 100644 index 000000000..5ee05ea65 --- /dev/null +++ b/ui/src/app/metadata/configuration/action/history.action.ts @@ -0,0 +1,52 @@ +import { Action } from '@ngrx/store'; +import { MetadataHistory } from '../model/history'; + +export enum HistoryActionTypes { + LOAD_HISTORY_REQUEST = '[Configuration History] Load History Request', + LOAD_HISTORY_SUCCESS = '[Configuration History] Load History Success', + LOAD_HISTORY_ERROR = '[Configuration History] Load History Error', + SET_HISTORY = '[Configuration History] Set History', + CLEAR_HISTORY = '[Configuration History] Clear History', + SELECT_VERSION = '[Configuration History] Select Version' +} + +export class LoadHistoryRequest implements Action { + readonly type = HistoryActionTypes.LOAD_HISTORY_REQUEST; + + constructor(public payload: { id: string, type: string }) { } +} + +export class LoadHistorySuccess implements Action { + readonly type = HistoryActionTypes.LOAD_HISTORY_SUCCESS; + + constructor(public payload: MetadataHistory) { } +} + +export class LoadHistoryError implements Action { + readonly type = HistoryActionTypes.LOAD_HISTORY_ERROR; + + constructor(public payload: any) { } +} + +export class SelectVersion implements Action { + readonly type = HistoryActionTypes.SELECT_VERSION; + constructor(public payload: string | null) { } +} + +export class SetHistory implements Action { + readonly type = HistoryActionTypes.SET_HISTORY; + + constructor(public payload: MetadataHistory) {} +} + +export class ClearHistory implements Action { + readonly type = HistoryActionTypes.CLEAR_HISTORY; +} + +export type HistoryActionsUnion = + | LoadHistoryRequest + | LoadHistorySuccess + | LoadHistoryError + | SetHistory + | ClearHistory + | SelectVersion; diff --git a/ui/src/app/metadata/version/component/history-list.component.html b/ui/src/app/metadata/configuration/component/history-list.component.html similarity index 83% rename from ui/src/app/metadata/version/component/history-list.component.html rename to ui/src/app/metadata/configuration/component/history-list.component.html index 6fa941e6e..b22da0fc3 100644 --- a/ui/src/app/metadata/version/component/history-list.component.html +++ b/ui/src/app/metadata/configuration/component/history-list.component.html @@ -12,7 +12,7 @@ - +
@@ -21,13 +21,13 @@
- Current (v{{ version.versionNumber }}) - v{{ version.versionNumber }} - {{ version.saveDate | date }} - {{ version.changedBy }} + Current (v{{ i + 1 }}) + v{{ i + 1 }} + {{ version.date | date }} + {{ version.creator }} diff --git a/ui/src/app/metadata/version/component/history-list.component.spec.ts b/ui/src/app/metadata/configuration/component/history-list.component.spec.ts similarity index 100% rename from ui/src/app/metadata/version/component/history-list.component.spec.ts rename to ui/src/app/metadata/configuration/component/history-list.component.spec.ts diff --git a/ui/src/app/metadata/version/component/history-list.component.ts b/ui/src/app/metadata/configuration/component/history-list.component.ts similarity index 96% rename from ui/src/app/metadata/version/component/history-list.component.ts rename to ui/src/app/metadata/configuration/component/history-list.component.ts index 34696a98e..7e03468e2 100644 --- a/ui/src/app/metadata/version/component/history-list.component.ts +++ b/ui/src/app/metadata/configuration/component/history-list.component.ts @@ -9,7 +9,7 @@ import { MetadataVersion } from '../model/version'; styleUrls: [] }) export class HistoryListComponent { - @Input() history: MetadataHistory; + @Input() history: MetadataVersion[]; @Output() compare: EventEmitter = new EventEmitter(); @Output() restore: EventEmitter = new EventEmitter(); diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html index 03323cf1d..4f58d07f1 100644 --- a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html +++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html @@ -7,10 +7,10 @@

{{ section.label | translate }}

- - +
diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts b/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts index 732b920d3..9e94bcdbd 100644 --- a/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts +++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts @@ -1,4 +1,5 @@ import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; +import { Router, ActivatedRoute } from '@angular/router'; import { MetadataConfiguration } from '../model/metadata-configuration'; @Component({ @@ -10,5 +11,12 @@ import { MetadataConfiguration } from '../model/metadata-configuration'; export class MetadataConfigurationComponent { @Input() configuration: MetadataConfiguration; - constructor() { } + constructor( + private router: Router, + private activatedRoute: ActivatedRoute + ) { } + + edit(id: string): void { + this.router.navigate(['../', 'edit', id], { relativeTo: this.activatedRoute.parent }); + } } diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.html b/ui/src/app/metadata/configuration/component/metadata-header.component.html index 15c0d9309..8b3517f0f 100644 --- a/ui/src/app/metadata/configuration/component/metadata-header.component.html +++ b/ui/src/app/metadata/configuration/component/metadata-header.component.html @@ -1,13 +1,14 @@ -
+
-

Version 5

+

Version {{ versionNumber }}

- Saved Mmm DD, YYYY, by Username + Saved {{ version.date | date }}, by {{ version.creator }}

Enabled +   Disabled - Current + Current

\ No newline at end of file diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.ts b/ui/src/app/metadata/configuration/component/metadata-header.component.ts index 744be8587..da4bd643a 100644 --- a/ui/src/app/metadata/configuration/component/metadata-header.component.ts +++ b/ui/src/app/metadata/configuration/component/metadata-header.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { Metadata, MetadataTypes } from '../../domain/domain.type'; -import { MetadataResolver } from '../../domain/model'; +import { MetadataVersion } from '../model/version'; @Component({ selector: 'metadata-header', @@ -10,6 +10,10 @@ import { MetadataResolver } from '../../domain/model'; export class MetadataHeaderComponent { @Input() metadata: Metadata; + @Input() version: MetadataVersion; + @Input() versionNumber: number; + @Input() isCurrent: boolean; + constructor() {} get isEnabled(): boolean { diff --git a/ui/src/app/metadata/configuration/configuration.module.ts b/ui/src/app/metadata/configuration/configuration.module.ts index 03d4a9a0c..9aa2cf880 100644 --- a/ui/src/app/metadata/configuration/configuration.module.ts +++ b/ui/src/app/metadata/configuration/configuration.module.ts @@ -12,7 +12,6 @@ import { MetadataConfigurationService } from './service/configuration.service'; import * as fromConfig from './reducer'; import { MetadataConfigurationEffects } from './effect/configuration.effect'; import { ConfigurationPropertyComponent } from './component/configuration-property.component'; -import { DomainModule } from '../domain/domain.module'; import { PrimitivePropertyComponent } from './component/primitive-property.component'; import { ObjectPropertyComponent } from './component/object-property.component'; import { ArrayPropertyComponent } from './component/array-property.component'; @@ -20,6 +19,10 @@ import { RouterModule } from '@angular/router'; import { MetadataOptionsComponent } from './container/metadata-options.component'; import { MetadataXmlComponent } from './container/metadata-xml.component'; import { MetadataHeaderComponent } from './component/metadata-header.component'; +import { MetadataHistoryEffects } from './effect/history.effect'; +import { MetadataHistoryService } from './service/history.service'; +import { MetadataHistoryComponent } from './container/metadata-history.component'; +import { HistoryListComponent } from './component/history-list.component'; @NgModule({ declarations: [ @@ -31,7 +34,9 @@ import { MetadataHeaderComponent } from './component/metadata-header.component'; ObjectPropertyComponent, ArrayPropertyComponent, ConfigurationComponent, - MetadataHeaderComponent + MetadataHeaderComponent, + MetadataHistoryComponent, + HistoryListComponent ], entryComponents: [], imports: [ @@ -48,7 +53,8 @@ export class MetadataConfigurationModule { return { ngModule: RootMetadataConfigurationModule, providers: [ - MetadataConfigurationService + MetadataConfigurationService, + MetadataHistoryService ] }; } @@ -58,7 +64,7 @@ export class MetadataConfigurationModule { imports: [ MetadataConfigurationModule, StoreModule.forFeature('metadata-configuration', fromConfig.reducers), - EffectsModule.forFeature([MetadataConfigurationEffects]) + EffectsModule.forFeature([MetadataConfigurationEffects, MetadataHistoryEffects]) ], providers: [] }) diff --git a/ui/src/app/metadata/configuration/configuration.routing.ts b/ui/src/app/metadata/configuration/configuration.routing.ts index 8e7327792..d27b29872 100644 --- a/ui/src/app/metadata/configuration/configuration.routing.ts +++ b/ui/src/app/metadata/configuration/configuration.routing.ts @@ -2,6 +2,7 @@ import { Routes } from '@angular/router'; import { ConfigurationComponent } from './container/configuration.component'; import { MetadataOptionsComponent } from './container/metadata-options.component'; import { MetadataXmlComponent } from './container/metadata-xml.component'; +import { MetadataHistoryComponent } from './container/metadata-history.component'; export const ConfigurationRoutes: Routes = [ { @@ -19,6 +20,10 @@ export const ConfigurationRoutes: Routes = [ { path: 'xml', component: MetadataXmlComponent + }, + { + path: 'history', + component: MetadataHistoryComponent } ] } diff --git a/ui/src/app/metadata/configuration/configuration.values.ts b/ui/src/app/metadata/configuration/configuration.values.ts new file mode 100644 index 000000000..c7f696eae --- /dev/null +++ b/ui/src/app/metadata/configuration/configuration.values.ts @@ -0,0 +1,10 @@ +import { MetadataSourceEditor } from '../domain/model/wizards/metadata-source-editor'; + +export enum PATHS { + resolver = 'EntityDescriptor', + provider = 'MetadataResolvers' +} + +export const DEFINITIONS = { + resolver: MetadataSourceEditor +}; diff --git a/ui/src/app/metadata/configuration/container/configuration.component.ts b/ui/src/app/metadata/configuration/container/configuration.component.ts index d18e5ab34..2c49c0961 100644 --- a/ui/src/app/metadata/configuration/container/configuration.component.ts +++ b/ui/src/app/metadata/configuration/container/configuration.component.ts @@ -5,8 +5,10 @@ import { ActivatedRoute, Params } from '@angular/router'; import * as fromConfiguration from '../reducer'; import { MetadataConfiguration } from '../model/metadata-configuration'; -import { takeUntil, map } from 'rxjs/operators'; -import { LoadMetadataRequest, ClearConfiguration } from '../action/configuration.action'; +import { takeUntil, map, withLatestFrom, filter } from 'rxjs/operators'; +import { LoadMetadataRequest, ClearConfiguration, LoadXmlRequest } from '../action/configuration.action'; +import { LoadHistoryRequest, ClearHistory, SelectVersion } from '../action/history.action'; +import * as fromReducer from '../reducer'; @Component({ selector: 'configuration-page', @@ -25,11 +27,34 @@ export class ConfigurationComponent implements OnDestroy { takeUntil(this.ngUnsubscribe), map(params => new LoadMetadataRequest({id: params.id, type: params.type})) ).subscribe(store); + + this.routerState.params.pipe( + takeUntil(this.ngUnsubscribe), + map(params => new LoadHistoryRequest({ id: params.id, type: params.type })) + ).subscribe(store); + + this.store.select(fromReducer.getVersionCollection).pipe( + takeUntil(this.ngUnsubscribe), + withLatestFrom( + this.routerState.queryParams + ), + map(([collection, params]) => { + if (collection && collection.length) { + return params.version || collection[0].id; + } + return null; + }) + ).subscribe(version => { + if (version) { + this.store.dispatch(new SelectVersion(version)); + } + }); } ngOnDestroy() { this.ngUnsubscribe.next(); this.ngUnsubscribe.complete(); this.store.dispatch(new ClearConfiguration()); + this.store.dispatch(new ClearHistory()); } } diff --git a/ui/src/app/metadata/configuration/container/metadata-history.component.html b/ui/src/app/metadata/configuration/container/metadata-history.component.html new file mode 100644 index 000000000..225912756 --- /dev/null +++ b/ui/src/app/metadata/configuration/container/metadata-history.component.html @@ -0,0 +1,3 @@ +
+ +
diff --git a/ui/src/app/metadata/version/container/version-history.component.spec.ts b/ui/src/app/metadata/configuration/container/metadata-history.component.spec.ts similarity index 76% rename from ui/src/app/metadata/version/container/version-history.component.spec.ts rename to ui/src/app/metadata/configuration/container/metadata-history.component.spec.ts index 4398b5128..ec6ccdc7a 100644 --- a/ui/src/app/metadata/version/container/version-history.component.spec.ts +++ b/ui/src/app/metadata/configuration/container/metadata-history.component.spec.ts @@ -1,10 +1,10 @@ import { Component, ViewChild, Input, EventEmitter, Output } from '@angular/core'; import { TestBed, ComponentFixture } from '@angular/core/testing'; import { MockI18nModule } from '../../../../testing/i18n.stub'; -import { VersionHistoryComponent } from './version-history.component'; +import { MetadataHistoryComponent } from './metadata-history.component'; import { MetadataHistory } from '../model/history'; import { MetadataVersion } from '../model/version'; -import { HistoryService } from '../service/history.service'; +import { MetadataHistoryService } from '../service/history.service'; import { of } from 'rxjs'; export const TestData = { @@ -33,14 +33,14 @@ const MockHistoryService = { }; describe('Metadata Version History Component', () => { - let fixture: ComponentFixture; - let instance: VersionHistoryComponent; + let fixture: ComponentFixture; + let instance: MetadataHistoryComponent; beforeEach(() => { TestBed.configureTestingModule({ providers: [ { - provide: HistoryService, useValue: MockHistoryService + provide: MetadataHistoryService, useValue: MockHistoryService } ], imports: [ @@ -48,11 +48,11 @@ describe('Metadata Version History Component', () => { ], declarations: [ MockHistoryListComponent, - VersionHistoryComponent + MetadataHistoryComponent ], }); - fixture = TestBed.createComponent(VersionHistoryComponent); + fixture = TestBed.createComponent(MetadataHistoryComponent); instance = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/ui/src/app/metadata/configuration/container/metadata-history.component.ts b/ui/src/app/metadata/configuration/container/metadata-history.component.ts new file mode 100644 index 000000000..6fb60bdb9 --- /dev/null +++ b/ui/src/app/metadata/configuration/container/metadata-history.component.ts @@ -0,0 +1,22 @@ +import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { Observable } from 'rxjs'; +import { Store } from '@ngrx/store'; +import { ConfigurationState, getVersionCollection } from '../reducer'; +import { MetadataVersion } from '../model/version'; + +@Component({ + selector: 'metadata-history', + changeDetection: ChangeDetectionStrategy.OnPush, + templateUrl: './metadata-history.component.html', + styleUrls: [] +}) +export class MetadataHistoryComponent { + + history$: Observable; + + constructor( + private store: Store + ) { + this.history$ = this.store.select(getVersionCollection); + } +} diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.html b/ui/src/app/metadata/configuration/container/metadata-options.component.html index 6ee47d4e8..e5e9475b0 100644 --- a/ui/src/app/metadata/configuration/container/metadata-options.component.html +++ b/ui/src/app/metadata/configuration/container/metadata-options.component.html @@ -1,10 +1,17 @@
- +
- + + + Version History +
- - + Options + XML
diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.ts b/ui/src/app/metadata/configuration/container/metadata-options.component.ts index 13b27c1d2..83d176a6f 100644 --- a/ui/src/app/metadata/configuration/container/metadata-options.component.ts +++ b/ui/src/app/metadata/configuration/container/metadata-options.component.ts @@ -2,9 +2,17 @@ import { Store } from '@ngrx/store'; import { Component, ChangeDetectionStrategy } from '@angular/core'; import { Observable } from 'rxjs'; -import * as fromConfiguration from '../reducer'; +import { + ConfigurationState, + getConfigurationSections, + getConfigurationModel, + getSelectedVersion, + getSelectedVersionNumber, + getSelectedIsCurrent +} from '../reducer'; import { MetadataConfiguration } from '../model/metadata-configuration'; import { Metadata } from '../../domain/domain.type'; +import { MetadataVersion } from '../model/version'; @Component({ selector: 'metadata-options-page', @@ -16,11 +24,18 @@ export class MetadataOptionsComponent { configuration$: Observable; model$: Observable; + version$: Observable; + versionNumber$: Observable; + isCurrent$: Observable; constructor( - private store: Store + private store: Store ) { - this.configuration$ = this.store.select(fromConfiguration.getConfigurationSections); - this.model$ = this.store.select(fromConfiguration.getConfigurationModel); + this.configuration$ = this.store.select(getConfigurationSections); + this.model$ = this.store.select(getConfigurationModel); + + this.version$ = this.store.select(getSelectedVersion); + this.versionNumber$ = this.store.select(getSelectedVersionNumber); + this.isCurrent$ = this.store.select(getSelectedIsCurrent); } } diff --git a/ui/src/app/metadata/configuration/container/metadata-xml.component.html b/ui/src/app/metadata/configuration/container/metadata-xml.component.html index 57560ea78..613dc7699 100644 --- a/ui/src/app/metadata/configuration/container/metadata-xml.component.html +++ b/ui/src/app/metadata/configuration/container/metadata-xml.component.html @@ -1,7 +1,15 @@
- 
{{ xml$ | async }}
- +
+
+ Options + XML +
+
+
+ 
{{ xml$ | async }}
+ +
\ No newline at end of file diff --git a/ui/src/app/metadata/configuration/container/metadata-xml.component.ts b/ui/src/app/metadata/configuration/container/metadata-xml.component.ts index 26b62323e..1a56906a0 100644 --- a/ui/src/app/metadata/configuration/container/metadata-xml.component.ts +++ b/ui/src/app/metadata/configuration/container/metadata-xml.component.ts @@ -13,8 +13,6 @@ import { DownloadXml } from '../action/configuration.action'; }) export class MetadataXmlComponent { - private ngUnsubscribe: Subject = new Subject(); - entity: Metadata; entity$: Observable; xml: string; diff --git a/ui/src/app/metadata/configuration/effect/history.effect.ts b/ui/src/app/metadata/configuration/effect/history.effect.ts new file mode 100644 index 000000000..0bda812ec --- /dev/null +++ b/ui/src/app/metadata/configuration/effect/history.effect.ts @@ -0,0 +1,34 @@ +import { Injectable } from '@angular/core'; +import { Effect, Actions, ofType } from '@ngrx/effects'; +import { switchMap, catchError, map } from 'rxjs/operators'; +import { of } from 'rxjs'; +import { LoadHistoryRequest, HistoryActionTypes, LoadHistorySuccess, LoadHistoryError, SetHistory } from '../action/history.action'; +import { MetadataHistoryService } from '../service/history.service'; + +@Injectable() +export class MetadataHistoryEffects { + + @Effect() + loadHistory$ = this.actions$.pipe( + ofType(HistoryActionTypes.LOAD_HISTORY_REQUEST), + switchMap(action => + this.historyService + .query(action.payload.id, action.payload.type) + .pipe( + map(history => new LoadHistorySuccess(history)), + catchError(error => of(new LoadHistoryError(error))) + ) + ) + ); + + @Effect() + loadHistorySuccess$ = this.actions$.pipe( + ofType(HistoryActionTypes.LOAD_HISTORY_SUCCESS), + map(action => new SetHistory(action.payload)) + ); + + constructor( + private historyService: MetadataHistoryService, + private actions$: Actions + ) { } +} diff --git a/ui/src/app/metadata/version/model/history.ts b/ui/src/app/metadata/configuration/model/history.ts similarity index 100% rename from ui/src/app/metadata/version/model/history.ts rename to ui/src/app/metadata/configuration/model/history.ts diff --git a/ui/src/app/metadata/configuration/model/version.ts b/ui/src/app/metadata/configuration/model/version.ts new file mode 100644 index 000000000..0eb7cb815 --- /dev/null +++ b/ui/src/app/metadata/configuration/model/version.ts @@ -0,0 +1,5 @@ +export interface MetadataVersion { + id: string; + date: string; + creator: string; +} diff --git a/ui/src/app/metadata/configuration/reducer/history.reducer.spec.ts b/ui/src/app/metadata/configuration/reducer/history.reducer.spec.ts new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/app/metadata/configuration/reducer/history.reducer.ts b/ui/src/app/metadata/configuration/reducer/history.reducer.ts new file mode 100644 index 000000000..244a55f1c --- /dev/null +++ b/ui/src/app/metadata/configuration/reducer/history.reducer.ts @@ -0,0 +1,52 @@ +import { EntityState, EntityAdapter, createEntityAdapter } from '@ngrx/entity'; +import { HistoryActionTypes, HistoryActionsUnion } from '../action/history.action'; +import { MetadataVersion } from '../model/version'; + +export interface HistoryState extends EntityState { + selectedVersionId: string; + versions: MetadataVersion[]; +} + +export function sortByDate(a: MetadataVersion, b: MetadataVersion): number { + return a.date.localeCompare(b.date); +} + +export const adapter: EntityAdapter = createEntityAdapter({ + sortComparer: sortByDate, + selectId: (model: MetadataVersion) => model.id +}); + +export const initialState: HistoryState = adapter.getInitialState({ + selectedVersionId: null, + versions: [] +}); + +export function reducer(state = initialState, action: HistoryActionsUnion): HistoryState { + switch (action.type) { + case HistoryActionTypes.SET_HISTORY: + return adapter.addAll(action.payload.versions, { + ...state, + selectedVersionId: state.selectedVersionId + }); + case HistoryActionTypes.SELECT_VERSION: + return { + ...state, + selectedVersionId: action.payload + }; + case HistoryActionTypes.CLEAR_HISTORY: + return adapter.removeAll({ + ...initialState + }); + default: { + return state; + } + } +} + +export const getSelectedVersionId = (state: HistoryState) => state.selectedVersionId; +export const { + selectIds: selectVersionIds, + selectEntities: selectVersionEntities, + selectAll: selectAllVersions, + selectTotal: selectVersionTotal +} = adapter.getSelectors(); diff --git a/ui/src/app/metadata/configuration/reducer/index.ts b/ui/src/app/metadata/configuration/reducer/index.ts index d4c2fcc9c..702e731f4 100644 --- a/ui/src/app/metadata/configuration/reducer/index.ts +++ b/ui/src/app/metadata/configuration/reducer/index.ts @@ -1,19 +1,22 @@ import { createSelector, createFeatureSelector } from '@ngrx/store'; -import merge from 'deepmerge'; import * as fromRoot from '../../../app.reducer'; import * as fromConfiguration from './configuration.reducer'; +import * as fromHistory from './history.reducer'; import { WizardStep } from '../../../wizard/model'; import * as utils from '../../domain/utility/configuration'; import { getSplitSchema } from '../../../wizard/reducer'; +import { getInCollectionFn } from '../../domain/domain.util'; export interface ConfigurationState { configuration: fromConfiguration.State; + history: fromHistory.HistoryState; } export const reducers = { - configuration: fromConfiguration.reducer + configuration: fromConfiguration.reducer, + history: fromHistory.reducer }; export interface State extends fromRoot.State { @@ -23,6 +26,7 @@ export interface State extends fromRoot.State { export const getState = createFeatureSelector('metadata-configuration'); export const getConfigurationStateFn = (state: ConfigurationState) => state.configuration; +export const getHistoryStateFn = (state: ConfigurationState) => state.history; export const getConfigurationState = createSelector(getState, getConfigurationStateFn); export const getConfigurationModel = createSelector(getConfigurationState, fromConfiguration.getModel); @@ -56,3 +60,26 @@ export const getConfigurationSections = createSelector( getConfigurationSchema, getConfigurationSectionsFn ); + +// Version History + +export const getHistoryState = createSelector(getState, getHistoryStateFn); + +export const getVersionEntities = createSelector(getHistoryState, fromHistory.selectVersionEntities); +export const getSelectedVersionId = createSelector(getHistoryState, fromHistory.getSelectedVersionId); +export const getVersionIds = createSelector(getHistoryState, fromHistory.selectVersionIds); +export const getVersionCollection = createSelector(getHistoryState, getVersionIds, fromHistory.selectAllVersions); +export const getSelectedVersion = createSelector(getVersionEntities, getSelectedVersionId, getInCollectionFn); +export const getSelectedVersionNumber = createSelector( + getVersionCollection, + getSelectedVersionId, + (versions, selectedId) => versions.indexOf(versions.find(v => v.id === selectedId)) + 1 +); + +export const getSelectedIsCurrent = createSelector( + getSelectedVersion, + getVersionCollection, + (selected, collection) => { + return selected ? collection[0].id === selected.id : null; + } +); diff --git a/ui/src/app/metadata/configuration/service/configuration.service.ts b/ui/src/app/metadata/configuration/service/configuration.service.ts index 2f0420c49..ee0093b36 100644 --- a/ui/src/app/metadata/configuration/service/configuration.service.ts +++ b/ui/src/app/metadata/configuration/service/configuration.service.ts @@ -6,15 +6,7 @@ import { Wizard } from '../../../wizard/model'; import { MetadataSourceEditor } from '../../domain/model/wizards/metadata-source-editor'; import { MetadataProviderEditorTypes } from '../../provider/model'; import { Schema } from '../model/schema'; - -export enum PATHS { - resolver = 'EntityDescriptor', - provider = 'MetadataResolvers' -} - -export const DEFINITIONS = { - resolver: MetadataSourceEditor -}; +import { PATHS } from '../configuration.values'; @Injectable() export class MetadataConfigurationService { diff --git a/ui/src/app/metadata/version/service/history.service.spec.ts b/ui/src/app/metadata/configuration/service/history.service.spec.ts similarity index 65% rename from ui/src/app/metadata/version/service/history.service.spec.ts rename to ui/src/app/metadata/configuration/service/history.service.spec.ts index 71e6ec960..0e8bc77a4 100644 --- a/ui/src/app/metadata/version/service/history.service.spec.ts +++ b/ui/src/app/metadata/configuration/service/history.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed, async, inject } from '@angular/core/testing'; import { HttpClientModule } from '@angular/common/http'; import { HttpTestingController, HttpClientTestingModule } from '@angular/common/http/testing'; -import { HistoryService } from './history.service'; +import { MetadataHistoryService } from './history.service'; describe(`Attributes Service`, () => { beforeEach(() => { @@ -11,15 +11,15 @@ describe(`Attributes Service`, () => { HttpClientTestingModule ], providers: [ - HistoryService + MetadataHistoryService ] }); }); describe('query method', () => { - it(`should return a MetadataHistory`, async(inject([HistoryService, HttpTestingController], - (service: HistoryService) => { - service.query().subscribe(history => { + it(`should return a MetadataHistory`, async(inject([MetadataHistoryService, HttpTestingController], + (service: MetadataHistoryService) => { + service.query('foo', 'resolver').subscribe(history => { expect(history).toBeDefined(); }); } diff --git a/ui/src/app/metadata/configuration/service/history.service.ts b/ui/src/app/metadata/configuration/service/history.service.ts new file mode 100644 index 000000000..3125c2091 --- /dev/null +++ b/ui/src/app/metadata/configuration/service/history.service.ts @@ -0,0 +1,27 @@ +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { Observable, of } from 'rxjs'; +import { MetadataHistory } from '../model/history'; + +import { PATHS } from '../../configuration/configuration.values'; +import { MetadataVersion } from '../model/version'; +import { map } from 'rxjs/operators'; + +@Injectable() +export class MetadataHistoryService { + + readonly base = `api`; + readonly path = `Versions`; + + constructor( + private http: HttpClient + ) { } + + query(resourceId: string, type: string): Observable { + return this.http.get(`/${this.base}/${PATHS[type]}/${resourceId}/${this.path}`).pipe( + map(resp => ({ + versions: resp + })) + ); + } +} diff --git a/ui/src/app/metadata/metadata.module.ts b/ui/src/app/metadata/metadata.module.ts index 231f39f5f..3712ba969 100644 --- a/ui/src/app/metadata/metadata.module.ts +++ b/ui/src/app/metadata/metadata.module.ts @@ -11,7 +11,6 @@ import { I18nModule } from '../i18n/i18n.module'; import { CustomWidgetRegistry } from '../schema-form/registry'; import { WidgetRegistry, SchemaValidatorFactory } from 'ngx-schema-form'; import { CustomSchemaValidatorFactory } from '../schema-form/service/schema-validator'; -import { MetadataVersionModule } from './version/version.module'; import { MetadataConfigurationModule } from './configuration/configuration.module'; @NgModule({ @@ -21,7 +20,6 @@ import { MetadataConfigurationModule } from './configuration/configuration.modul DomainModule.forRoot(), ManagerModule.forRoot(), ProviderModule.forRoot(), - MetadataVersionModule.forRoot(), MetadataConfigurationModule.forRoot(), MetadataRoutingModule, I18nModule diff --git a/ui/src/app/metadata/metadata.routing.ts b/ui/src/app/metadata/metadata.routing.ts index 35902415c..a2ef97557 100644 --- a/ui/src/app/metadata/metadata.routing.ts +++ b/ui/src/app/metadata/metadata.routing.ts @@ -5,7 +5,6 @@ import { MetadataPageComponent } from './metadata.component'; import { ResolverRoutes } from './resolver/resolver.routing'; import { ProviderRoutes } from './provider/provider.routing'; import { ManagerRoutes } from './manager/manager.routing'; -import { VersionRoutes } from './version/version.routing'; import { ConfigurationRoutes } from './configuration/configuration.routing'; const routes: Routes = [ @@ -16,7 +15,6 @@ const routes: Routes = [ ...ManagerRoutes, ...ResolverRoutes, ...ProviderRoutes, - ...VersionRoutes, ...ConfigurationRoutes ], }, diff --git a/ui/src/app/metadata/resolver/container/resolver-edit.component.ts b/ui/src/app/metadata/resolver/container/resolver-edit.component.ts index f793ef96e..775c956d3 100644 --- a/ui/src/app/metadata/resolver/container/resolver-edit.component.ts +++ b/ui/src/app/metadata/resolver/container/resolver-edit.component.ts @@ -81,7 +81,7 @@ export class ResolverEditComponent implements OnDestroy, CanComponentDeactivate cancel(): void { this.clear(); - this.router.navigate(['dashboard', 'metadata', 'manager', 'resolvers']); + this.router.navigate(['metadata', 'resolver', this.resolver.id, 'configuration']); } canDeactivate( diff --git a/ui/src/app/metadata/resolver/effect/collection.effects.ts b/ui/src/app/metadata/resolver/effect/collection.effects.ts index f3b4a4ac8..e5f1edd94 100644 --- a/ui/src/app/metadata/resolver/effect/collection.effects.ts +++ b/ui/src/app/metadata/resolver/effect/collection.effects.ts @@ -84,7 +84,7 @@ export class ResolverCollectionEffects { updateResolverSuccessRedirect$ = this.actions$.pipe( ofType(ResolverCollectionActionTypes.UPDATE_RESOLVER_SUCCESS), map(action => action.payload), - tap(provider => this.router.navigate(['dashboard'])) + tap(provider => this.router.navigate(['metadata', 'resolver', provider.id, 'configuration'])) ); @Effect() diff --git a/ui/src/app/metadata/version/container/version-history.component.html b/ui/src/app/metadata/version/container/version-history.component.html deleted file mode 100644 index 099841308..000000000 --- a/ui/src/app/metadata/version/container/version-history.component.html +++ /dev/null @@ -1,18 +0,0 @@ -
-
-
-
-
- - - Metadata resolver history - -
-
-
-
- -
-
-
diff --git a/ui/src/app/metadata/version/container/version-history.component.ts b/ui/src/app/metadata/version/container/version-history.component.ts deleted file mode 100644 index dc26aa1fa..000000000 --- a/ui/src/app/metadata/version/container/version-history.component.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { Component, ChangeDetectionStrategy } from '@angular/core'; -import { MetadataHistory } from '../model/history'; -import { HistoryService } from '../service/history.service'; -import { Observable } from 'rxjs'; - -@Component({ - selector: 'version-history', - changeDetection: ChangeDetectionStrategy.OnPush, - templateUrl: './version-history.component.html', - styleUrls: [] -}) -export class VersionHistoryComponent { - - history$: Observable; - - constructor( - private historyService: HistoryService - ) { - this.history$ = this.historyService.query(); - } -} diff --git a/ui/src/app/metadata/version/model/version.ts b/ui/src/app/metadata/version/model/version.ts deleted file mode 100644 index 85d1c9c7d..000000000 --- a/ui/src/app/metadata/version/model/version.ts +++ /dev/null @@ -1,6 +0,0 @@ -export interface MetadataVersion { - versionNumber: Number; - saveDate: Date; - changedBy: String; - actions: string[]; -} diff --git a/ui/src/app/metadata/version/service/history.service.ts b/ui/src/app/metadata/version/service/history.service.ts deleted file mode 100644 index acf22b2ff..000000000 --- a/ui/src/app/metadata/version/service/history.service.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { Injectable } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import { Observable, of } from 'rxjs'; -import { MetadataHistory } from '../model/history'; - - -@Injectable() -export class HistoryService { - - readonly base = '/api'; - - constructor( - private http: HttpClient - ) { } - - query(): Observable { - return of({ - versions: [ - { - versionNumber: 1, - saveDate: new Date(), - changedBy: 'admin', - actions: [] - }, - { - versionNumber: 2, - saveDate: new Date(), - changedBy: 'admin', - actions: ['restore'] - } - ] - }); - } -} diff --git a/ui/src/app/metadata/version/version.module.ts b/ui/src/app/metadata/version/version.module.ts deleted file mode 100644 index 2e3d36fb5..000000000 --- a/ui/src/app/metadata/version/version.module.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; -import { StoreModule } from '@ngrx/store'; -import { EffectsModule } from '@ngrx/effects'; -import { HistoryListComponent } from './component/history-list.component'; -import { CommonModule } from '@angular/common'; -import { VersionHistoryComponent } from './container/version-history.component'; -import { HistoryService } from './service/history.service'; -import { I18nModule } from '../../i18n/i18n.module'; - -@NgModule({ - declarations: [ - HistoryListComponent, - VersionHistoryComponent - ], - entryComponents: [], - imports: [ - CommonModule, - I18nModule - ], - exports: [], - providers: [] -}) -export class MetadataVersionModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: RootMetadataVersionModule, - providers: [] - }; - } -} - -@NgModule({ - imports: [ - MetadataVersionModule, - // StoreModule.forFeature('resolver', fromResolver.reducers), - // EffectsModule.forFeature([]) - ], - providers: [ - HistoryService - ] -}) -export class RootMetadataVersionModule { } diff --git a/ui/src/app/metadata/version/version.routing.ts b/ui/src/app/metadata/version/version.routing.ts deleted file mode 100644 index dfb76468d..000000000 --- a/ui/src/app/metadata/version/version.routing.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Routes } from '@angular/router'; -import { VersionHistoryComponent } from './container/version-history.component'; - -export const VersionRoutes: Routes = [ - { - path: ':type/:id/versions', - component: VersionHistoryComponent - } -]; From a46c7537389ff7a26356680cd086625fd66da03c Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Fri, 21 Jun 2019 07:49:54 -0700 Subject: [PATCH 083/112] SHIBUI-1268 Implemented tests for metadata header --- .../component/history-list.component.html | 4 +- .../component/history-list.component.spec.ts | 25 +++---- .../metadata-header.component.spec.ts | 58 +++++++++++++++ .../component/metadata-header.component.ts | 6 +- .../metadata-history.component.spec.ts | 7 +- .../container/metadata-options.component.html | 2 +- .../metadata-options.component.spec.ts | 20 +++++- .../container/metadata-options.component.ts | 9 +-- .../reducer/history.reducer.spec.ts | 70 +++++++++++++++++++ .../configuration/reducer/history.reducer.ts | 4 +- .../service/configuration.service.spec.ts | 3 +- 11 files changed, 177 insertions(+), 31 deletions(-) diff --git a/ui/src/app/metadata/configuration/component/history-list.component.html b/ui/src/app/metadata/configuration/component/history-list.component.html index b22da0fc3..2983c151c 100644 --- a/ui/src/app/metadata/configuration/component/history-list.component.html +++ b/ui/src/app/metadata/configuration/component/history-list.component.html @@ -26,7 +26,7 @@ {{ version.date | date }} {{ version.creator }} - @@ -34,6 +34,6 @@ - \ No newline at end of file diff --git a/ui/src/app/metadata/configuration/component/history-list.component.spec.ts b/ui/src/app/metadata/configuration/component/history-list.component.spec.ts index 4cb6770eb..43d49a29f 100644 --- a/ui/src/app/metadata/configuration/component/history-list.component.spec.ts +++ b/ui/src/app/metadata/configuration/component/history-list.component.spec.ts @@ -8,16 +8,15 @@ import { MetadataVersion } from '../model/version'; export const TestData = { versions: [ { - versionNumber: 1, - saveDate: new Date(), - changedBy: 'admin', - actions: [] + id: 'foo', + date: new Date().toDateString(), + creator: 'admin' } ] }; @Component({ - template: `` + template: `` }) class TestHostComponent { @ViewChild(HistoryListComponent) @@ -32,7 +31,7 @@ class TestHostComponent { describe('Metadata History List Component', () => { let fixture: ComponentFixture; let instance: TestHostComponent; - let table: HistoryListComponent; + let list: HistoryListComponent; beforeEach(() => { TestBed.configureTestingModule({ @@ -48,32 +47,34 @@ describe('Metadata History List Component', () => { fixture = TestBed.createComponent(TestHostComponent); instance = fixture.componentInstance; - table = instance.componentUnderTest; + list = instance.componentUnderTest; fixture.detectChanges(); }); it('should compile', () => { - expect(table).toBeDefined(); + expect(list).toBeDefined(); }); describe('compare selected', () => { it('should allow the user to toggle selected versions for comparison', () => { - table.toggleVersionSelected(TestData.versions[0]); - expect(table.selected.length).toBe(1); + list.toggleVersionSelected(TestData.versions[0]); + expect(list.selected.length).toBe(1); }); it('should emit an event with the selected values when the Compare Selected button is clicked', () => { spyOn(instance, 'compare'); const selected = TestData.versions; - table.compareSelected(selected); + list.compareSelected(selected); fixture.detectChanges(); expect(instance.compare).toHaveBeenCalledWith(selected); }); + }); + describe('restore', () => { it('should emit an event with the selected version when the Restore button is clicked', () => { spyOn(instance, 'restore'); const selected = TestData.versions[0]; - table.restoreVersion(selected); + list.restoreVersion(selected); fixture.detectChanges(); expect(instance.restore).toHaveBeenCalledWith(selected); }); diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.spec.ts b/ui/src/app/metadata/configuration/component/metadata-header.component.spec.ts index e69de29bb..e8db42c36 100644 --- a/ui/src/app/metadata/configuration/component/metadata-header.component.spec.ts +++ b/ui/src/app/metadata/configuration/component/metadata-header.component.spec.ts @@ -0,0 +1,58 @@ +import { Component, ViewChild } from '@angular/core'; +import { TestBed, async, ComponentFixture } from '@angular/core/testing'; +import { MockI18nModule } from '../../../../testing/i18n.stub'; +import { MetadataVersion } from '../model/version'; +import { MetadataHeaderComponent } from './metadata-header.component'; + +@Component({ + template: ` + + ` +}) +class TestHostComponent { + @ViewChild(MetadataHeaderComponent) + public componentUnderTest: MetadataHeaderComponent; + + isEnabled = true; + + version: MetadataVersion = { + id: 'foo', + creator: 'foobar', + date: new Date().toDateString() + }; + versionNumber = 1; + isCurrent = false; +} + +describe('Metadata Header Component', () => { + + let fixture: ComponentFixture; + let instance: TestHostComponent; + let app: MetadataHeaderComponent; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MockI18nModule + ], + declarations: [ + MetadataHeaderComponent, + TestHostComponent + ] + }).compileComponents(); + + fixture = TestBed.createComponent(TestHostComponent); + instance = fixture.componentInstance; + app = instance.componentUnderTest; + fixture.detectChanges(); + })); + + it('should accept a property input', async(() => { + expect(app).toBeTruthy(); + })); +}); diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.ts b/ui/src/app/metadata/configuration/component/metadata-header.component.ts index da4bd643a..8d0dcc3db 100644 --- a/ui/src/app/metadata/configuration/component/metadata-header.component.ts +++ b/ui/src/app/metadata/configuration/component/metadata-header.component.ts @@ -9,15 +9,11 @@ import { MetadataVersion } from '../model/version'; }) export class MetadataHeaderComponent { - @Input() metadata: Metadata; + @Input() isEnabled: boolean; @Input() version: MetadataVersion; @Input() versionNumber: number; @Input() isCurrent: boolean; constructor() {} - - get isEnabled(): boolean { - return this.metadata ? ('serviceEnabled' in this.metadata) ? this.metadata.serviceEnabled : this.metadata.enabled : false; - } } diff --git a/ui/src/app/metadata/configuration/container/metadata-history.component.spec.ts b/ui/src/app/metadata/configuration/container/metadata-history.component.spec.ts index ec6ccdc7a..084d79ef0 100644 --- a/ui/src/app/metadata/configuration/container/metadata-history.component.spec.ts +++ b/ui/src/app/metadata/configuration/container/metadata-history.component.spec.ts @@ -6,6 +6,8 @@ import { MetadataHistory } from '../model/history'; import { MetadataVersion } from '../model/version'; import { MetadataHistoryService } from '../service/history.service'; import { of } from 'rxjs'; +import { StoreModule, combineReducers } from '@ngrx/store'; +import * as fromConfiguration from '../reducer'; export const TestData = { versions: [ @@ -44,7 +46,10 @@ describe('Metadata Version History Component', () => { } ], imports: [ - MockI18nModule + MockI18nModule, + StoreModule.forRoot({ + 'metadata-configuration': combineReducers(fromConfiguration.reducers), + }), ], declarations: [ MockHistoryListComponent, diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.html b/ui/src/app/metadata/configuration/container/metadata-options.component.html index e5e9475b0..358d16921 100644 --- a/ui/src/app/metadata/configuration/container/metadata-options.component.html +++ b/ui/src/app/metadata/configuration/container/metadata-options.component.html @@ -1,6 +1,6 @@
diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts b/ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts index 2e35d8c75..0cb1bd5b0 100644 --- a/ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts +++ b/ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts @@ -8,6 +8,9 @@ import { MetadataConfiguration } from '../model/metadata-configuration'; import * as fromConfiguration from '../reducer'; import { MockI18nModule } from '../../../../testing/i18n.stub'; import { MetadataOptionsComponent } from './metadata-options.component'; +import { Metadata } from '../../domain/domain.type'; +import { MetadataVersion } from '../model/version'; +import { CommonModule } from '@angular/common'; @Component({ selector: 'metadata-configuration', @@ -17,6 +20,17 @@ class MetadataConfigurationComponent { @Input() configuration: MetadataConfiguration; } +@Component({ + selector: 'metadata-header', + template: `` +}) +class MetadataHeaderComponent { + @Input() isEnabled: boolean; + @Input() version: MetadataVersion; + @Input() versionNumber: number; + @Input() isCurrent: boolean; +} + @Component({ template: ` @@ -44,18 +58,20 @@ describe('Metadata Options Page Component', () => { 'metadata-configuration': combineReducers(fromConfiguration.reducers), }), MockI18nModule, - RouterTestingModule + RouterTestingModule, + CommonModule ], declarations: [ MetadataOptionsComponent, MetadataConfigurationComponent, + MetadataHeaderComponent, TestHostComponent ], }).compileComponents(); store = TestBed.get(Store); spyOn(store, 'dispatch'); - spyOn(store, 'select'); + spyOn(store, 'select').and.callThrough(); fixture = TestBed.createComponent(TestHostComponent); instance = fixture.componentInstance; diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.ts b/ui/src/app/metadata/configuration/container/metadata-options.component.ts index 83d176a6f..461252f1d 100644 --- a/ui/src/app/metadata/configuration/container/metadata-options.component.ts +++ b/ui/src/app/metadata/configuration/container/metadata-options.component.ts @@ -11,8 +11,8 @@ import { getSelectedIsCurrent } from '../reducer'; import { MetadataConfiguration } from '../model/metadata-configuration'; -import { Metadata } from '../../domain/domain.type'; import { MetadataVersion } from '../model/version'; +import { map } from 'rxjs/operators'; @Component({ selector: 'metadata-options-page', @@ -23,7 +23,7 @@ import { MetadataVersion } from '../model/version'; export class MetadataOptionsComponent { configuration$: Observable; - model$: Observable; + isEnabled$: Observable; version$: Observable; versionNumber$: Observable; isCurrent$: Observable; @@ -32,8 +32,9 @@ export class MetadataOptionsComponent { private store: Store ) { this.configuration$ = this.store.select(getConfigurationSections); - this.model$ = this.store.select(getConfigurationModel); - + this.isEnabled$ = this.store.select(getConfigurationModel).pipe( + map(config => config ? ('serviceEnabled' in config) ? config.serviceEnabled : config.enabled : false) + ); this.version$ = this.store.select(getSelectedVersion); this.versionNumber$ = this.store.select(getSelectedVersionNumber); this.isCurrent$ = this.store.select(getSelectedIsCurrent); diff --git a/ui/src/app/metadata/configuration/reducer/history.reducer.spec.ts b/ui/src/app/metadata/configuration/reducer/history.reducer.spec.ts index e69de29bb..a3bc830e5 100644 --- a/ui/src/app/metadata/configuration/reducer/history.reducer.spec.ts +++ b/ui/src/app/metadata/configuration/reducer/history.reducer.spec.ts @@ -0,0 +1,70 @@ +import { reducer } from './history.reducer'; +import * as fromHistory from './history.reducer'; +import * as actions from '../action/history.action'; +import { MetadataHistory } from '../model/history'; + +describe('History Reducer', () => { + + const baseState = fromHistory.initialState; + + const history: MetadataHistory = { + versions: [ + { + id: '1', + date: new Date().toLocaleDateString(), + creator: 'foo' + }, + { + id: '2', + date: new Date().toDateString(), + creator: 'foo' + } + ] + }; + + describe('undefined action', () => { + it('should return the default state', () => { + const result = reducer(undefined, {} as any); + + expect(result).toEqual(fromHistory.initialState); + }); + }); + + describe('SET_HISTORY action', () => { + it('should set the state metadata model', () => { + const action = new actions.SetHistory(history); + const result = reducer(fromHistory.initialState, action); + + expect(Object.keys(result.entities)).toEqual(['1', '2']); + }); + }); + + describe('SELECT_VERSION action', () => { + it('should set the state metadata model', () => { + const action = new actions.SelectVersion('1'); + const result = reducer(baseState, action); + + expect(result).toEqual({ ...baseState, selectedVersionId: '1' }); + }); + }); + + describe('CLEAR action', () => { + it('should clear the state and reset to initial state', () => { + const action = new actions.ClearHistory(); + const result = reducer({ + ...baseState, + ...history + }, action); + + expect(result).toEqual(baseState); + }); + }); + + describe('selector functions', () => { + describe('getSelectedId', () => { + it('should return the selected version id', () => { + expect(fromHistory.getSelectedVersionId({ ...baseState, selectedVersionId: '1' })).toBe('1'); + }); + }); + }); +}); diff --git a/ui/src/app/metadata/configuration/reducer/history.reducer.ts b/ui/src/app/metadata/configuration/reducer/history.reducer.ts index 244a55f1c..8a2566f59 100644 --- a/ui/src/app/metadata/configuration/reducer/history.reducer.ts +++ b/ui/src/app/metadata/configuration/reducer/history.reducer.ts @@ -4,7 +4,6 @@ import { MetadataVersion } from '../model/version'; export interface HistoryState extends EntityState { selectedVersionId: string; - versions: MetadataVersion[]; } export function sortByDate(a: MetadataVersion, b: MetadataVersion): number { @@ -17,8 +16,7 @@ export const adapter: EntityAdapter = createEntityAdapter { beforeEach(() => { From 230b3fbdb3dee27c3b5709fe938b8e07e7213b41 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Fri, 21 Jun 2019 08:19:00 -0700 Subject: [PATCH 084/112] SHIBUI-1281 Fixed tests --- .../reducer/configuration.reducer.spec.ts | 3 ++- ...dashboard-resolvers-list.component.spec.ts | 24 ++++--------------- .../reducer/collection.reducer.spec.ts | 2 ++ .../resolver-wizard-step.component.spec.ts | 3 ++- .../resolver-wizard.component.spec.ts | 5 ++-- 5 files changed, 14 insertions(+), 23 deletions(-) diff --git a/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts b/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts index fed39ff3f..4be8661e0 100644 --- a/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts +++ b/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts @@ -12,7 +12,8 @@ describe('Configuration Reducer', () => { const model: MetadataResolver = { id: 'foo', serviceProviderName: 'foo', - '@type': 'MetadataResolver' + '@type': 'MetadataResolver', + createdBy: 'admin' }; const xml = ``; diff --git a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts index 298ac23ef..19afd6f2c 100644 --- a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts +++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts @@ -1,6 +1,6 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; -import { Router } from '@angular/router'; +import { Router, RouterModule } from '@angular/router'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { StoreModule, Store, combineReducers } from '@ngrx/store'; import { NgbPaginationModule, NgbModal, NgbModalModule, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; @@ -13,6 +13,7 @@ import { FileBackedHttpMetadataResolver } from '../../domain/entity'; import { DashboardResolversListComponent } from './dashboard-resolvers-list.component'; import { MockI18nModule } from '../../../../testing/i18n.stub'; import { CustomDatePipe } from '../../../shared/pipe/date.pipe'; +import { InfiniteScrollModule } from 'ngx-infinite-scroll'; describe('Dashboard Resolvers List Page', () => { @@ -48,7 +49,9 @@ describe('Dashboard Resolvers List Page', () => { ReactiveFormsModule, NgbPaginationModule, NgbModalModule, - MockI18nModule + MockI18nModule, + InfiniteScrollModule, + RouterModule ], declarations: [ DashboardResolversListComponent, @@ -73,23 +76,6 @@ describe('Dashboard Resolvers List Page', () => { expect(fixture).toBeDefined(); }); - xdescribe('getPagedResolvers method', () => {}); - - describe('changePage method', () => { - it('should update the page value', () => { - let page = 2; - instance.changePage(page); - expect(instance.page).toBe(page); - }); - - it('should update the paged resolvers list', () => { - let page = 2; - spyOn(instance, 'getPagedResolvers'); - instance.changePage(page); - expect(instance.getPagedResolvers).toHaveBeenCalled(); - }); - }); - describe('toggleResolver method', () => { it('should fire a redux action', () => { instance.toggleEntity(draft); diff --git a/ui/src/app/metadata/provider/reducer/collection.reducer.spec.ts b/ui/src/app/metadata/provider/reducer/collection.reducer.spec.ts index 5feb8ed5b..75dbac2c2 100644 --- a/ui/src/app/metadata/provider/reducer/collection.reducer.spec.ts +++ b/ui/src/app/metadata/provider/reducer/collection.reducer.spec.ts @@ -24,6 +24,7 @@ describe('Provider Collection Reducer', () => { name: 'name', '@type': 'foo', enabled: true, + createdBy: 'admin', createdDate: new Date().toLocaleDateString(), sortKey: 1, xmlId: 'foo', @@ -34,6 +35,7 @@ describe('Provider Collection Reducer', () => { name: 'bar', '@type': 'bar', enabled: false, + createdBy: 'admin', createdDate: new Date().toLocaleDateString(), sortKey: 2, xmlId: 'bar', diff --git a/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.spec.ts b/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.spec.ts index 8864220c7..56c4784a7 100644 --- a/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.spec.ts +++ b/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.spec.ts @@ -56,7 +56,8 @@ describe('Resolver Wizard Step Component', () => { ...initialState, changes: { id: 'foo', - serviceProviderName: 'bar' + serviceProviderName: 'bar', + createdBy: 'admin' } } }), diff --git a/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts b/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts index c7837309f..984a746a2 100644 --- a/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts +++ b/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts @@ -62,7 +62,8 @@ describe('Resolver Wizard Component', () => { ...initialState, changes: { id: 'foo', - serviceProviderName: 'bar' + serviceProviderName: 'bar', + createdBy: 'admin' } } }), @@ -126,7 +127,7 @@ describe('Resolver Wizard Component', () => { })); it('should open a modal', () => { - app.changes = {id: 'bar', serviceProviderName: 'foo'}; + app.changes = {id: 'bar', serviceProviderName: 'foo', createdBy: 'admin'}; spyOn(modal, 'open').and.callThrough(); app.canDeactivate(null, null, { url: 'foo' From 6fe4e4a5f2c11c3dd37ec4f122c5d92cb84b588a Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Fri, 21 Jun 2019 09:04:13 -0700 Subject: [PATCH 085/112] SHIBUI-1268 Added translations --- backend/src/main/resources/i18n/messages.properties | 7 +++++++ .../component/metadata-header.component.html | 11 ++++++++--- .../container/metadata-options.component.html | 8 ++++---- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties index 89c5cd00b..389162b05 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -48,9 +48,13 @@ action.move-down=Move Down action.edit=Edit action.add-filter=Add Filter action.manage-filters=Manage Filters +action.version-history=Version History +action.options=Options +action.xml=XML value.enabled=Enabled value.disabled=Disabled +value.current=Current value.none=None value.file=File value.memory=Memory @@ -402,6 +406,9 @@ label.current=Current label.restore=Restore label.compare-selected=Compare Selected +label.saved=Saved +label.by=by + message.delete-user-title=Delete User? message.delete-user-body=You are requesting to delete a user. If you complete this process the user will be removed. This cannot be undone. Do you wish to continue? diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.html b/ui/src/app/metadata/configuration/component/metadata-header.component.html index 8b3517f0f..19f183ba8 100644 --- a/ui/src/app/metadata/configuration/component/metadata-header.component.html +++ b/ui/src/app/metadata/configuration/component/metadata-header.component.html @@ -1,14 +1,19 @@
-

Version {{ versionNumber }}

+

+ Version {{ versionNumber }} +

- Saved {{ version.date | date }}, by {{ version.creator }} + Saved  + {{ version.date | date }}, + by  + {{ version.creator }}

Enabled   Disabled - Current + Current

\ No newline at end of file diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.html b/ui/src/app/metadata/configuration/container/metadata-options.component.html index 358d16921..9c4dbb489 100644 --- a/ui/src/app/metadata/configuration/container/metadata-options.component.html +++ b/ui/src/app/metadata/configuration/container/metadata-options.component.html @@ -6,12 +6,12 @@ [isCurrent]="isCurrent$ | async">
- - Version History +   + Version History
- Options - XML + Options + XML
From 0326701a5f59e9616e35df57855a7d6e56bc88f5 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 24 Jun 2019 09:03:26 -0400 Subject: [PATCH 086/112] 1263 wip --- ...tadataResolverEnversVersioningTests.groovy | 124 +++++++++++++++++- .../ui/domain/filters/MetadataFilter.java | 3 +- .../resolvers/FilesystemMetadataResolver.java | 2 + .../MetadataQueryProtocolScheme.java | 2 + .../ui/domain/resolvers/MetadataResolver.java | 2 + .../ui/domain/resolvers/RegexScheme.java | 2 + .../ResourceBackedMetadataResolver.java | 2 + .../ui/domain/resolvers/TemplateScheme.java | 2 + 8 files changed, 135 insertions(+), 4 deletions(-) diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy index 1cea18a62..04b5e9b62 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy @@ -4,12 +4,16 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfigurat import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ClasspathMetadataResource import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicMetadataResolverAttributes import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FilesystemMetadataResolver import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.HttpMetadataResolverAttributes import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ReloadableMetadataResolverAttributes +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ResourceBackedMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.TemplateScheme import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository import org.springframework.beans.factory.annotation.Autowired @@ -158,10 +162,17 @@ class MetadataResolverEnversVersioningTests extends Specification { def "test versioning of DynamicHttpMetadataResolver"() { setup: - def expectedModifiedPersistentEntities = [DynamicHttpMetadataResolver.name] + def expectedModifiedPersistentEntities = [DynamicHttpMetadataResolver.name, + TemplateScheme.name] when: - DynamicHttpMetadataResolver resolver = new DynamicHttpMetadataResolver(name: 'dhmr') + DynamicHttpMetadataResolver resolver = new DynamicHttpMetadataResolver(name: 'dhmr').with { + it.metadataRequestURLConstructionScheme = new TemplateScheme().with { + it.content = 'content' + it + } + it + } def resolverHistory = updateAndGetRevisionHistoryOfMetadataResolver(resolver, metadataResolverRepository, @@ -178,6 +189,7 @@ class MetadataResolverEnversVersioningTests extends Specification { when: resolver.name = 'dhmrUPDATED' + resolver.metadataRequestURLConstructionScheme.content = 'Updated content' resolverHistory = updateAndGetRevisionHistoryOfMetadataResolver(resolver, metadataResolverRepository, @@ -188,6 +200,7 @@ class MetadataResolverEnversVersioningTests extends Specification { then: resolverHistory.size() == 2 getTargetEntityForRevisionIndex(resolverHistory, 1).name == 'dhmrUPDATED' + getTargetEntityForRevisionIndex(resolverHistory, 1).metadataRequestURLConstructionScheme.content == 'Updated content' getRevisionEntityForRevisionIndex(resolverHistory, 1).principalUserName == 'anonymousUser' getRevisionEntityForRevisionIndex(resolverHistory, 1).timestamp > 0L getModifiedEntityNames(resolverHistory, 1).sort() == expectedModifiedPersistentEntities.sort() @@ -198,4 +211,111 @@ class MetadataResolverEnversVersioningTests extends Specification { getRevisionEntityForRevisionIndex(resolverHistory, 0).timestamp > 0L getModifiedEntityNames(resolverHistory, 0).sort() == expectedModifiedPersistentEntities.sort() } + + def "test versioning of FilesystemMetadataResolver"() { + setup: + def expectedModifiedPersistentEntities = [FilesystemMetadataResolver.name] + + when: + FilesystemMetadataResolver resolver = new FilesystemMetadataResolver(name: 'fmr', metadataFile: 'metadata.xml').with { + it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes(indexesRef: 'indexesRef') + it + } + + def resolverHistory = updateAndGetRevisionHistoryOfMetadataResolver(resolver, + metadataResolverRepository, + FilesystemMetadataResolver, + txMgr, + entityManager) + + then: + resolverHistory.size() == 1 + getTargetEntityForRevisionIndex(resolverHistory, 0).name == 'fmr' + getTargetEntityForRevisionIndex(resolverHistory, 0).metadataFile == 'metadata.xml' + getTargetEntityForRevisionIndex(resolverHistory, 0).reloadableMetadataResolverAttributes.indexesRef == 'indexesRef' + getRevisionEntityForRevisionIndex(resolverHistory, 0).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(resolverHistory, 0).timestamp > 0L + getModifiedEntityNames(resolverHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + resolver.name = 'fmrUPDATED' + resolver.metadataFile = 'metadataUPDATED.xml' + resolver.reloadableMetadataResolverAttributes.indexesRef = 'indexesRefUPDATED' + + resolverHistory = updateAndGetRevisionHistoryOfMetadataResolver(resolver, + metadataResolverRepository, + FilesystemMetadataResolver, + txMgr, + entityManager) + + then: + resolverHistory.size() == 2 + getTargetEntityForRevisionIndex(resolverHistory, 1).name == 'fmrUPDATED' + getTargetEntityForRevisionIndex(resolverHistory, 1).metadataFile == 'metadataUPDATED.xml' + getTargetEntityForRevisionIndex(resolverHistory, 1).reloadableMetadataResolverAttributes.indexesRef == 'indexesRefUPDATED' + getRevisionEntityForRevisionIndex(resolverHistory, 1).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(resolverHistory, 1).timestamp > 0L + getModifiedEntityNames(resolverHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the original revision is intact + getTargetEntityForRevisionIndex(resolverHistory, 0).name == 'fmr' + getTargetEntityForRevisionIndex(resolverHistory, 0).metadataFile == 'metadata.xml' + getTargetEntityForRevisionIndex(resolverHistory, 0).reloadableMetadataResolverAttributes.indexesRef == 'indexesRef' + getRevisionEntityForRevisionIndex(resolverHistory, 0).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(resolverHistory, 0).timestamp > 0L + } + + def "test versioning of ResourceBackedMetadataResolver"() { + setup: + def expectedModifiedPersistentEntities = [ResourceBackedMetadataResolver.name] + + when: + ResourceBackedMetadataResolver resolver = new ResourceBackedMetadataResolver(name: 'rbmr').with { + it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes(taskTimerRef: 'taskTimerRef') + it.classpathMetadataResource = new ClasspathMetadataResource(file: 'metadata.xml') + it + } + + def resolverHistory = updateAndGetRevisionHistoryOfMetadataResolver(resolver, + metadataResolverRepository, + ResourceBackedMetadataResolver, + txMgr, + entityManager) + + then: + resolverHistory.size() == 1 + getTargetEntityForRevisionIndex(resolverHistory, 0).name == 'rbmr' + getTargetEntityForRevisionIndex(resolverHistory, 0).reloadableMetadataResolverAttributes.taskTimerRef == 'taskTimerRef' + getTargetEntityForRevisionIndex(resolverHistory, 0).classpathMetadataResource.file == 'metadata.xml' + getRevisionEntityForRevisionIndex(resolverHistory, 0).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(resolverHistory, 0).timestamp > 0L + getModifiedEntityNames(resolverHistory, 0).sort() == expectedModifiedPersistentEntities.sort() + + when: + resolver.name = 'rbmrUPDATED' + resolver.reloadableMetadataResolverAttributes.taskTimerRef = 'taskTimerRefUPDATED' + resolver.classpathMetadataResource.file = 'metadataUPDATED.xml' + + resolverHistory = updateAndGetRevisionHistoryOfMetadataResolver(resolver, + metadataResolverRepository, + ResourceBackedMetadataResolver, + txMgr, + entityManager) + + then: + resolverHistory.size() == 2 + getTargetEntityForRevisionIndex(resolverHistory, 1).name == 'rbmrUPDATED' + getTargetEntityForRevisionIndex(resolverHistory, 1).reloadableMetadataResolverAttributes.taskTimerRef == 'taskTimerRefUPDATED' + getTargetEntityForRevisionIndex(resolverHistory, 1).classpathMetadataResource.file == 'metadataUPDATED.xml' + getRevisionEntityForRevisionIndex(resolverHistory, 1).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(resolverHistory, 1).timestamp > 0L + getModifiedEntityNames(resolverHistory, 1).sort() == expectedModifiedPersistentEntities.sort() + + //Check the original revision is intact + getTargetEntityForRevisionIndex(resolverHistory, 0).name == 'rbmr' + getTargetEntityForRevisionIndex(resolverHistory, 0).reloadableMetadataResolverAttributes.taskTimerRef == 'taskTimerRef' + getTargetEntityForRevisionIndex(resolverHistory, 0).classpathMetadataResource.file == 'metadata.xml' + getRevisionEntityForRevisionIndex(resolverHistory, 0).principalUserName == 'anonymousUser' + getRevisionEntityForRevisionIndex(resolverHistory, 0).timestamp > 0L + } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java index 5ee500437..d0f5dfb83 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java @@ -35,7 +35,6 @@ @JsonSubTypes.Type(value=SignatureValidationFilter.class, name="SignatureValidation"), @JsonSubTypes.Type(value=RequiredValidUntilFilter.class, name="RequiredValidUntil"), @JsonSubTypes.Type(value=NameIdFormatFilter.class, name="NameIDFormat")}) -@Audited public class MetadataFilter extends AbstractAuditable { @JsonProperty("@type") @@ -59,4 +58,4 @@ public int getVersion() { } return this.hashCode(); } -} \ No newline at end of file +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/FilesystemMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/FilesystemMetadataResolver.java index b96a74c14..ce3319d02 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/FilesystemMetadataResolver.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/FilesystemMetadataResolver.java @@ -4,6 +4,7 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; +import org.hibernate.envers.Audited; import javax.persistence.Embedded; import javax.persistence.Entity; @@ -16,6 +17,7 @@ @Getter @Setter @ToString +@Audited public class FilesystemMetadataResolver extends MetadataResolver { public FilesystemMetadataResolver() { type = "FilesystemMetadataResolver"; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataQueryProtocolScheme.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataQueryProtocolScheme.java index cc6dffb98..77b7cc733 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataQueryProtocolScheme.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataQueryProtocolScheme.java @@ -3,6 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import org.hibernate.envers.Audited; import javax.persistence.Entity; @@ -13,6 +14,7 @@ @Getter @Setter @EqualsAndHashCode(callSuper = true) +@Audited public class MetadataQueryProtocolScheme extends MetadataRequestURLConstructionScheme { public MetadataQueryProtocolScheme() { 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 11300c3b7..1fcce6175 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 @@ -13,6 +13,7 @@ import lombok.ToString; import org.hibernate.envers.AuditOverride; import org.hibernate.envers.Audited; +import org.hibernate.envers.NotAudited; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -74,6 +75,7 @@ public class MetadataResolver extends AbstractAuditable { @OneToMany(cascade = CascadeType.ALL) @OrderColumn + @NotAudited private List metadataFilters = new ArrayList<>(); @Transient diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/RegexScheme.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/RegexScheme.java index a8d4fffaa..ce0202b6c 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/RegexScheme.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/RegexScheme.java @@ -3,6 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import org.hibernate.envers.Audited; import javax.persistence.Column; import javax.persistence.Entity; @@ -15,6 +16,7 @@ @Getter @Setter @EqualsAndHashCode(callSuper = true) +@Audited public class RegexScheme extends MetadataRequestURLConstructionScheme { public RegexScheme() { diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ResourceBackedMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ResourceBackedMetadataResolver.java index 55c833f2d..2b480641f 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ResourceBackedMetadataResolver.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ResourceBackedMetadataResolver.java @@ -4,6 +4,7 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; +import org.hibernate.envers.Audited; import javax.persistence.Embedded; import javax.persistence.Entity; @@ -16,6 +17,7 @@ @Getter @Setter @ToString +@Audited public class ResourceBackedMetadataResolver extends MetadataResolver { public ResourceBackedMetadataResolver() { type = "ResourceBackedMetadataResolver"; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/TemplateScheme.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/TemplateScheme.java index 6cb0c8d90..a176bacd7 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/TemplateScheme.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/TemplateScheme.java @@ -3,6 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import org.hibernate.envers.Audited; import javax.persistence.Entity; @@ -13,6 +14,7 @@ @Getter @Setter @EqualsAndHashCode(callSuper = true) +@Audited public class TemplateScheme extends MetadataRequestURLConstructionScheme { public TemplateScheme () { From ee068aad0b25d72574e96eccf42c35877f6445e3 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 24 Jun 2019 13:41:19 -0400 Subject: [PATCH 087/112] SHIBUI-1263(1320) --- ...EntityDescriptorVersionServiceTests.groovy | 4 +- ...MetadataResolverVersionServiceTests.groovy | 136 ++++++++++++++++++ .../EntitiesVersioningConfiguration.java | 15 +- .../ui/domain/resolvers/MetadataResolver.java | 1 + .../envers/EnversVersionServiceSupport.java | 62 ++++++++ .../EntityDescriptorVersionService.java | 3 - .../EnversEntityDescriptorVersionService.java | 1 + .../EnversMetadataResolverVersionService.java | 43 ++++++ .../MetadataResolverVersionService.java | 16 +++ 9 files changed, 276 insertions(+), 5 deletions(-) create mode 100644 backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversMetadataResolverVersionServiceTests.groovy create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverVersionService.java diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy index d88a604f3..f867ede29 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy @@ -7,6 +7,7 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository +import edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorVersionService import org.springframework.beans.factory.annotation.Autowired @@ -19,6 +20,7 @@ import spock.lang.Specification import java.time.LocalDateTime + @DataJpaTest @ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration, EntitiesVersioningConfiguration]) @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @@ -40,7 +42,7 @@ class EnversEntityDescriptorVersionServiceTests extends Specification { def "versioning service returns correct number of versions sorted by modified date in natural order"() { when: 'Initial version' EntityDescriptor ed = new EntityDescriptor(entityID: 'ed', serviceProviderName: 'SP1') - ed = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction(txMgr) { + ed = EnversTestsSupport.doInExplicitTransaction(txMgr) { entityDescriptorRepository.save(ed) } def versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversMetadataResolverVersionServiceTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversMetadataResolverVersionServiceTests.groovy new file mode 100644 index 000000000..1ac1dae1f --- /dev/null +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversMetadataResolverVersionServiceTests.groovy @@ -0,0 +1,136 @@ +package edu.internet2.tier.shibboleth.admin.ui.service.envers + + +import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.EntitiesVersioningConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration +import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FilesystemMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ResourceBackedMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository +import edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport +import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolverVersionService +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.autoconfigure.domain.EntityScan +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest +import org.springframework.data.jpa.repository.config.EnableJpaRepositories +import org.springframework.test.context.ContextConfiguration +import org.springframework.transaction.PlatformTransactionManager +import spock.lang.Specification + +import java.time.LocalDateTime + + +@DataJpaTest +@ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration, EntitiesVersioningConfiguration]) +@EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) +@EntityScan("edu.internet2.tier.shibboleth.admin.ui") +class EnversMetadataResolverVersionServiceTests extends Specification { + + @Autowired + MetadataResolverVersionService metadataResolverVersionService + + @Autowired + MetadataResolverRepository metadataResolverRepository + + @Autowired + PlatformTransactionManager txMgr + + def "versioning service returns correct number of versions sorted by modified date in natural order"() { + when: 'Initial version' + MetadataResolver mr = new LocalDynamicMetadataResolver(name: 'ldmr') + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + def versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + + then: + versions.size() == 1 + versions[0].id + versions[0].creator + versions[0].date < LocalDateTime.now() + + when: 'Second version' + mr.name = 'ldmr2' + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + + + then: + versions.size() == 2 + versions[0].id && versions[1].id + versions[0].creator && versions[1].creator + versions[0].date < versions[1].date + + when: 'Third version' + mr.name = 'ldmr3' + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + + then: + versions.size() == 3 + versions[0].id && versions[1].id && versions[2].id + versions[0].creator && versions[1].creator && versions[2].creator + (versions[0].date < versions[1].date) && (versions[1].date < versions[2].date) + } + + def "versioning service returns correct metadata resolver for version number"() { + when: 'Initial version' + MetadataResolver mr = new FilesystemMetadataResolver(name: 'fsmr') + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + def versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + def v1Mr = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[0].id) + + then: + v1Mr.name == 'fsmr' + v1Mr.resourceId == mr.resourceId + + when: 'Update the original' + mr.name = 'fsmr2' + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + def v2Mr = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[1].id) + + then: + v2Mr.name == 'fsmr2' + v2Mr.resourceId == mr.resourceId + } + + def "versioning service returns null for non existent version number"() { + when: 'Initial version' + MetadataResolver mr = new ResourceBackedMetadataResolver(name: 'rbmr') + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + def nonexitentMrVersion = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, '1000') + + then: + !nonexitentMrVersion + } + + def "versioning service returns null for non existent metadata resolver number"() { + when: 'Initial version' + MetadataResolver mr = new DynamicHttpMetadataResolver(name: 'dhmr') + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + def versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + def nonexitentMr = metadataResolverVersionService.findSpecificVersionOfMetadataResolver('non-existent', versions[0].id) + + then: + !nonexitentMr + } +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java index b190f2f5d..ec21d42c4 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java @@ -1,8 +1,11 @@ package edu.internet2.tier.shibboleth.admin.ui.configuration; +import edu.internet2.tier.shibboleth.admin.ui.envers.EnversVersionServiceSupport; import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService; import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorVersionService; import edu.internet2.tier.shibboleth.admin.ui.service.EnversEntityDescriptorVersionService; +import edu.internet2.tier.shibboleth.admin.ui.service.EnversMetadataResolverVersionService; +import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolverVersionService; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -16,7 +19,17 @@ public class EntitiesVersioningConfiguration { private EntityManager entityManager; @Bean - EntityDescriptorVersionService entityDescriptorVersionService(EntityDescriptorService entityDescriptorService) { + public EntityDescriptorVersionService entityDescriptorVersionService(EntityDescriptorService entityDescriptorService) { return new EnversEntityDescriptorVersionService(entityManager, entityDescriptorService); } + + @Bean + public MetadataResolverVersionService metadataResolverVersionService() { + return new EnversMetadataResolverVersionService(enversVersionServiceSupport()); + } + + @Bean + public EnversVersionServiceSupport enversVersionServiceSupport() { + return new EnversVersionServiceSupport(entityManager); + } } 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 1fcce6175..5de02a03b 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 @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain.resolvers; import com.fasterxml.jackson.annotation.JsonGetter; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java new file mode 100644 index 000000000..9b8cc860b --- /dev/null +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java @@ -0,0 +1,62 @@ +package edu.internet2.tier.shibboleth.admin.ui.envers; + +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver; +import edu.internet2.tier.shibboleth.admin.ui.domain.versioning.Version; +import org.hibernate.envers.AuditReaderFactory; +import org.hibernate.envers.query.AuditEntity; + +import javax.persistence.EntityManager; +import javax.persistence.NoResultException; +import java.time.ZoneId; +import java.util.List; + +import static java.util.Comparator.comparing; +import static java.util.stream.Collectors.toList; + +/** + * Encapsulates common functionality interfacing with Envers AuditReader low level API + * to query for revisions of various persistent entities. + */ +public class EnversVersionServiceSupport { + + private EntityManager entityManager; + + public EnversVersionServiceSupport(EntityManager entityManager) { + this.entityManager = entityManager; + } + + public List findVersionsForPersistentEntity(String resourceId, Class enityClass) { + List revs = AuditReaderFactory.get(entityManager).createQuery() + .forRevisionsOfEntity(enityClass, false, false) + .add(AuditEntity.property("resourceId").eq(resourceId)) + .getResultList(); + + Object listOfVersions = revs.stream() + .map(it -> ((Object[]) it)[1]) + .map(it -> { + return new Version(((PrincipalAwareRevisionEntity) it).idAsString(), + ((PrincipalAwareRevisionEntity) it).getPrincipalUserName(), + ((PrincipalAwareRevisionEntity) it).getRevisionDate() + .toInstant() + .atZone(ZoneId.systemDefault()) + .toLocalDateTime()); + }) + .sorted(comparing(Version::getDate)) + .collect(toList()); + + return (List) listOfVersions; + } + + public Object findSpecificVersionOfPersistentEntity(String resourceId, String versionId, Class entityClass) { + try { + return AuditReaderFactory.get(entityManager).createQuery() + .forEntitiesAtRevision(entityClass, Integer.valueOf(versionId)) + .add(AuditEntity.property("resourceId").eq(resourceId)) + .add(AuditEntity.revisionNumber().eq(Integer.valueOf(versionId))) + .getSingleResult(); + } + catch (NoResultException e) { + return null; + } + } +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java index 6803796fa..5e1542ea2 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java @@ -3,10 +3,7 @@ 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.repository.EntityDescriptorRepository; -import java.time.LocalDateTime; -import java.util.Arrays; import java.util.List; /** diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java index 91dccd5af..795807ce7 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java @@ -25,6 +25,7 @@ /** * Hibernate Envers based implementation of {@link EntityDescriptorVersionService}. + * TODO: refactor this implementation using EnversVersionServiceSupport class */ public class EnversEntityDescriptorVersionService implements EntityDescriptorVersionService { diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java new file mode 100644 index 000000000..5a77c2b87 --- /dev/null +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java @@ -0,0 +1,43 @@ +package edu.internet2.tier.shibboleth.admin.ui.service; + +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.resolvers.MetadataResolver; +import edu.internet2.tier.shibboleth.admin.ui.domain.versioning.Version; +import edu.internet2.tier.shibboleth.admin.ui.envers.EnversVersionServiceSupport; +import edu.internet2.tier.shibboleth.admin.ui.envers.PrincipalAwareRevisionEntity; +import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository; +import org.hibernate.envers.AuditReaderFactory; +import org.hibernate.envers.query.AuditEntity; + +import javax.persistence.EntityManager; +import javax.persistence.NoResultException; +import java.time.ZoneId; +import java.util.List; + +import static java.util.Comparator.comparing; +import static java.util.stream.Collectors.toList; + +/** + * Hibernate Envers based implementation of {@link MetadataResolverVersionService}. + */ +public class EnversMetadataResolverVersionService implements MetadataResolverVersionService { + + + private EnversVersionServiceSupport enversVersionServiceSupport; + + public EnversMetadataResolverVersionService(EnversVersionServiceSupport enversVersionServiceSupport) { + this.enversVersionServiceSupport = enversVersionServiceSupport; + } + + @Override + public List findVersionsForMetadataResolver(String resourceId) { + return enversVersionServiceSupport.findVersionsForPersistentEntity(resourceId, MetadataResolver.class); + } + + @Override + public MetadataResolver findSpecificVersionOfMetadataResolver(String resourceId, String versionId) { + Object mrObject = enversVersionServiceSupport.findSpecificVersionOfPersistentEntity(resourceId, versionId, MetadataResolver.class); + return mrObject == null ? null : (MetadataResolver) mrObject; + } +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverVersionService.java new file mode 100644 index 000000000..16f3dd1a3 --- /dev/null +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverVersionService.java @@ -0,0 +1,16 @@ +package edu.internet2.tier.shibboleth.admin.ui.service; + +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver; +import edu.internet2.tier.shibboleth.admin.ui.domain.versioning.Version; + +import java.util.List; + +/** + * API containing operations pertaining to {@link MetadataResolver} versioning. + */ +public interface MetadataResolverVersionService { + + List findVersionsForMetadataResolver(String resourceId); + + MetadataResolver findSpecificVersionOfMetadataResolver(String resourceId, String versionId); +} From 5ff6ec7aa2162b37e8c7ba8dc365c37107a5d236 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 24 Jun 2019 16:16:34 -0400 Subject: [PATCH 088/112] 1263(1336) --- ...MetadataFilterEnversVersioningTests.groovy | 88 +++++++++++++++++++ ...tadataResolverEnversVersioningTests.groovy | 3 - .../filters/EntityAttributesFilter.java | 4 +- .../filters/EntityAttributesFilterTarget.java | 5 +- .../filters/EntityRoleWhiteListFilter.java | 2 + .../ui/domain/filters/MetadataFilter.java | 3 + .../ui/domain/filters/NameIdFormatFilter.java | 2 + .../filters/NameIdFormatFilterTarget.java | 4 + .../filters/RequiredValidUntilFilter.java | 2 + .../filters/SignatureValidationFilter.java | 2 + .../ui/domain/resolvers/MetadataResolver.java | 8 +- 11 files changed, 117 insertions(+), 6 deletions(-) create mode 100644 backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataFilterEnversVersioningTests.groovy diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataFilterEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataFilterEnversVersioningTests.groovy new file mode 100644 index 000000000..67c7787e2 --- /dev/null +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataFilterEnversVersioningTests.groovy @@ -0,0 +1,88 @@ +package edu.internet2.tier.shibboleth.admin.ui.repository.envers + +import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.EntitiesVersioningConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration +import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityRoleWhiteListFilter +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.repository.FilterRepository +import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository +import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolverVersionService +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.autoconfigure.domain.EntityScan +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest +import org.springframework.data.jpa.repository.config.EnableJpaRepositories +import org.springframework.test.context.ContextConfiguration +import org.springframework.transaction.PlatformTransactionManager +import spock.lang.Specification + +import javax.persistence.EntityManager + +/** + * Testing metadata resolver envers versioning + */ +@DataJpaTest +@ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, SearchConfiguration, TestConfiguration, EntitiesVersioningConfiguration]) +@EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) +@EntityScan("edu.internet2.tier.shibboleth.admin.ui") +class MetadataFilterEnversVersioningTests extends Specification { + + @Autowired + MetadataResolverRepository metadataResolverRepository + + @Autowired + FilterRepository filterRepository + + @Autowired + MetadataResolverVersionService metadataResolverVersionService + + @Autowired + PlatformTransactionManager txMgr + + + def "test versioning of LocalDynamicMetadataResolver"() { + when: 'Add initial filter' + LocalDynamicMetadataResolver mr = new LocalDynamicMetadataResolver(name: 'ldmr') + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + EntityRoleWhiteListFilter filter = new EntityRoleWhiteListFilter().with { + it.retainedRoles = ['role1'] + it + } + mr.metadataFilters.add(filter) + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + def versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + def mrv1 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[0].id) + def mrv2 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[1].id) + + + then: + versions.size() == 2 + mrv1.metadataFilters.size() == 0 + mrv2.metadataFilters.size() == 1 + + when: 'Update filter' + filter = filterRepository.findByResourceId(filter.resourceId) + filter.retainedRoles = ['role1', 'role2'] + filter = EnversTestsSupport.doInExplicitTransaction(txMgr) { + filterRepository.save(filter) + } + mr.markAsModified() + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + mrv1 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[0].id) + mrv2 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[1].id) + def mrv3 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[2].id) + + then: + versions.size() == 3 + } +} diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy index 04b5e9b62..2ba81bcdf 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy @@ -48,9 +48,6 @@ class MetadataResolverEnversVersioningTests extends Specification { @Autowired PlatformTransactionManager txMgr - @Autowired - OpenSamlObjects openSamlObjects - def "test versioning of LocalDynamicMetadataResolver"() { setup: def expectedModifiedPersistentEntities = [LocalDynamicMetadataResolver.name] diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilter.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilter.java index 9d68c39b3..5d6d3132a 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilter.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilter.java @@ -6,6 +6,7 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; +import org.hibernate.envers.Audited; import javax.persistence.CascadeType; import javax.persistence.Entity; @@ -28,6 +29,7 @@ @Getter @Setter @ToString +@Audited public class EntityAttributesFilter extends MetadataFilter { public EntityAttributesFilter() { @@ -70,4 +72,4 @@ public void intoTransientRepresentation() { this.attributeRelease = getAttributeReleaseListFromAttributeList(this.attributes); this.relyingPartyOverrides = getRelyingPartyOverridesRepresentationFromAttributeList(this.attributes); } -} \ No newline at end of file +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilterTarget.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilterTarget.java index 5effdae3d..0abbbd11c 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilterTarget.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilterTarget.java @@ -1,8 +1,9 @@ package edu.internet2.tier.shibboleth.admin.ui.domain.filters; -import com.fasterxml.jackson.annotation.JsonIgnore; import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable; import lombok.EqualsAndHashCode; +import org.hibernate.envers.AuditOverride; +import org.hibernate.envers.Audited; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,6 +15,8 @@ @Entity @EqualsAndHashCode(callSuper = true) +@Audited +@AuditOverride(forClass = AbstractAuditable.class) public class EntityAttributesFilterTarget extends AbstractAuditable { public enum EntityAttributesFilterTargetType { ENTITY, CONDITION_SCRIPT, CONDITION_REF, REGEX diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityRoleWhiteListFilter.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityRoleWhiteListFilter.java index 111b75c2a..26c5e9976 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityRoleWhiteListFilter.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityRoleWhiteListFilter.java @@ -4,6 +4,7 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; +import org.hibernate.envers.Audited; import javax.persistence.CollectionTable; import javax.persistence.Column; @@ -19,6 +20,7 @@ @Getter @Setter @ToString +@Audited public class EntityRoleWhiteListFilter extends MetadataFilter { public EntityRoleWhiteListFilter() { diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java index d0f5dfb83..b15058cd0 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java @@ -10,6 +10,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.ToString; +import org.hibernate.envers.AuditOverride; import org.hibernate.envers.Audited; import javax.persistence.Column; @@ -35,6 +36,8 @@ @JsonSubTypes.Type(value=SignatureValidationFilter.class, name="SignatureValidation"), @JsonSubTypes.Type(value=RequiredValidUntilFilter.class, name="RequiredValidUntil"), @JsonSubTypes.Type(value=NameIdFormatFilter.class, name="NameIDFormat")}) +@Audited +@AuditOverride(forClass = AbstractAuditable.class) public class MetadataFilter extends AbstractAuditable { @JsonProperty("@type") diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilter.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilter.java index 608561407..157e5f766 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilter.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilter.java @@ -4,6 +4,7 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; +import org.hibernate.envers.Audited; import javax.persistence.CascadeType; import javax.persistence.ElementCollection; @@ -17,6 +18,7 @@ @Getter @Setter @ToString +@Audited public class NameIdFormatFilter extends MetadataFilter { public NameIdFormatFilter() { diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilterTarget.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilterTarget.java index a346d983f..c8fd10c90 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilterTarget.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilterTarget.java @@ -3,6 +3,8 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable; import lombok.EqualsAndHashCode; import lombok.ToString; +import org.hibernate.envers.AuditOverride; +import org.hibernate.envers.Audited; import javax.persistence.ElementCollection; import javax.persistence.Entity; @@ -13,6 +15,8 @@ @Entity @EqualsAndHashCode(callSuper = true) @ToString +@Audited +@AuditOverride(forClass = AbstractAuditable.class) public class NameIdFormatFilterTarget extends AbstractAuditable { public enum NameIdFormatFilterTargetType { diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/RequiredValidUntilFilter.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/RequiredValidUntilFilter.java index 1aca84d4b..cda431408 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/RequiredValidUntilFilter.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/RequiredValidUntilFilter.java @@ -4,6 +4,7 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; +import org.hibernate.envers.Audited; import javax.persistence.Entity; @@ -12,6 +13,7 @@ @Getter @Setter @ToString +@Audited public class RequiredValidUntilFilter extends MetadataFilter { public RequiredValidUntilFilter() { diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/SignatureValidationFilter.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/SignatureValidationFilter.java index 7e83ae6d4..5cf71225e 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/SignatureValidationFilter.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/SignatureValidationFilter.java @@ -4,6 +4,7 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; +import org.hibernate.envers.Audited; import javax.persistence.Entity; @@ -12,6 +13,7 @@ @Getter @Setter @ToString +@Audited public class SignatureValidationFilter extends MetadataFilter { public SignatureValidationFilter() { 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 5de02a03b..b41b20ac5 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 @@ -74,9 +74,11 @@ public class MetadataResolver extends AbstractAuditable { private Boolean doInitialization = true; + @JsonIgnore + private Long versionModifiedTimestamp; + @OneToMany(cascade = CascadeType.ALL) @OrderColumn - @NotAudited private List metadataFilters = new ArrayList<>(); @Transient @@ -89,4 +91,8 @@ public int getVersion() { } return this.hashCode(); } + + public void markAsModified() { + this.versionModifiedTimestamp = System.currentTimeMillis(); + } } From 17e995c28d7d4ee225a4e371247b70bd98794a8f Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 25 Jun 2019 08:29:41 -0400 Subject: [PATCH 089/112] 1263(1336) --- .../shibboleth/admin/ui/domain/resolvers/MetadataResolver.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 b41b20ac5..dc30d40d8 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 @@ -14,7 +14,6 @@ import lombok.ToString; import org.hibernate.envers.AuditOverride; import org.hibernate.envers.Audited; -import org.hibernate.envers.NotAudited; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -30,7 +29,7 @@ @Entity @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -@EqualsAndHashCode(callSuper = true, exclude = {"version"}) +@EqualsAndHashCode(callSuper = true, exclude = {"version", "versionModifiedTimestamp"}) @NoArgsConstructor @Getter @Setter From 068039572b9397af623e6fd1be6caae5e73494ff Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 25 Jun 2019 11:15:04 -0400 Subject: [PATCH 090/112] DateTime correct serialization --- .../admin/ui/domain/versioning/Version.java | 6 ++++-- .../EnversEntityDescriptorVersionService.java | 5 +++-- .../VersionJsonSerializationBasicTests.groovy | 16 ++++++++++------ 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/Version.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/Version.java index ce3687507..100b0fdbd 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/Version.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/Version.java @@ -1,5 +1,6 @@ package edu.internet2.tier.shibboleth.admin.ui.domain.versioning; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -8,7 +9,7 @@ import lombok.ToString; import java.io.Serializable; -import java.time.LocalDateTime; +import java.time.ZonedDateTime; /** * Represents version information of any versioned entity in the system. @@ -25,7 +26,8 @@ public class Version implements Serializable { private String creator; - private LocalDateTime date; + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") + private ZonedDateTime date; private static final long serialVersionUID = 3429591830989243421L; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java index 91dccd5af..b623d1ec4 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java @@ -15,6 +15,7 @@ import javax.persistence.PersistenceContext; import java.time.LocalDateTime; import java.time.ZoneId; +import java.time.ZoneOffset; import java.util.Arrays; import java.util.Comparator; import java.util.List; @@ -51,8 +52,8 @@ public List findVersionsForEntityDescriptor(String resourceId) { ((PrincipalAwareRevisionEntity) it).getPrincipalUserName(), ((PrincipalAwareRevisionEntity) it).getRevisionDate() .toInstant() - .atZone(ZoneId.systemDefault()) - .toLocalDateTime()); + .atOffset(ZoneOffset.UTC) + .toZonedDateTime()); }) .sorted(comparing(Version::getDate)) .collect(toList()); diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy index 585369249..011fe7033 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy @@ -2,36 +2,40 @@ package edu.internet2.tier.shibboleth.admin.ui.domain.versioning import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule +import groovy.json.JsonSlurper import spock.lang.Specification -import java.time.LocalDateTime -import java.time.Month +import java.time.ZonedDateTime class VersionJsonSerializationBasicTests extends Specification { ObjectMapper mapper + JsonSlurper jsonSlurper + def setup() { mapper = new ObjectMapper() mapper.registerModule(new JavaTimeModule()) + jsonSlurper = new JsonSlurper() } def "Verify basic Version JSON serialization"() { given: - def staticDate = LocalDateTime.of(2019, Month.MAY,20,15,0,0) + def staticDate = ZonedDateTime.parse("2019-05-20T15:00:00.574Z") def version = new Version('2', 'kramer', staticDate) def expectedJson = """ { "id": "2", "creator": "kramer", - "date": "2019-05-20T15:00" + "date": "2019-05-20T15:00:00.574Z" } """ + def expectedJsonMap = jsonSlurper.parseText(expectedJson) when: - def deSerialized = mapper.readValue(expectedJson, Version) + def deSerializedJsonMap = jsonSlurper.parseText(mapper.writeValueAsString(version)) then: - deSerialized == version + deSerializedJsonMap.date == expectedJsonMap.date } } From e0cd7b88e5d955021df2792a428928415a55bc69 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 25 Jun 2019 11:32:10 -0400 Subject: [PATCH 091/112] Fix test --- .../envers/EnversEntityDescriptorVersionServiceTests.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy index d88a604f3..e91aa73b6 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy @@ -18,6 +18,7 @@ import org.springframework.transaction.PlatformTransactionManager import spock.lang.Specification import java.time.LocalDateTime +import java.time.ZonedDateTime @DataJpaTest @ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration, EntitiesVersioningConfiguration]) @@ -49,7 +50,7 @@ class EnversEntityDescriptorVersionServiceTests extends Specification { versions.size() == 1 versions[0].id versions[0].creator - versions[0].date < LocalDateTime.now() + versions[0].date < ZonedDateTime.now() when: 'Second version' ed.serviceProviderName = 'SP2' From ee3ea921ac4d4870a83436c8434a12d19a1c046b Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 25 Jun 2019 13:37:54 -0400 Subject: [PATCH 092/112] Fix test --- ...EnversMetadataResolverVersionServiceTests.groovy | 3 ++- .../ui/envers/EnversVersionServiceSupport.java | 7 +++---- .../EnversMetadataResolverVersionService.java | 13 +------------ 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversMetadataResolverVersionServiceTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversMetadataResolverVersionServiceTests.groovy index 1ac1dae1f..8f68922ed 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversMetadataResolverVersionServiceTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversMetadataResolverVersionServiceTests.groovy @@ -24,6 +24,7 @@ import org.springframework.transaction.PlatformTransactionManager import spock.lang.Specification import java.time.LocalDateTime +import java.time.ZonedDateTime @DataJpaTest @@ -53,7 +54,7 @@ class EnversMetadataResolverVersionServiceTests extends Specification { versions.size() == 1 versions[0].id versions[0].creator - versions[0].date < LocalDateTime.now() + versions[0].date < ZonedDateTime.now() when: 'Second version' mr.name = 'ldmr2' diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java index 9b8cc860b..ba1631ade 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java @@ -1,13 +1,12 @@ package edu.internet2.tier.shibboleth.admin.ui.envers; -import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver; import edu.internet2.tier.shibboleth.admin.ui.domain.versioning.Version; import org.hibernate.envers.AuditReaderFactory; import org.hibernate.envers.query.AuditEntity; import javax.persistence.EntityManager; import javax.persistence.NoResultException; -import java.time.ZoneId; +import java.time.ZoneOffset; import java.util.List; import static java.util.Comparator.comparing; @@ -38,8 +37,8 @@ public List findVersionsForPersistentEntity(String resourceId, Class ((PrincipalAwareRevisionEntity) it).getPrincipalUserName(), ((PrincipalAwareRevisionEntity) it).getRevisionDate() .toInstant() - .atZone(ZoneId.systemDefault()) - .toLocalDateTime()); + .atOffset(ZoneOffset.UTC) + .toZonedDateTime()); }) .sorted(comparing(Version::getDate)) .collect(toList()); diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java index 5a77c2b87..c98203eca 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java @@ -1,22 +1,11 @@ package edu.internet2.tier.shibboleth.admin.ui.service; -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.resolvers.MetadataResolver; import edu.internet2.tier.shibboleth.admin.ui.domain.versioning.Version; import edu.internet2.tier.shibboleth.admin.ui.envers.EnversVersionServiceSupport; -import edu.internet2.tier.shibboleth.admin.ui.envers.PrincipalAwareRevisionEntity; -import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository; -import org.hibernate.envers.AuditReaderFactory; -import org.hibernate.envers.query.AuditEntity; - -import javax.persistence.EntityManager; -import javax.persistence.NoResultException; -import java.time.ZoneId; + import java.util.List; -import static java.util.Comparator.comparing; -import static java.util.stream.Collectors.toList; /** * Hibernate Envers based implementation of {@link MetadataResolverVersionService}. From 97df5c06733679c7c66364c3b576ef267cd37e4c Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 25 Jun 2019 16:51:25 -0400 Subject: [PATCH 093/112] 1263(1336) --- ...MetadataFilterEnversVersioningTests.groovy | 244 +++++++++++++++++- .../controller/MetadataFiltersController.java | 31 ++- 2 files changed, 252 insertions(+), 23 deletions(-) diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataFilterEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataFilterEnversVersioningTests.groovy index 67c7787e2..05c8f5ea0 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataFilterEnversVersioningTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataFilterEnversVersioningTests.groovy @@ -5,9 +5,16 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.EntitiesVersioningCo import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration +import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityRoleWhiteListFilter +import edu.internet2.tier.shibboleth.admin.ui.domain.filters.NameIdFormatFilter +import edu.internet2.tier.shibboleth.admin.ui.domain.filters.RequiredValidUntilFilter +import edu.internet2.tier.shibboleth.admin.ui.domain.filters.SignatureValidationFilter +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FilesystemMetadataResolver import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver -import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ResourceBackedMetadataResolver import edu.internet2.tier.shibboleth.admin.ui.repository.FilterRepository import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolverVersionService @@ -15,14 +22,14 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.domain.EntityScan import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest import org.springframework.data.jpa.repository.config.EnableJpaRepositories +import org.springframework.test.annotation.DirtiesContext import org.springframework.test.context.ContextConfiguration import org.springframework.transaction.PlatformTransactionManager import spock.lang.Specification -import javax.persistence.EntityManager /** - * Testing metadata resolver envers versioning + * Testing metadata resolver envers versioning with metadata filters */ @DataJpaTest @ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, SearchConfiguration, TestConfiguration, EntitiesVersioningConfiguration]) @@ -43,9 +50,9 @@ class MetadataFilterEnversVersioningTests extends Specification { PlatformTransactionManager txMgr - def "test versioning of LocalDynamicMetadataResolver"() { + def "test versioning of MetadataResolver with EntityRoleWhiteListFilter"() { when: 'Add initial filter' - LocalDynamicMetadataResolver mr = new LocalDynamicMetadataResolver(name: 'ldmr') + def mr = new LocalDynamicMetadataResolver(name: 'resolver') mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { metadataResolverRepository.save(mr) } @@ -61,15 +68,111 @@ class MetadataFilterEnversVersioningTests extends Specification { def mrv1 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[0].id) def mrv2 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[1].id) - then: versions.size() == 2 mrv1.metadataFilters.size() == 0 mrv2.metadataFilters.size() == 1 when: 'Update filter' - filter = filterRepository.findByResourceId(filter.resourceId) + filter = mr.metadataFilters[0] filter.retainedRoles = ['role1', 'role2'] + filter.removeEmptyEntitiesDescriptors = false + filter = EnversTestsSupport.doInExplicitTransaction(txMgr) { + filterRepository.save(filter) + } + mr.markAsModified() + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + mrv1 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[0].id) + mrv2 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[1].id) + def mrv3 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[2].id) + + then: + versions.size() == 3 + mrv1.metadataFilters.size() == 0 + mrv2.metadataFilters[0].retainedRoles.size() == 1 + mrv2.metadataFilters[0].retainedRoles == ['role1'] + mrv3.metadataFilters[0].retainedRoles.size() == 2 + mrv3.metadataFilters[0].retainedRoles == ['role1','role2'] + mrv3.metadataFilters[0].removeEmptyEntitiesDescriptors == false + } + + //@DirtiesContext + def "test versioning of MetadataResolver with EntityAttributesFilter"() { + when: 'Add initial filter' + def mr = new FileBackedHttpMetadataResolver(name: 'resolver') + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + EntityAttributesFilter filter = new EntityAttributesFilter().with { + it.attributeRelease = ['attr1'] + it + } + mr.metadataFilters.add(filter) + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + def versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + def mrv1 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[0].id) + def mrv2 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[1].id) + + then: + versions.size() == 2 + mrv1.metadataFilters.size() == 0 + mrv2.metadataFilters.size() == 1 + + when: 'Update filter' + filter = mr.metadataFilters[0] + filter.attributeRelease = ['attr1, attr2'] + filter = EnversTestsSupport.doInExplicitTransaction(txMgr) { + filterRepository.save(filter) + } + mr.markAsModified() + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + mrv1 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[0].id) + mrv2 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[1].id) + def mrv3 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[2].id) + + then: + versions.size() == 3 + mrv1.metadataFilters.size() == 0 + mrv2.metadataFilters[0].attributes[0].attributeValues[0].xsStringvalue == 'attr1' + mrv3.metadataFilters[0].attributes[0].attributeValues[0].xsStringvalue == 'attr1, attr2' + } + + //@DirtiesContext + def "test versioning of MetadataResolver with SignatureValidationFilter"() { + when: 'Add initial filter' + def mr = new DynamicHttpMetadataResolver(name: 'resolver') + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + SignatureValidationFilter filter = new SignatureValidationFilter().with { + it.certificateFile = 'cert1.file' + it + } + mr.metadataFilters.add(filter) + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + def versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + def mrv1 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[0].id) + def mrv2 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[1].id) + + then: + versions.size() == 2 + mrv1.metadataFilters.size() == 0 + mrv2.metadataFilters.size() == 1 + mrv2.metadataFilters[0].certificateFile == 'cert1.file' + + when: 'Update filter' + filter = mr.metadataFilters[0] + filter.certificateFile = 'cert2.file' filter = EnversTestsSupport.doInExplicitTransaction(txMgr) { filterRepository.save(filter) } @@ -84,5 +187,132 @@ class MetadataFilterEnversVersioningTests extends Specification { then: versions.size() == 3 + mrv1.metadataFilters.size() == 0 + mrv2.metadataFilters[0].certificateFile == 'cert1.file' + mrv3.metadataFilters[0].certificateFile == 'cert2.file' + } + + def "test versioning of MetadataResolver with RequiredValidUntilFilter"() { + when: 'Add initial filter' + def mr = new FilesystemMetadataResolver(name: 'resolver') + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + RequiredValidUntilFilter filter = new RequiredValidUntilFilter().with { + it.maxValidityInterval = "PT1S" + it + } + mr.metadataFilters.add(filter) + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + def versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + def mrv1 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[0].id) + def mrv2 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[1].id) + + then: + versions.size() == 2 + mrv1.metadataFilters.size() == 0 + mrv2.metadataFilters.size() == 1 + mrv2.metadataFilters[0].maxValidityInterval == 'PT1S' + + when: 'Update filter' + filter = mr.metadataFilters[0] + filter.maxValidityInterval = 'PT30S' + filter = EnversTestsSupport.doInExplicitTransaction(txMgr) { + filterRepository.save(filter) + } + mr.markAsModified() + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + mrv1 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[0].id) + mrv2 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[1].id) + def mrv3 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[2].id) + + then: + versions.size() == 3 + mrv1.metadataFilters.size() == 0 + mrv2.metadataFilters[0].maxValidityInterval == 'PT1S' + mrv3.metadataFilters[0].maxValidityInterval == 'PT30S' + } + + @DirtiesContext + def "test versioning of MetadataResolver with NameIdFormatFilter"() { + when: 'Add initial filter' + def mr = new ResourceBackedMetadataResolver(name: 'resolver') + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + NameIdFormatFilter filter = new NameIdFormatFilter().with { + it.formats = ['format1'] + it + } + mr.metadataFilters.add(filter) + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + def versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + def mrv1 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[0].id) + def mrv2 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[1].id) + + then: + versions.size() == 2 + mrv1.metadataFilters.size() == 0 + mrv2.metadataFilters.size() == 1 + mrv2.metadataFilters[0].formats == ['format1'] + + when: 'Update filter' + filter = mr.metadataFilters[0] + filter.formats = ['format1', 'format2'] + filter.removeExistingFormats = true + filter = EnversTestsSupport.doInExplicitTransaction(txMgr) { + filterRepository.save(filter) + } + mr.markAsModified() + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + mrv1 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[0].id) + mrv2 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[1].id) + def mrv3 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[2].id) + + then: + versions.size() == 3 + mrv1.metadataFilters.size() == 0 + mrv2.metadataFilters[0].formats == ['format1'] + mrv3.metadataFilters[0].formats == ['format1', 'format2'] + mrv3.metadataFilters[0].removeExistingFormats == true + } + + def "test versioning of deleting a filter"() { + when: 'Add initial filter' + def mr = new LocalDynamicMetadataResolver(name: 'resolver') + def filter = new EntityRoleWhiteListFilter() + + mr.metadataFilters.add(filter) + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + //And now remove filter + filter = filterRepository.findByResourceId(filter.resourceId) + mr.metadataFilters = [] + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + EnversTestsSupport.doInExplicitTransaction(txMgr) { + filterRepository.delete(filter) + } + + def versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + def mrv1 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[0].id) + def mrv2 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[1].id) + + then: + versions.size() == 2 + mrv1.metadataFilters.size() == 1 + mrv2.metadataFilters.size() == 0 } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersController.java index 57d734f77..cbf5051ba 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersController.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersController.java @@ -7,16 +7,10 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.filters.RequiredValidUntilFilter; import edu.internet2.tier.shibboleth.admin.ui.domain.filters.SignatureValidationFilter; import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver; -import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.opensaml.OpenSamlFunctionDrivenDynamicHTTPMetadataResolver; -import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.opensaml.OpenSamlLocalDynamicMetadataResolver; import edu.internet2.tier.shibboleth.admin.ui.repository.FilterRepository; import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository; import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolverService; -import net.shibboleth.utilities.java.support.component.ComponentInitializationException; -import net.shibboleth.utilities.java.support.resolver.ResolverException; -import org.opensaml.saml.metadata.resolver.ChainingMetadataResolver; -import org.opensaml.saml.metadata.resolver.RefreshableMetadataResolver; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -36,6 +30,7 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.function.Supplier; import java.util.stream.Stream; @@ -102,19 +97,19 @@ public ResponseEntity create(@PathVariable String metadataResolverId, @Reques public ResponseEntity update(@PathVariable String metadataResolverId, @PathVariable String resourceId, @RequestBody MetadataFilter updatedFilter) { - MetadataFilter filterTobeUpdated = filterRepository.findByResourceId(resourceId); - if (filterTobeUpdated == null) { - return ResponseEntity.notFound().build(); - } MetadataResolver metadataResolver = findResolverOrThrowHttp404(metadataResolverId); - // check to make sure that the relationship exists - if (!metadataResolver.getMetadataFilters().contains(filterTobeUpdated)) { - // TODO: find a better response - return new ResponseEntity<>(HttpStatus.BAD_REQUEST); + //Now we operate directly on the filter attached to MetadataResolver, + //Instead of fetching filter separately, to accommodate correct envers versioning with uni-directional one-to-many + Optional filterTobeUpdatedOptional = metadataResolver.getMetadataFilters() + .stream() + .filter(it -> it.getResourceId().equals(resourceId)) + .findFirst(); + if(!filterTobeUpdatedOptional.isPresent()) { + return ResponseEntity.notFound().build(); } - + MetadataFilter filterTobeUpdated = filterTobeUpdatedOptional.get(); if (!resourceId.equals(updatedFilter.getResourceId())) { return new ResponseEntity(HttpStatus.CONFLICT); } @@ -130,6 +125,10 @@ public ResponseEntity update(@PathVariable String metadataResolverId, MetadataFilter persistedFilter = filterRepository.save(filterTobeUpdated); + //To support envers versioning from MetadataResolver side + metadataResolver.markAsModified(); + repository.save(metadataResolver); + // TODO: this is wrong metadataResolverService.reloadFilters(metadataResolver.getResourceId()); @@ -244,4 +243,4 @@ private static URI getResourceUriFor(MetadataResolver mr, String filterResourceI .build() .toUri(); } -} \ No newline at end of file +} From 6e2d8a2b101be8cde9e9001facd9112c8f45a2cc Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Wed, 26 Jun 2019 08:43:43 -0400 Subject: [PATCH 094/112] Fix tests --- .../admin/ui/controller/MetadataFiltersControllerTests.groovy | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy index 802afdb81..16ab5f6e0 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy @@ -201,7 +201,6 @@ class MetadataFiltersControllerTests extends Specification { updatedMetadataResolver.getMetadataFilters().add(updatedFilter) 1 * metadataResolverRepository.findByResourceId(_) >> originalMetadataResolver - 1 * metadataFilterRepository.findByResourceId(_) >> originalFilter 1 * metadataFilterRepository.save(_) >> updatedFilter def filterUUID = updatedFilter.getResourceId() @@ -240,7 +239,6 @@ class MetadataFiltersControllerTests extends Specification { originalMetadataResolver.getMetadataFilters().add(randomFilter) 1 * metadataResolverRepository.findByResourceId(_) >> originalMetadataResolver - 1 * metadataFilterRepository.findByResourceId(_) >> randomFilter def filterUUID = randomFilter.getResourceId() @@ -253,4 +251,4 @@ class MetadataFiltersControllerTests extends Specification { then: result.andExpect(status().is(409)) } -} \ No newline at end of file +} From 8321859fae0455f653a5004a03c12f3c9f05135b Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Wed, 26 Jun 2019 15:09:30 -0400 Subject: [PATCH 095/112] 1263(1321) --- ...lerVersionEndpointsIntegrationTests.groovy | 121 ++++++++++++++++++ ...MetadataFilterEnversVersioningTests.groovy | 7 +- .../MetadataResolversController.java | 31 +++++ .../envers/EnversVersionServiceSupport.java | 4 +- 4 files changed, 156 insertions(+), 7 deletions(-) create mode 100644 backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolverControllerVersionEndpointsIntegrationTests.groovy diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolverControllerVersionEndpointsIntegrationTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolverControllerVersionEndpointsIntegrationTests.groovy new file mode 100644 index 000000000..f23ea333d --- /dev/null +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolverControllerVersionEndpointsIntegrationTests.groovy @@ -0,0 +1,121 @@ +package edu.internet2.tier.shibboleth.admin.ui.controller + +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FilesystemMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.test.context.ActiveProfiles +import spock.lang.Specification + +/** + * @author Dmitriy Kopylenko + */ +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@ActiveProfiles(['no-auth', 'dev']) +class MetadataResolverControllerVersionEndpointsIntegrationTests extends Specification { + + @Autowired + private TestRestTemplate restTemplate + + @Autowired + MetadataResolverRepository repository + + static BASE_URI = '/api/MetadataResolvers' + + static ALL_VERSIONS_URI = "$BASE_URI/%s/Versions" + + static SPECIFIC_VERSION_URI = "$BASE_URI/%s/Versions/%s" + + def "GET /api/MetadataResolvers/{resourceId}/Versions with non-existent resolver"() { + when: + def result = getAllMetadataResolverVersions('non-existent-resolver-id', String) + + then: + result.statusCodeValue == 404 + } + + def "GET /api/MetadataResolvers/{resourceId}/Versions with 1 resolver version"() { + given: + MetadataResolver mr = new LocalDynamicMetadataResolver(name: 'resolver') + repository.save(mr) + + when: + def result = getAllMetadataResolverVersions(mr.resourceId, List) + + then: + result.statusCodeValue == 200 + result.body.size == 1 + result.body[0].id && result.body[0].creator && result.body[0].date + } + + def "GET /api/MetadataResolvers/{resourceId}/Versions with 2 resolver versions"() { + given: + MetadataResolver mr = new FileBackedHttpMetadataResolver(name: 'resolver') + mr = repository.save(mr) + //Will create a second version for UPDATE revision + mr.name = 'resolverUPDATED' + repository.save(mr) + + when: + def result = getAllMetadataResolverVersions(mr.resourceId, List) + + then: + result.statusCodeValue == 200 + result.body.size == 2 + result.body[0].id < result.body[1].id + result.body[0].date < result.body[1].date + } + + def "GET /api/MetadataResolvers/{resourceId}/Versions/{version} for non existent version"() { + given: + MetadataResolver mr = new DynamicHttpMetadataResolver(name: 'resolver') + mr = repository.save(mr) + + when: + def result = getMetadataResolverForVersion(mr.resourceId, '1000', MetadataResolver) + + then: + result.statusCodeValue == 404 + } + + def "GET /api/MetadataResolvers/{resourceId}/Versions/{version} with 2 resolver versions returns correct resolver for specific version"() { + given: + MetadataResolver mr = new FilesystemMetadataResolver(name: 'resolver') + mr = repository.save(mr) + //Will create a second version for UPDATE revision + mr.name = 'resolverUPDATED' + repository.save(mr) + + when: + def allVersions = getAllMetadataResolverVersions(mr.resourceId, List) + def mrv1 = getMetadataResolverForVersion(mr.resourceId, allVersions.body[0].id, MetadataResolver) + def mrv2 = getMetadataResolverForVersion(mr.resourceId, allVersions.body[1].id, MetadataResolver) + + then: + mrv1.statusCodeValue == 200 + mrv1.body.name == 'resolver' + mrv2.statusCodeValue == 200 + mrv2.body.name == 'resolverUPDATED' + } + + private getAllMetadataResolverVersions(String resourceId, responseType) { + this.restTemplate.getForEntity(resourceUriFor(ALL_VERSIONS_URI, resourceId), responseType) + } + + private getMetadataResolverForVersion(String resourceId, String version, responseType) { + this.restTemplate.getForEntity(resourceUriFor(SPECIFIC_VERSION_URI, resourceId, version), responseType) + } + + private static resourceUriFor(String uriTemplate, String resourceId, String version) { + String.format(uriTemplate, resourceId, version) + } + + private static resourceUriFor(String uriTemplate, String resourceId) { + String.format(uriTemplate, resourceId) + } +} diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataFilterEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataFilterEnversVersioningTests.groovy index 05c8f5ea0..fe1e5eee4 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataFilterEnversVersioningTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataFilterEnversVersioningTests.groovy @@ -14,6 +14,7 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetada import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FilesystemMetadataResolver import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ResourceBackedMetadataResolver import edu.internet2.tier.shibboleth.admin.ui.repository.FilterRepository import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository @@ -22,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.domain.EntityScan import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest import org.springframework.data.jpa.repository.config.EnableJpaRepositories -import org.springframework.test.annotation.DirtiesContext import org.springframework.test.context.ContextConfiguration import org.springframework.transaction.PlatformTransactionManager import spock.lang.Specification @@ -99,7 +99,6 @@ class MetadataFilterEnversVersioningTests extends Specification { mrv3.metadataFilters[0].removeEmptyEntitiesDescriptors == false } - //@DirtiesContext def "test versioning of MetadataResolver with EntityAttributesFilter"() { when: 'Add initial filter' def mr = new FileBackedHttpMetadataResolver(name: 'resolver') @@ -145,7 +144,6 @@ class MetadataFilterEnversVersioningTests extends Specification { mrv3.metadataFilters[0].attributes[0].attributeValues[0].xsStringvalue == 'attr1, attr2' } - //@DirtiesContext def "test versioning of MetadataResolver with SignatureValidationFilter"() { when: 'Add initial filter' def mr = new DynamicHttpMetadataResolver(name: 'resolver') @@ -238,7 +236,6 @@ class MetadataFilterEnversVersioningTests extends Specification { mrv3.metadataFilters[0].maxValidityInterval == 'PT30S' } - @DirtiesContext def "test versioning of MetadataResolver with NameIdFormatFilter"() { when: 'Add initial filter' def mr = new ResourceBackedMetadataResolver(name: 'resolver') @@ -289,7 +286,7 @@ class MetadataFilterEnversVersioningTests extends Specification { def "test versioning of deleting a filter"() { when: 'Add initial filter' - def mr = new LocalDynamicMetadataResolver(name: 'resolver') + def mr = new MetadataResolver(name: 'resolver') def filter = new EntityRoleWhiteListFilter() mr.metadataFilters.add(filter) 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 952c118c2..dbdc0ddd1 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 @@ -5,10 +5,12 @@ 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.domain.resolvers.opensaml.OpenSamlChainingMetadataResolver; +import edu.internet2.tier.shibboleth.admin.ui.domain.versioning.Version; import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository; import edu.internet2.tier.shibboleth.admin.ui.service.IndexWriterService; import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolverConverterService; import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolverService; +import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolverVersionService; import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolversPositionOrderContainerService; import edu.internet2.tier.shibboleth.admin.util.OpenSamlChainingMetadataResolverUtil; import lombok.extern.slf4j.Slf4j; @@ -69,6 +71,9 @@ public class MetadataResolversController { @Autowired MetadataResolverConverterService metadataResolverConverterService; + @Autowired + MetadataResolverVersionService versionService; + @ExceptionHandler({InvalidTypeIdException.class, IOException.class, HttpMessageNotReadableException.class}) public ResponseEntity unableToParseJson(Exception ex) { return ResponseEntity.badRequest().body(new ErrorResponse(HttpStatus.BAD_REQUEST.toString(), ex.getMessage(), ex.getCause().getMessage())); @@ -149,6 +154,30 @@ public ResponseEntity update(@PathVariable String resourceId, @RequestBody Me return ResponseEntity.ok(persistedResolver); } + //Versioning endpoints + + @GetMapping("/MetadataResolvers/{resourceId}/Versions") + public ResponseEntity getAllVersions(@PathVariable String resourceId) { + MetadataResolver resolver = resolverRepository.findByResourceId(resourceId); + if (resolver == null) { + return ResponseEntity.notFound().build(); + } + List versions = versionService.findVersionsForMetadataResolver(resourceId); + if (versions.isEmpty()) { + return ResponseEntity.notFound().build(); + } + return ResponseEntity.ok(versions); + } + + @GetMapping("/MetadataResolvers/{resourceId}/Versions/{versionId}") + public ResponseEntity getSpecificVersion(@PathVariable String resourceId, @PathVariable String versionId) { + MetadataResolver resolver = versionService.findSpecificVersionOfMetadataResolver(resourceId, versionId); + if (resolver == null) { + return ResponseEntity.notFound().build(); + } + return ResponseEntity.ok(resolver); + } + @SuppressWarnings("Unchecked") private ResponseEntity validate(MetadataResolver metadataResolver) { ValidationResult validationResult = metadataResolverValidationService.validateIfNecessary(metadataResolver); @@ -159,6 +188,8 @@ private ResponseEntity validate(MetadataResolver metadataResolver) { return null; } + //Private methods + private static URI getResourceUriFor(MetadataResolver resolver) { return ServletUriComponentsBuilder .fromCurrentServletMapping().path("/api/MetadataResolvers/") diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java index ba1631ade..964ede86a 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java @@ -24,9 +24,9 @@ public EnversVersionServiceSupport(EntityManager entityManager) { this.entityManager = entityManager; } - public List findVersionsForPersistentEntity(String resourceId, Class enityClass) { + public List findVersionsForPersistentEntity(String resourceId, Class entityClass) { List revs = AuditReaderFactory.get(entityManager).createQuery() - .forRevisionsOfEntity(enityClass, false, false) + .forRevisionsOfEntity(entityClass, false, false) .add(AuditEntity.property("resourceId").eq(resourceId)) .getResultList(); From c1eb428c3d689dc1b1b129eea3f3faccbc4ebe73 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 28 Jun 2019 09:20:10 -0500 Subject: [PATCH 096/112] [SHIBUI-1263] remove Filter versioning since it is rolling up into the resolver --- docs/swagger.yaml | 65 ----------------------------------------------- 1 file changed, 65 deletions(-) diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 0022b801c..8b3566fc6 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -390,71 +390,6 @@ paths: '409': description: Already Exists deprecated: false - '/MetadataResolvers/{metadataResolverId}/Filters/{resourceId}/Versions': - get: - tags: - - metadata-filters-controller - description: Get list of Versions for an entity descriptor - produces: - - application/json - parameters: - - name: metadataResolverId - in: path - description: metadataResolverId - required: true - type: string - - name: resourceId - in: path - description: resourceId - required: true - type: string - responses: - '200': - description: OK. Items returned should be ordered by `date`, ascending (oldest version first). - schema: - type: array - items: - $ref: '#/definitions/Version' - '401': - description: Unauthorized - '403': - description: Forbidden - '404': - description: Not Found - '/MetadataResolvers/{metadataResolverId}/Filters/{resourceId}/Versions/{versionId}': - get: - tags: - - metadata-filters-controller - description: Get a Version of an entity descriptor - produces: - - application/json - parameters: - - name: metadataResolverId - in: path - description: metadataResolverId - required: true - type: string - - name: resourceId - in: path - description: resourceId - required: true - type: string - - name: versionId - in: path - description: versionId of a version of the EntityDescriptor - required: true - type: string - responses: - '200': - description: OK - schema: - $ref: '#/definitions/MetadataFilter' - '401': - description: Unauthorized - '403': - description: Forbidden - '404': - description: Not Found '/MetadataResolvers/{resourceId}': get: tags: From 5e05b015b375ca152e98289c6bdb3fb071dc82e3 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Mon, 1 Jul 2019 13:48:19 -0700 Subject: [PATCH 097/112] SHIBUI-1347 --- ui/package-lock.json | 569 ++++++++---------- ui/package.json | 1 + ui/src/app/app.component.scss | 4 +- .../component/metadata-header.component.html | 9 +- .../configuration/configuration.module.ts | 4 +- .../configuration/configuration.values.ts | 5 + .../container/configuration.component.html | 27 +- .../container/configuration.component.ts | 19 +- .../container/metadata-options.component.html | 4 +- .../effect/configuration.effect.ts | 6 + .../service/configuration.service.ts | 15 +- ui/src/styles.scss | 1 + ui/src/theme/bootstrap.scss | 2 +- ui/src/theme/breadcrumb.scss | 24 + 14 files changed, 351 insertions(+), 339 deletions(-) create mode 100644 ui/src/theme/breadcrumb.scss diff --git a/ui/package-lock.json b/ui/package-lock.json index 5b8942a76..25fad932c 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -3511,6 +3511,7 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -3582,9 +3583,9 @@ "dev": true }, "are-we-there-yet": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", - "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "requires": { "delegates": "^1.0.0", @@ -3717,9 +3718,9 @@ } }, "assert-plus": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", "dev": true }, "assign-symbols": { @@ -3796,16 +3797,17 @@ } }, "aws-sign2": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", "dev": true }, "aws4": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", - "dev": true + "dev": true, + "optional": true }, "axobject-query": { "version": "2.0.2", @@ -4164,15 +4166,6 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", "dev": true }, - "boom": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", - "dev": true, - "requires": { - "hoek": "2.x.x" - } - }, "bootstrap": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz", @@ -4759,6 +4752,7 @@ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", "dev": true, + "optional": true, "requires": { "delayed-stream": "~1.0.0" } @@ -5025,15 +5019,6 @@ "which": "^1.2.9" } }, - "cryptiles": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", - "dev": true, - "requires": { - "boom": "2.x.x" - } - }, "crypto-browserify": { "version": "3.12.0", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", @@ -6364,14 +6349,25 @@ "dev": true }, "form-data": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", - "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "dev": true, "requires": { "asynckit": "^0.4.0", - "combined-stream": "^1.0.5", + "combined-stream": "^1.0.6", "mime-types": "^2.1.12" + }, + "dependencies": { + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "requires": { + "delayed-stream": "~1.0.0" + } + } } }, "forwarded": { @@ -6472,7 +6468,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -6493,12 +6490,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6513,17 +6512,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -6640,7 +6642,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -6652,6 +6655,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6666,6 +6670,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -6673,12 +6678,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -6697,6 +6704,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -6777,7 +6785,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -6789,6 +6798,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -6874,7 +6884,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -6910,6 +6921,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -6929,6 +6941,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -6972,19 +6985,21 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, "fstream": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", - "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", + "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", "dev": true, "requires": { "graceful-fs": "^4.1.2", @@ -7016,29 +7031,14 @@ } }, "gaze": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz", - "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", + "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", "dev": true, "requires": { "globule": "^1.0.0" } }, - "generate-function": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", - "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=", - "dev": true - }, - "generate-object-property": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", - "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", - "dev": true, - "requires": { - "is-property": "^1.0.0" - } - }, "genfun": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz", @@ -7150,14 +7150,22 @@ } }, "globule": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz", - "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz", + "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", "dev": true, "requires": { "glob": "~7.1.1", - "lodash": "~4.17.4", + "lodash": "~4.17.10", "minimatch": "~3.0.2" + }, + "dependencies": { + "lodash": { + "version": "4.17.11", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", + "dev": true + } } }, "graceful-fs": { @@ -7273,29 +7281,58 @@ } }, "har-schema": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", - "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", "dev": true }, "har-validator": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", - "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", + "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", "dev": true, "requires": { - "ajv": "^4.9.1", - "har-schema": "^1.0.5" + "ajv": "^6.5.5", + "har-schema": "^2.0.0" }, "dependencies": { "ajv": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", + "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", "dev": true, "requires": { - "co": "^4.6.0", - "json-stable-stringify": "^1.0.1" + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true + }, + "uri-js": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "dev": true, + "requires": { + "punycode": "^2.1.0" } } } @@ -7431,18 +7468,6 @@ "minimalistic-assert": "^1.0.0" } }, - "hawk": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", - "dev": true, - "requires": { - "boom": "2.x.x", - "cryptiles": "2.x.x", - "hoek": "2.x.x", - "sntp": "1.x.x" - } - }, "he": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", @@ -7460,12 +7485,6 @@ "minimalistic-crypto-utils": "^1.0.1" } }, - "hoek": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "dev": true - }, "homedir-polyfill": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz", @@ -7963,12 +7982,12 @@ } }, "http-signature": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", - "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "dev": true, "requires": { - "assert-plus": "^0.2.0", + "assert-plus": "^1.0.0", "jsprim": "^1.2.2", "sshpk": "^1.7.0" } @@ -8332,25 +8351,6 @@ "is-extglob": "^2.1.1" } }, - "is-my-ip-valid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", - "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==", - "dev": true - }, - "is-my-json-valid": { - "version": "2.17.2", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz", - "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==", - "dev": true, - "requires": { - "generate-function": "^2.0.0", - "generate-object-property": "^1.1.0", - "is-my-ip-valid": "^1.0.0", - "jsonpointer": "^4.0.0", - "xtend": "^4.0.0" - } - }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", @@ -8416,12 +8416,6 @@ "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", "dev": true }, - "is-property": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", - "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=", - "dev": true - }, "is-regex": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", @@ -8928,9 +8922,9 @@ } }, "js-base64": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.3.tgz", - "integrity": "sha512-H7ErYLM34CvDMto3GbD6xD0JLUGYXR3QTcH6B/tr4Hi/QpSThnCsIp+Sy5FRTw3B0d6py4HcNkW7nO/wdtGWEw==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz", + "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==", "dev": true }, "js-tokens": { @@ -8980,15 +8974,6 @@ "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", "dev": true }, - "json-stable-stringify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", - "dev": true, - "requires": { - "jsonify": "~0.0.0" - } - }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", @@ -9016,24 +9001,12 @@ "graceful-fs": "^4.1.6" } }, - "jsonify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", - "dev": true - }, "jsonparse": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=", "dev": true }, - "jsonpointer": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", - "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", - "dev": true - }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", @@ -9329,7 +9302,8 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==", - "dev": true + "dev": true, + "optional": true }, "http-signature": { "version": "1.2.0", @@ -9484,12 +9458,6 @@ "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", "dev": true }, - "lodash.assign": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", - "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", - "dev": true - }, "lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", @@ -9512,12 +9480,6 @@ "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=" }, - "lodash.mergewith": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", - "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", - "dev": true - }, "lodash.tail": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", @@ -9583,7 +9545,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "dev": true, + "optional": true }, "loose-envify": { "version": "1.3.1", @@ -10282,20 +10245,19 @@ "dev": true }, "node-gyp": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz", - "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", + "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", "dev": true, "requires": { "fstream": "^1.0.0", "glob": "^7.0.3", "graceful-fs": "^4.1.2", - "minimatch": "^3.0.2", "mkdirp": "^0.5.0", "nopt": "2 || 3", "npmlog": "0 || 1 || 2 || 3 || 4", "osenv": "0", - "request": "2", + "request": "^2.87.0", "rimraf": "2", "semver": "~5.3.0", "tar": "^2.0.0", @@ -10342,9 +10304,9 @@ } }, "node-sass": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.0.tgz", - "integrity": "sha512-QFHfrZl6lqRU3csypwviz2XLgGNOoWQbo2GOvtsfQqOfL4cy1BtWnhx/XUeAO9LT3ahBzSRXcEO6DdvAH9DzSg==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz", + "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==", "dev": true, "requires": { "async-foreach": "^0.1.3", @@ -10354,15 +10316,13 @@ "get-stdin": "^4.0.1", "glob": "^7.0.3", "in-publish": "^2.0.0", - "lodash.assign": "^4.2.0", - "lodash.clonedeep": "^4.3.2", - "lodash.mergewith": "^4.6.0", + "lodash": "^4.17.11", "meow": "^3.7.0", "mkdirp": "^0.5.1", - "nan": "^2.10.0", - "node-gyp": "^3.3.1", + "nan": "^2.13.2", + "node-gyp": "^3.8.0", "npmlog": "^4.0.0", - "request": "~2.79.0", + "request": "^2.88.0", "sass-graph": "^2.2.4", "stdout-stream": "^1.4.0", "true-case-path": "^1.0.2" @@ -10374,12 +10334,6 @@ "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", "dev": true }, - "caseless": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", - "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", - "dev": true - }, "chalk": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", @@ -10393,69 +10347,23 @@ "supports-color": "^2.0.0" } }, - "har-validator": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", - "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", - "dev": true, - "requires": { - "chalk": "^1.1.1", - "commander": "^2.9.0", - "is-my-json-valid": "^2.12.4", - "pinkie-promise": "^2.0.0" - } - }, - "nan": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", - "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", + "lodash": { + "version": "4.17.11", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", "dev": true }, - "qs": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz", - "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=", + "nan": { + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", + "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", "dev": true }, - "request": { - "version": "2.79.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", - "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", - "dev": true, - "requires": { - "aws-sign2": "~0.6.0", - "aws4": "^1.2.1", - "caseless": "~0.11.0", - "combined-stream": "~1.0.5", - "extend": "~3.0.0", - "forever-agent": "~0.6.1", - "form-data": "~2.1.1", - "har-validator": "~2.0.6", - "hawk": "~3.1.3", - "http-signature": "~1.1.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.7", - "oauth-sign": "~0.8.1", - "qs": "~6.3.0", - "stringstream": "~0.0.4", - "tough-cookie": "~2.3.0", - "tunnel-agent": "~0.4.1", - "uuid": "^3.0.0" - } - }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true - }, - "tunnel-agent": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", - "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", - "dev": true } } }, @@ -10626,7 +10534,8 @@ "version": "0.8.2", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -11286,9 +11195,9 @@ } }, "performance-now": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", - "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "dev": true }, "pify": { @@ -11560,6 +11469,12 @@ "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", "dev": true }, + "psl": { + "version": "1.1.33", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.33.tgz", + "integrity": "sha512-LTDP2uSrsc7XCb5lO7A8BI1qYxRe/8EqlRvMeEl6rsnYAqDOl8xHR+8lSAIVfrNaSAlTPTNOCgNjWcoUL3AZsw==", + "dev": true + }, "public-encrypt": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz", @@ -11607,9 +11522,9 @@ "dev": true }, "qs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", - "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", "dev": true }, "querystring": { @@ -11892,33 +11807,97 @@ } }, "request": { - "version": "2.81.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", - "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "version": "2.88.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", + "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", "dev": true, "requires": { - "aws-sign2": "~0.6.0", - "aws4": "^1.2.1", + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", "caseless": "~0.12.0", - "combined-stream": "~1.0.5", - "extend": "~3.0.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", "forever-agent": "~0.6.1", - "form-data": "~2.1.1", - "har-validator": "~4.2.1", - "hawk": "~3.1.3", - "http-signature": "~1.1.0", + "form-data": "~2.3.2", + "har-validator": "~5.1.0", + "http-signature": "~1.2.0", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.7", - "oauth-sign": "~0.8.1", - "performance-now": "^0.2.0", - "qs": "~6.4.0", - "safe-buffer": "^5.0.1", - "stringstream": "~0.0.4", - "tough-cookie": "~2.3.0", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.4.3", "tunnel-agent": "^0.6.0", - "uuid": "^3.0.0" + "uuid": "^3.3.2" + }, + "dependencies": { + "aws4": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", + "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", + "dev": true + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true + }, + "mime-db": { + "version": "1.40.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==", + "dev": true + }, + "mime-types": { + "version": "2.1.24", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "dev": true, + "requires": { + "mime-db": "1.40.0" + } + }, + "oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "dev": true + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + }, + "tough-cookie": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", + "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "dev": true, + "requires": { + "psl": "^1.1.24", + "punycode": "^1.4.1" + } + }, + "uuid": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", + "dev": true + } } }, "require-directory": { @@ -12487,15 +12466,6 @@ "kind-of": "^3.2.0" } }, - "sntp": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", - "dev": true, - "requires": { - "hoek": "2.x.x" - } - }, "socket.io": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz", @@ -12846,9 +12816,9 @@ "dev": true }, "stdout-stream": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz", - "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", + "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", "dev": true, "requires": { "readable-stream": "^2.0.1" @@ -12953,7 +12923,8 @@ "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", - "dev": true + "dev": true, + "optional": true }, "strip-ansi": { "version": "3.0.1", @@ -13082,13 +13053,13 @@ "dev": true }, "tar": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", + "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", "dev": true, "requires": { "block-stream": "*", - "fstream": "^1.0.2", + "fstream": "^1.0.12", "inherits": "2" } }, @@ -13203,6 +13174,7 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", "dev": true, + "optional": true, "requires": { "punycode": "^1.4.1" } @@ -13226,27 +13198,12 @@ "dev": true }, "true-case-path": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz", - "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", + "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", "dev": true, "requires": { - "glob": "^6.0.4" - }, - "dependencies": { - "glob": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", - "dev": true, - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } + "glob": "^7.1.2" } }, "tryer": { @@ -15429,12 +15386,12 @@ "dev": true }, "wide-align": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", - "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "requires": { - "string-width": "^1.0.2" + "string-width": "^1.0.2 || 2" } }, "window-size": { diff --git a/ui/package.json b/ui/package.json index 9881e1fb7..b293be085 100644 --- a/ui/package.json +++ b/ui/package.json @@ -73,6 +73,7 @@ "karma-jasmine-html-reporter": "^1.4.2", "karma-spec-reporter": "0.0.32", "ncp": "^2.0.0", + "node-sass": "^4.12.0", "path": "^0.12.7", "ts-node": "~3.2.0", "tslint": "~5.3.2", diff --git a/ui/src/app/app.component.scss b/ui/src/app/app.component.scss index fcee7de97..6d1c6d0a1 100644 --- a/ui/src/app/app.component.scss +++ b/ui/src/app/app.component.scss @@ -16,12 +16,12 @@ nav.navbar { @media only screen and (min-width: 1024px) { .pad-content { - padding: 1rem 3rem; + padding: 0 3rem; } } @media only screen and (min-width: 1200px) { .pad-content { - padding: 2rem 5rem; + padding: 0 5rem; } } diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.html b/ui/src/app/metadata/configuration/component/metadata-header.component.html index 19f183ba8..4da057c91 100644 --- a/ui/src/app/metadata/configuration/component/metadata-header.component.html +++ b/ui/src/app/metadata/configuration/component/metadata-header.component.html @@ -1,18 +1,15 @@
-

- Version {{ versionNumber }} -

-

+

Saved  {{ version.date | date }}, by  {{ version.creator }} -

+

Enabled -   Disabled +   Current

diff --git a/ui/src/app/metadata/configuration/configuration.module.ts b/ui/src/app/metadata/configuration/configuration.module.ts index 9aa2cf880..dc291952c 100644 --- a/ui/src/app/metadata/configuration/configuration.module.ts +++ b/ui/src/app/metadata/configuration/configuration.module.ts @@ -23,6 +23,7 @@ import { MetadataHistoryEffects } from './effect/history.effect'; import { MetadataHistoryService } from './service/history.service'; import { MetadataHistoryComponent } from './container/metadata-history.component'; import { HistoryListComponent } from './component/history-list.component'; +import { DomainModule } from '../domain/domain.module'; @NgModule({ declarations: [ @@ -43,7 +44,8 @@ import { HistoryListComponent } from './component/history-list.component'; CommonModule, I18nModule, NgbPopoverModule, - RouterModule + RouterModule, + DomainModule ], exports: [], providers: [] diff --git a/ui/src/app/metadata/configuration/configuration.values.ts b/ui/src/app/metadata/configuration/configuration.values.ts index c7f696eae..383486cfd 100644 --- a/ui/src/app/metadata/configuration/configuration.values.ts +++ b/ui/src/app/metadata/configuration/configuration.values.ts @@ -5,6 +5,11 @@ export enum PATHS { provider = 'MetadataResolvers' } +export enum TYPES { + resolver = 'resolver', + provider = 'provider' +} + export const DEFINITIONS = { resolver: MetadataSourceEditor }; diff --git a/ui/src/app/metadata/configuration/container/configuration.component.html b/ui/src/app/metadata/configuration/container/configuration.component.html index 36626f240..e4709611b 100644 --- a/ui/src/app/metadata/configuration/container/configuration.component.html +++ b/ui/src/app/metadata/configuration/container/configuration.component.html @@ -1,16 +1,19 @@
-
-
-
-
- - - Metadata resolver history - -
-
-
-
+
+
+ +

Source Configuration

diff --git a/ui/src/app/metadata/configuration/container/configuration.component.ts b/ui/src/app/metadata/configuration/container/configuration.component.ts index 2c49c0961..357d745fd 100644 --- a/ui/src/app/metadata/configuration/container/configuration.component.ts +++ b/ui/src/app/metadata/configuration/container/configuration.component.ts @@ -1,12 +1,12 @@ -import { Store } from '@ngrx/store'; import { Component, ChangeDetectionStrategy, OnDestroy } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { takeUntil, map, withLatestFrom, filter } from 'rxjs/operators'; +import { Store } from '@ngrx/store'; import { Observable, Subject } from 'rxjs'; -import { ActivatedRoute, Params } from '@angular/router'; import * as fromConfiguration from '../reducer'; -import { MetadataConfiguration } from '../model/metadata-configuration'; -import { takeUntil, map, withLatestFrom, filter } from 'rxjs/operators'; -import { LoadMetadataRequest, ClearConfiguration, LoadXmlRequest } from '../action/configuration.action'; + +import { LoadMetadataRequest, ClearConfiguration } from '../action/configuration.action'; import { LoadHistoryRequest, ClearHistory, SelectVersion } from '../action/history.action'; import * as fromReducer from '../reducer'; @@ -19,6 +19,8 @@ import * as fromReducer from '../reducer'; export class ConfigurationComponent implements OnDestroy { private ngUnsubscribe: Subject = new Subject(); + name$: Observable; + constructor( private store: Store, private routerState: ActivatedRoute @@ -49,6 +51,13 @@ export class ConfigurationComponent implements OnDestroy { this.store.dispatch(new SelectVersion(version)); } }); + + this.name$ = this.store + .select(fromReducer.getConfigurationModel) + .pipe( + filter(model => !!model), + map(model => model ? ('serviceProviderName' in model) ? model.serviceProviderName : model.name : false) + ); } ngOnDestroy() { diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.html b/ui/src/app/metadata/configuration/container/metadata-options.component.html index 9c4dbb489..0825b10d4 100644 --- a/ui/src/app/metadata/configuration/container/metadata-options.component.html +++ b/ui/src/app/metadata/configuration/container/metadata-options.component.html @@ -4,11 +4,13 @@ [version]="version$ | async" [versionNumber]="versionNumber$ | async" [isCurrent]="isCurrent$ | async"> -
+
+
Options XML diff --git a/ui/src/app/metadata/configuration/effect/configuration.effect.ts b/ui/src/app/metadata/configuration/effect/configuration.effect.ts index ff76c8125..b9a9c7181 100644 --- a/ui/src/app/metadata/configuration/effect/configuration.effect.ts +++ b/ui/src/app/metadata/configuration/effect/configuration.effect.ts @@ -44,6 +44,12 @@ export class MetadataConfigurationEffects { ) ); + @Effect({dispatch: false}) + loadMetadataError$ = this.actions$.pipe( + ofType(ConfigurationActionTypes.LOAD_METADATA_ERROR), + tap(action => console.log(action)) + ); + @Effect() loadMetadataXml$ = this.actions$.pipe( ofType(ConfigurationActionTypes.LOAD_METADATA_REQUEST), diff --git a/ui/src/app/metadata/configuration/service/configuration.service.ts b/ui/src/app/metadata/configuration/service/configuration.service.ts index ee0093b36..c361037e0 100644 --- a/ui/src/app/metadata/configuration/service/configuration.service.ts +++ b/ui/src/app/metadata/configuration/service/configuration.service.ts @@ -1,24 +1,29 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { Observable, of } from 'rxjs'; +import { Observable, of, throwError } from 'rxjs'; import { Metadata } from '../../domain/domain.type'; import { Wizard } from '../../../wizard/model'; import { MetadataSourceEditor } from '../../domain/model/wizards/metadata-source-editor'; import { MetadataProviderEditorTypes } from '../../provider/model'; import { Schema } from '../model/schema'; -import { PATHS } from '../configuration.values'; +import { TYPES } from '../configuration.values'; +import { ResolverService } from '../../domain/service/resolver.service'; @Injectable() export class MetadataConfigurationService { - readonly base = '/api'; - constructor( + private resolverService: ResolverService, private http: HttpClient ) {} find(id: string, type: string): Observable { - return this.http.get(`${this.base}/${PATHS[type]}/${id}`); + switch (type) { + case TYPES.resolver: + return this.resolverService.find(id); + default: + return throwError(new Error('Type not supported')); + } } getDefinition(type: string): Wizard { diff --git a/ui/src/styles.scss b/ui/src/styles.scss index a3f814d8a..e63d38251 100644 --- a/ui/src/styles.scss +++ b/ui/src/styles.scss @@ -1,4 +1,5 @@ @import './theme/bootstrap'; +@import './theme/breadcrumb'; @import './theme/buttons'; @import './theme/forms'; @import './theme/modal'; diff --git a/ui/src/theme/bootstrap.scss b/ui/src/theme/bootstrap.scss index b1067e04e..7683e1dad 100644 --- a/ui/src/theme/bootstrap.scss +++ b/ui/src/theme/bootstrap.scss @@ -23,7 +23,7 @@ @import "~bootstrap/scss/nav"; @import "~bootstrap/scss/navbar"; @import "~bootstrap/scss/card"; -// @import "~bootstrap/scss/breadcrumb"; +@import "~bootstrap/scss/breadcrumb"; @import "~bootstrap/scss/pagination"; @import "~bootstrap/scss/badge"; // @import "~bootstrap/scss/jumbotron"; diff --git a/ui/src/theme/breadcrumb.scss b/ui/src/theme/breadcrumb.scss new file mode 100644 index 000000000..f1e5a6c93 --- /dev/null +++ b/ui/src/theme/breadcrumb.scss @@ -0,0 +1,24 @@ +.breadcrumb-bar { + $default-color: $gray-400; + + padding: 0; + margin: 1rem 0; + background: none; + border-radius: 0; + padding: 0.375rem 0; + border-bottom: 1px solid $gray-600; + /* + &, & > .breadcrumb-item.active { + color: $default-color; + } + > .breadcrumb-item > a { + color: $white; + } + + & > .breadcrumb-item + .breadcrumb-item { + &::before { + color: $default-color; + } + } + */ +} \ No newline at end of file From e9278dec9a1b19c08fbf19d98057acff6a363ad1 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 1 Jul 2019 16:07:57 -0400 Subject: [PATCH 098/112] SHIBUI-1337 --- ...EntityDescriptorVersionServiceTests.groovy | 3 +- ...MetadataResolverVersionServiceTests.groovy | 4 +- .../EnversVersioningMetadataTests.groovy | 84 +++++++++++++++++++ .../EntitiesVersioningConfiguration.java | 2 +- .../admin/ui/domain/AbstractAuditable.java | 21 +++++ .../envers/EnversVersionServiceSupport.java | 12 ++- .../envers/PrincipalAwareRevisionEntity.java | 1 - .../ui/security/DefaultAuditorAware.java | 7 +- .../EnversEntityDescriptorVersionService.java | 61 ++------------ .../ui/configuration/TestConfiguration.groovy | 7 ++ .../envers/EnversTestsSupport.groovy | 4 + .../shibui/pac4j/Pac4jAuditorAware.java | 5 +- 12 files changed, 142 insertions(+), 69 deletions(-) create mode 100644 backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversVersioningMetadataTests.groovy diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy index ac5a4d129..0289be502 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy @@ -13,12 +13,12 @@ import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorVersionSer import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.domain.EntityScan import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest +import org.springframework.data.jpa.repository.config.EnableJpaAuditing import org.springframework.data.jpa.repository.config.EnableJpaRepositories import org.springframework.test.context.ContextConfiguration import org.springframework.transaction.PlatformTransactionManager import spock.lang.Specification -import java.time.LocalDateTime import java.time.ZonedDateTime @@ -26,6 +26,7 @@ import java.time.ZonedDateTime @ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration, EntitiesVersioningConfiguration]) @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") +@EnableJpaAuditing class EnversEntityDescriptorVersionServiceTests extends Specification { @Autowired diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversMetadataResolverVersionServiceTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversMetadataResolverVersionServiceTests.groovy index 8f68922ed..97b37f10e 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversMetadataResolverVersionServiceTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversMetadataResolverVersionServiceTests.groovy @@ -6,7 +6,6 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.EntitiesVersioningCo import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration -import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FilesystemMetadataResolver import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver @@ -18,12 +17,12 @@ import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolverVersionSer import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.domain.EntityScan import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest +import org.springframework.data.jpa.repository.config.EnableJpaAuditing import org.springframework.data.jpa.repository.config.EnableJpaRepositories import org.springframework.test.context.ContextConfiguration import org.springframework.transaction.PlatformTransactionManager import spock.lang.Specification -import java.time.LocalDateTime import java.time.ZonedDateTime @@ -31,6 +30,7 @@ import java.time.ZonedDateTime @ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration, EntitiesVersioningConfiguration]) @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") +@EnableJpaAuditing class EnversMetadataResolverVersionServiceTests extends Specification { @Autowired diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversVersioningMetadataTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversVersioningMetadataTests.groovy new file mode 100644 index 000000000..c4e677c57 --- /dev/null +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversVersioningMetadataTests.groovy @@ -0,0 +1,84 @@ +package edu.internet2.tier.shibboleth.admin.ui.service.envers + +import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.EntitiesVersioningConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration +import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository +import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository +import edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport +import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorVersionService +import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolverVersionService +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.autoconfigure.domain.EntityScan +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest +import org.springframework.data.jpa.repository.config.EnableJpaAuditing +import org.springframework.data.jpa.repository.config.EnableJpaRepositories +import org.springframework.test.context.ContextConfiguration +import org.springframework.transaction.PlatformTransactionManager +import spock.lang.Specification + +@DataJpaTest +@ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, TestConfiguration, SearchConfiguration, EntitiesVersioningConfiguration]) +@EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) +@EntityScan("edu.internet2.tier.shibboleth.admin.ui") +@EnableJpaAuditing +class EnversVersioningMetadataTests extends Specification { + + @Autowired + MetadataResolverVersionService metadataResolverVersionService + + @Autowired + MetadataResolverRepository metadataResolverRepository + + @Autowired + EntityDescriptorVersionService entityDescriptorVersionService + + @Autowired + EntityDescriptorRepository entityDescriptorRepository + + @Autowired + PlatformTransactionManager txMgr + + def "versioning service uses versioning metadata from target entities enhanced by boot auditing facility"() { + when: 'Initial versions' + MetadataResolver mr = new LocalDynamicMetadataResolver(name: 'resolver') + EntityDescriptor ed = new EntityDescriptor(serviceProviderName: 'descriptor') + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + ed = EnversTestsSupport.doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(ed) + } + def mrVersions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + def edVersions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) + + then: + mrVersions[0].creator == mr.createdBy + mrVersions[0].date == mr.createdDateAsZonedDateTime() + edVersions[0].creator == ed.createdBy + edVersions[0].date == ed.createdDateAsZonedDateTime() + + when: 'new version due to update' + mr.name = 'UPDATED' + ed.serviceProviderName = 'UPDATED' + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + ed = EnversTestsSupport.doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(ed) + } + mrVersions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + edVersions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) + + then: + mrVersions[1].creator == mr.modifiedBy + mrVersions[1].date == mr.modifiedDateAsZonedDateTime() + edVersions[1].creator == ed.modifiedBy + edVersions[1].date == ed.modifiedDateAsZonedDateTime() + } +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java index ec21d42c4..9341a45c2 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EntitiesVersioningConfiguration.java @@ -20,7 +20,7 @@ public class EntitiesVersioningConfiguration { @Bean public EntityDescriptorVersionService entityDescriptorVersionService(EntityDescriptorService entityDescriptorService) { - return new EnversEntityDescriptorVersionService(entityManager, entityDescriptorService); + return new EnversEntityDescriptorVersionService(enversVersionServiceSupport(), entityDescriptorService); } @Bean diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java index 567a6637e..24731b6f3 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java @@ -17,7 +17,12 @@ import javax.persistence.Id; import javax.persistence.MappedSuperclass; import javax.validation.constraints.NotNull; +import java.time.Instant; import java.time.LocalDateTime; +import java.time.OffsetDateTime; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; @MappedSuperclass @@ -94,4 +99,20 @@ public String getModifiedBy() { public void setModifiedBy(String modifiedBy) { this.modifiedBy = modifiedBy; } + + public ZonedDateTime createdDateAsZonedDateTime() { + return toZonedDateTime(this.createdDate); + } + + public ZonedDateTime modifiedDateAsZonedDateTime() { + return toZonedDateTime(this.modifiedDate); + } + + private static ZonedDateTime toZonedDateTime(LocalDateTime localDateTime) { + return localDateTime + .atZone(ZoneId.systemDefault()) + .toInstant() + .atOffset(ZoneOffset.UTC) + .toZonedDateTime(); + } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java index 964ede86a..b12d943fc 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java @@ -1,5 +1,6 @@ package edu.internet2.tier.shibboleth.admin.ui.envers; +import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable; import edu.internet2.tier.shibboleth.admin.ui.domain.versioning.Version; import org.hibernate.envers.AuditReaderFactory; import org.hibernate.envers.query.AuditEntity; @@ -31,14 +32,11 @@ public List findVersionsForPersistentEntity(String resourceId, Class .getResultList(); Object listOfVersions = revs.stream() - .map(it -> ((Object[]) it)[1]) + //.map(it -> ((Object[]) it)) .map(it -> { - return new Version(((PrincipalAwareRevisionEntity) it).idAsString(), - ((PrincipalAwareRevisionEntity) it).getPrincipalUserName(), - ((PrincipalAwareRevisionEntity) it).getRevisionDate() - .toInstant() - .atOffset(ZoneOffset.UTC) - .toZonedDateTime()); + return new Version(((PrincipalAwareRevisionEntity) ((Object[]) it)[1]).idAsString(), + ((AbstractAuditable) ((Object[]) it)[0]).getModifiedBy(), + ((AbstractAuditable) ((Object[]) it)[0]).modifiedDateAsZonedDateTime()); }) .sorted(comparing(Version::getDate)) .collect(toList()); diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/PrincipalAwareRevisionEntity.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/PrincipalAwareRevisionEntity.java index 6a2847b38..e0aef8807 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/PrincipalAwareRevisionEntity.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/PrincipalAwareRevisionEntity.java @@ -2,7 +2,6 @@ import lombok.Getter; import lombok.Setter; -import org.hibernate.envers.DefaultRevisionEntity; import org.hibernate.envers.DefaultTrackingModifiedEntitiesRevisionEntity; import org.hibernate.envers.RevisionEntity; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/DefaultAuditorAware.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/DefaultAuditorAware.java index 080b4312d..9ec1a7eb7 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/DefaultAuditorAware.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/DefaultAuditorAware.java @@ -3,7 +3,6 @@ import org.springframework.data.domain.AuditorAware; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.User; import java.util.Optional; @@ -16,12 +15,14 @@ */ public class DefaultAuditorAware implements AuditorAware { + private static final String ANONYMOUS = "anonymousUser"; + @Override public Optional getCurrentAuditor() { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); if (authentication == null || !authentication.isAuthenticated()) { - return Optional.empty(); + return Optional.of(ANONYMOUS); } - return Optional.of(User.class.cast(authentication.getPrincipal()).getUsername()); + return Optional.of(authentication.getName()); } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java index f21d9d227..2bfced24d 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java @@ -3,77 +3,32 @@ 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.envers.PrincipalAwareRevisionEntity; -import org.hibernate.envers.AuditReader; -import org.hibernate.envers.AuditReaderFactory; -import org.hibernate.envers.RevisionEntity; -import org.hibernate.envers.query.AuditEntity; -import org.springframework.data.jpa.repository.JpaContext; +import edu.internet2.tier.shibboleth.admin.ui.envers.EnversVersionServiceSupport; -import javax.persistence.EntityManager; -import javax.persistence.NoResultException; -import javax.persistence.PersistenceContext; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.ZoneOffset; -import java.util.Arrays; -import java.util.Comparator; import java.util.List; -import java.util.stream.Collectors; - -import static java.util.Comparator.comparing; -import static java.util.stream.Collectors.toList; /** - * Hibernate Envers based implementation of {@link EntityDescriptorVersionService}. - * TODO: refactor this implementation using EnversVersionServiceSupport class + * Hibernate Envers based implementation of {@link EntityDescriptorVersionService}.* */ public class EnversEntityDescriptorVersionService implements EntityDescriptorVersionService { - private EntityManager entityManager; + private EnversVersionServiceSupport enversVersionServiceSupport; private EntityDescriptorService entityDescriptorService; - public EnversEntityDescriptorVersionService(EntityManager entityManager, EntityDescriptorService entityDescriptorService) { - this.entityManager = entityManager; + public EnversEntityDescriptorVersionService(EnversVersionServiceSupport enversVersionServiceSupport, EntityDescriptorService entityDescriptorService) { + this.enversVersionServiceSupport = enversVersionServiceSupport; this.entityDescriptorService = entityDescriptorService; } @Override public List findVersionsForEntityDescriptor(String resourceId) { - List revs = AuditReaderFactory.get(entityManager).createQuery() - .forRevisionsOfEntity(EntityDescriptor.class, false, false) - .add(AuditEntity.property("resourceId").eq(resourceId)) - .getResultList(); - - Object listOfVersions = revs.stream() - .map(it -> ((Object[])it)[1]) - .map(it -> { - return new Version(((PrincipalAwareRevisionEntity) it).idAsString(), - ((PrincipalAwareRevisionEntity) it).getPrincipalUserName(), - ((PrincipalAwareRevisionEntity) it).getRevisionDate() - .toInstant() - .atOffset(ZoneOffset.UTC) - .toZonedDateTime()); - }) - .sorted(comparing(Version::getDate)) - .collect(toList()); - - return (List)listOfVersions; + return enversVersionServiceSupport.findVersionsForPersistentEntity(resourceId, EntityDescriptor.class); } @Override public EntityDescriptorRepresentation findSpecificVersionOfEntityDescriptor(String resourceId, String versionId) { - try { - Object revision = AuditReaderFactory.get(entityManager).createQuery() - .forEntitiesAtRevision(EntityDescriptor.class, Integer.valueOf(versionId)) - .add(AuditEntity.property("resourceId").eq(resourceId)) - .add(AuditEntity.revisionNumber().eq(Integer.valueOf(versionId))) - .getSingleResult(); - return entityDescriptorService.createRepresentationFromDescriptor((EntityDescriptor) revision); - } - catch (NoResultException e) { - return null; - } + Object edObject = enversVersionServiceSupport.findSpecificVersionOfPersistentEntity(resourceId, versionId, EntityDescriptor.class); + return edObject == null ? null : entityDescriptorService.createRepresentationFromDescriptor((EntityDescriptor) edObject); } } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy index a01645a09..676547ffd 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy @@ -3,6 +3,7 @@ package edu.internet2.tier.shibboleth.admin.ui.configuration import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.opensaml.OpenSamlChainingMetadataResolver import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository +import edu.internet2.tier.shibboleth.admin.ui.security.DefaultAuditorAware import edu.internet2.tier.shibboleth.admin.ui.service.IndexWriterService import net.shibboleth.ext.spring.resource.ResourceHelper import net.shibboleth.utilities.java.support.component.ComponentInitializationException @@ -20,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration import org.springframework.core.io.ClassPathResource +import org.springframework.data.domain.AuditorAware import org.springframework.mail.javamail.JavaMailSender import org.springframework.mail.javamail.JavaMailSenderImpl @@ -87,4 +89,9 @@ class TestConfiguration { metadataResolver.initialize() return metadataResolver } + + @Bean + AuditorAware defaultAuditorAware() { + return new DefaultAuditorAware() + } } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy index 2052cf9d1..cd1bb58b5 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy @@ -13,6 +13,10 @@ import org.springframework.transaction.PlatformTransactionManager import org.springframework.transaction.support.DefaultTransactionDefinition import javax.persistence.EntityManager +import java.time.LocalDateTime +import java.time.ZoneId +import java.time.ZoneOffset +import java.time.ZonedDateTime import static org.springframework.transaction.TransactionDefinition.PROPAGATION_REQUIRES_NEW diff --git a/pac4j-module/src/main/java/net/unicon/shibui/pac4j/Pac4jAuditorAware.java b/pac4j-module/src/main/java/net/unicon/shibui/pac4j/Pac4jAuditorAware.java index 0fe287c7e..47332d43b 100644 --- a/pac4j-module/src/main/java/net/unicon/shibui/pac4j/Pac4jAuditorAware.java +++ b/pac4j-module/src/main/java/net/unicon/shibui/pac4j/Pac4jAuditorAware.java @@ -7,11 +7,14 @@ import java.util.Optional; public class Pac4jAuditorAware implements AuditorAware { + + private static final String ANONYMOUS = "anonymousUser"; + @Override public Optional getCurrentAuditor() { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); if (authentication == null) { - return Optional.empty(); + return Optional.of(ANONYMOUS); } return Optional.of(authentication.getName()); } From 1abd039def1ed01075504b5b9b76727e25708e7c Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Tue, 2 Jul 2019 14:12:33 -0400 Subject: [PATCH 099/112] SHIBUI-1337 --- ...lerVersionEndpointsIntegrationTests.groovy | 6 +-- .../EnversVersioningMetadataTests.groovy | 43 +++++++++++++++++++ .../admin/ui/domain/AbstractAuditable.java | 16 ++++++- .../EntityDescriptorRepresentation.java | 14 ++++++ .../envers/EnversVersionServiceSupport.java | 22 ++++++++-- .../JPAEntityDescriptorServiceImpl.java | 1 + .../VersionJsonSerializationBasicTests.groovy | 6 ++- 7 files changed, 99 insertions(+), 9 deletions(-) diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy index 705f50021..99b5810ce 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy @@ -36,7 +36,7 @@ class EntityDescriptorControllerVersionEndpointsIntegrationTests extends Specifi result.statusCodeValue == 404 } - def "GET /api/EntityDescriptor{resourceId}/Versions with 1 entity descriptor version"() { + def "GET /api/EntityDescriptor/{resourceId}/Versions with 1 entity descriptor version"() { given: EntityDescriptor ed = new EntityDescriptor(entityID: 'http://test/controller', createdBy: 'anonymousUser') entityDescriptorRepository.save(ed) @@ -50,7 +50,7 @@ class EntityDescriptorControllerVersionEndpointsIntegrationTests extends Specifi result.body[0].id && result.body[0].creator && result.body[0].date } - def "GET /api/EntityDescriptor{resourceId}/Versions with 2 entity descriptor versions"() { + def "GET /api/EntityDescriptor/{resourceId}/Versions with 2 entity descriptor versions"() { given: EntityDescriptor ed = new EntityDescriptor(entityID: 'http://test/controller', createdBy: 'anonymousUser') ed = entityDescriptorRepository.save(ed) @@ -68,7 +68,7 @@ class EntityDescriptorControllerVersionEndpointsIntegrationTests extends Specifi result.body[0].date < result.body[1].date } - def "GET /api/EntityDescriptor{resourceId}/Versions/{version} for non existent version"() { + def "GET /api/EntityDescriptor/{resourceId}/Versions/{version} for non existent version"() { given: EntityDescriptor ed = new EntityDescriptor(entityID: 'http://test/controller', createdBy: 'anonymousUser') ed = entityDescriptorRepository.save(ed) diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversVersioningMetadataTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversVersioningMetadataTests.groovy index c4e677c57..9eed8e2bc 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversVersioningMetadataTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversVersioningMetadataTests.groovy @@ -6,6 +6,7 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.Internationalization import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository @@ -81,4 +82,46 @@ class EnversVersioningMetadataTests extends Specification { edVersions[1].creator == ed.modifiedBy edVersions[1].date == ed.modifiedDateAsZonedDateTime() } + + def "test current version correct logic"() { + when: 'Initial versions' + MetadataResolver mr = new DynamicHttpMetadataResolver(name: 'resolver') + EntityDescriptor ed = new EntityDescriptor(serviceProviderName: 'descriptor') + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + ed = EnversTestsSupport.doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(ed) + } + def mrVersions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + def edVersions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) + def mrV1 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, mrVersions[0].id) + def edV1 = entityDescriptorVersionService.findSpecificVersionOfEntityDescriptor(ed.resourceId, edVersions[0].id) + + then: + mrV1.isCurrent() + edV1.isCurrent() + + when: 'new version due to update' + mr.name = 'UPDATED' + ed.serviceProviderName = 'UPDATED' + mr = EnversTestsSupport.doInExplicitTransaction(txMgr) { + metadataResolverRepository.save(mr) + } + ed = EnversTestsSupport.doInExplicitTransaction(txMgr) { + entityDescriptorRepository.save(ed) + } + mrVersions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId) + edVersions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId) + mrV1 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, mrVersions[0].id) + edV1 = entityDescriptorVersionService.findSpecificVersionOfEntityDescriptor(ed.resourceId, edVersions[0].id) + def mrV2 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, mrVersions[1].id) + def edV2 = entityDescriptorVersionService.findSpecificVersionOfEntityDescriptor(ed.resourceId, edVersions[1].id) + + then: + !mrV1.isCurrent() + !edV1.isCurrent() + mrV2.isCurrent() + edV2.isCurrent() + } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java index 24731b6f3..3d2ed1391 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java @@ -1,5 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; +import com.fasterxml.jackson.annotation.JsonGetter; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; @@ -16,6 +18,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.MappedSuperclass; +import javax.persistence.Transient; import javax.validation.constraints.NotNull; import java.time.Instant; import java.time.LocalDateTime; @@ -27,7 +30,7 @@ @MappedSuperclass @EntityListeners(AuditingEntityListener.class) -@EqualsAndHashCode +@EqualsAndHashCode(exclude = {"current"}) @Audited public abstract class AbstractAuditable implements Auditable { @@ -53,6 +56,9 @@ public abstract class AbstractAuditable implements Auditable { @LastModifiedBy private String modifiedBy; + @Transient + @JsonProperty + private boolean current; @Override public Long getAudId() { @@ -108,6 +114,14 @@ public ZonedDateTime modifiedDateAsZonedDateTime() { return toZonedDateTime(this.modifiedDate); } + public boolean isCurrent() { + return this.current; + } + + public void markAsCurrent() { + this.current = true; + } + private static ZonedDateTime toZonedDateTime(LocalDateTime localDateTime) { return localDateTime .atZone(ZoneId.systemDefault()) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java index e378f5fbb..44f1463c5 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java @@ -1,5 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain.frontend; +import com.fasterxml.jackson.annotation.JsonProperty; + import javax.validation.constraints.NotNull; import java.io.Serializable; import java.time.LocalDateTime; @@ -64,6 +66,9 @@ public EntityDescriptorRepresentation(String id, private String createdBy; + @JsonProperty + private boolean current; + public String getId() { return id; } @@ -112,6 +117,7 @@ public void setMdui(MduiRepresentation mdui) { this.mdui = mdui; } + public ServiceProviderSsoDescriptorRepresentation getServiceProviderSsoDescriptor() { return this.getServiceProviderSsoDescriptor(false); } @@ -213,4 +219,12 @@ public String getCreatedBy() { public void setCreatedBy(String createdBy) { this.createdBy = createdBy; } + + public boolean isCurrent() { + return current; + } + + public void setCurrent(boolean current) { + this.current = current; + } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java index b12d943fc..b5e713143 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java @@ -46,14 +46,30 @@ public List findVersionsForPersistentEntity(String resourceId, Class public Object findSpecificVersionOfPersistentEntity(String resourceId, String versionId, Class entityClass) { try { - return AuditReaderFactory.get(entityManager).createQuery() + AbstractAuditable abstractAuditable = + (AbstractAuditable) AuditReaderFactory.get(entityManager).createQuery() .forEntitiesAtRevision(entityClass, Integer.valueOf(versionId)) .add(AuditEntity.property("resourceId").eq(resourceId)) .add(AuditEntity.revisionNumber().eq(Integer.valueOf(versionId))) .getSingleResult(); - } - catch (NoResultException e) { + if(isCurrentRevision(resourceId, versionId, entityClass)) { + abstractAuditable.markAsCurrent(); + } + return abstractAuditable; + } catch (NoResultException e) { return null; } } + + private boolean isCurrentRevision(String resourceId, String versionId, Class entityClass) { + Number revision = (Number) AuditReaderFactory + .get(entityManager) + .createQuery() + .forRevisionsOfEntity(entityClass, false, false) + .addProjection(AuditEntity.revisionNumber().max()) + .add(AuditEntity.property("resourceId").eq(resourceId)) + .getSingleResult(); + + return Integer.valueOf(versionId) == revision.intValue(); + } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java index ca7a8659e..7be97f308 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java @@ -497,6 +497,7 @@ public EntityDescriptorRepresentation createRepresentationFromDescriptor(org.ope representation.setModifiedDate(ed.getModifiedDate()); representation.setVersion(ed.hashCode()); representation.setCreatedBy(ed.getCreatedBy()); + representation.setCurrent(ed.isCurrent()); if (ed.getSPSSODescriptor("") != null && ed.getSPSSODescriptor("").getSupportedProtocols().size() > 0) { ServiceProviderSsoDescriptorRepresentation serviceProviderSsoDescriptorRepresentation = representation.getServiceProviderSsoDescriptor(true); diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy index 011fe7033..c05d9e52b 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy @@ -22,12 +22,12 @@ class VersionJsonSerializationBasicTests extends Specification { def "Verify basic Version JSON serialization"() { given: def staticDate = ZonedDateTime.parse("2019-05-20T15:00:00.574Z") - def version = new Version('2', 'kramer', staticDate) + def version = new Version('2', 'kramer', staticDate, false) def expectedJson = """ { "id": "2", "creator": "kramer", - "date": "2019-05-20T15:00:00.574Z" + "date": "2019-05-20T15:00:00.574Z" } """ def expectedJsonMap = jsonSlurper.parseText(expectedJson) @@ -37,5 +37,7 @@ class VersionJsonSerializationBasicTests extends Specification { then: deSerializedJsonMap.date == expectedJsonMap.date + deSerializedJsonMap.id == expectedJsonMap.id + deSerializedJsonMap.creator == expectedJsonMap.creator } } From 0c4fc42a5dba23536f0672f951d6c946a0e11ade Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Tue, 2 Jul 2019 13:21:03 -0700 Subject: [PATCH 100/112] SHIBUI-1347 Fixed issue with incomplete resolvers --- ui/src/app/app.component.html | 33 ++++------ ui/src/app/app.component.spec.ts | 5 +- ui/src/app/app.component.ts | 27 ++++++-- ui/src/app/app.module.ts | 2 + ui/src/app/core/model/action.ts | 7 +++ ui/src/app/core/service/navigation.service.ts | 31 ++++++++++ .../service/configuration.service.spec.ts | 24 +++++--- .../dashboard-resolvers-list.component.html | 24 ++++++-- ...dashboard-resolvers-list.component.spec.ts | 10 ++- .../dashboard-resolvers-list.component.ts | 17 +++--- .../container/manager.component.spec.ts | 10 ++- .../manager/container/manager.component.ts | 13 +++- ui/src/app/metadata/manager/reducer/index.ts | 2 - .../app/metadata/metadata.component.spec.ts | 1 - ui/src/app/metadata/metadata.component.ts | 10 +-- ui/src/app/metadata/metadata.module.ts | 41 ++++++++++++- .../container/provider.component.html | 3 - .../container/provider.component.spec.ts | 46 -------------- .../provider/container/provider.component.ts | 12 ---- .../metadata/provider/provider.component.ts | 20 ++++++ .../app/metadata/provider/provider.module.ts | 6 +- .../app/metadata/provider/provider.routing.ts | 4 +- .../container/new-resolver.component.ts | 4 +- .../resolver-wizard.component.spec.ts | 61 +++++++++++++++---- .../container/resolver-wizard.component.ts | 3 +- .../metadata/resolver/effect/wizard.effect.ts | 13 ---- .../metadata/resolver/resolver.component.ts | 22 +++++++ .../app/metadata/resolver/resolver.module.ts | 8 +-- .../app/metadata/resolver/resolver.routing.ts | 7 +-- .../resolver/service/create-draft.resolver.ts | 35 ----------- ui/src/testing/activated-route.stub.ts | 2 +- ui/src/testing/navigation-service.stub.ts | 10 +++ ui/src/testing/provider.stub.ts | 6 +- 33 files changed, 308 insertions(+), 211 deletions(-) create mode 100644 ui/src/app/core/model/action.ts create mode 100644 ui/src/app/core/service/navigation.service.ts delete mode 100644 ui/src/app/metadata/provider/container/provider.component.html delete mode 100644 ui/src/app/metadata/provider/container/provider.component.spec.ts delete mode 100644 ui/src/app/metadata/provider/container/provider.component.ts create mode 100644 ui/src/app/metadata/provider/provider.component.ts create mode 100644 ui/src/app/metadata/resolver/resolver.component.ts delete mode 100644 ui/src/app/metadata/resolver/service/create-draft.resolver.ts create mode 100644 ui/src/testing/navigation-service.stub.ts diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html index 6af7be5ab..52b5a0f87 100644 --- a/ui/src/app/app.component.html +++ b/ui/src/app/app.component.html @@ -21,26 +21,19 @@ Add New
  • diff --git a/ui/src/app/app.component.spec.ts b/ui/src/app/app.component.spec.ts index 29246df6e..78c90e6a2 100644 --- a/ui/src/app/app.component.spec.ts +++ b/ui/src/app/app.component.spec.ts @@ -9,6 +9,8 @@ import { NotificationModule } from './notification/notification.module'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { MockTranslatePipe, MockI18nService, MockI18nModule } from '../testing/i18n.stub'; import { I18nService } from './i18n/service/i18n.service'; +import { NavigationService } from './core/service/navigation.service'; +import { NavigationServiceStub } from '../testing/navigation-service.stub'; @Component({ template: ` @@ -30,7 +32,8 @@ describe('AppComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ providers: [ - {provide: I18nService, useClass: MockI18nService } + {provide: I18nService, useClass: MockI18nService }, + { provide: NavigationService, useValue: NavigationServiceStub } ], imports: [ NgbDropdownModule, diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts index 57119404d..50a5533c6 100644 --- a/ui/src/app/app.component.ts +++ b/ui/src/app/app.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; +import { Observable, of } from 'rxjs'; +import { map, catchError } from 'rxjs/operators'; import { Store } from '@ngrx/store'; @@ -12,6 +12,9 @@ import { SetLocale } from './i18n/action/message.action'; import { brand } from './app.brand'; import { Brand } from './core/model/brand'; import { UserLoadRequestAction } from './core/action/user.action'; +import { Router } from '@angular/router'; +import { NavigationService } from './core/service/navigation.service'; +import { NavigationAction } from './core/model/action'; @Component({ selector: 'app-root', @@ -26,23 +29,39 @@ export class AppComponent implements OnInit { today = new Date(); year = new Date().getFullYear(); isAdmin$: Observable; - brand: Brand = brand; + nav$: Observable; formatter = v => v && v.build ? `${v.build.version}-${v.git.commit.id}` : ''; constructor( private store: Store, - private i18nService: I18nService + private i18nService: I18nService, + private router: Router, + private navService: NavigationService ) { this.version$ = this.store.select(fromRoot.getVersionInfo); this.formatted$ = this.version$.pipe(map(this.formatter)); this.isAdmin$ = this.store.select(fromRoot.isCurrentUserAdmin); + + this.nav$ = this.navService.emitter; } ngOnInit(): void { this.store.dispatch(new UserLoadRequestAction()); this.store.dispatch(new VersionInfoLoadRequestAction()); this.store.dispatch(new SetLocale(this.i18nService.getCurrentLocale())); + + /* + this.router + .events + .pipe( + catchError(err => { + console.error(err); + return err; + }) + ) + .subscribe((ev) => console.log(ev)); + */ } } diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts index 6bd9ae5da..4e9b543c3 100644 --- a/ui/src/app/app.module.ts +++ b/ui/src/app/app.module.ts @@ -25,6 +25,7 @@ import { WizardModule } from './wizard/wizard.module'; import { FormModule } from './schema-form/schema-form.module'; import { environment } from '../environments/environment.prod'; import { I18nModule } from './i18n/i18n.module'; +import { NavigationService } from './core/service/navigation.service'; @NgModule({ declarations: [ @@ -58,6 +59,7 @@ import { I18nModule } from './i18n/i18n.module'; ], providers: [ NavigatorService, + NavigationService, { provide: RouterStateSerializer, useClass: CustomRouterStateSerializer }, { provide: HTTP_INTERCEPTORS, diff --git a/ui/src/app/core/model/action.ts b/ui/src/app/core/model/action.ts new file mode 100644 index 000000000..6d796da39 --- /dev/null +++ b/ui/src/app/core/model/action.ts @@ -0,0 +1,7 @@ +export interface NavigationAction { + action: ($event: Event) => void; + category: string; + label: string; + content: string; + icon?: string; +} diff --git a/ui/src/app/core/service/navigation.service.ts b/ui/src/app/core/service/navigation.service.ts new file mode 100644 index 000000000..4d6f3821e --- /dev/null +++ b/ui/src/app/core/service/navigation.service.ts @@ -0,0 +1,31 @@ +import { Injectable } from '@angular/core'; +import { BehaviorSubject, Observable } from 'rxjs'; +import { NavigationAction } from '../model/action'; + +@Injectable() +export class NavigationService { + + private actions: { [name: string]: NavigationAction} = {}; + private subj: BehaviorSubject; + private obs: Observable; + + constructor() { + this.subj = new BehaviorSubject(this.actionList); + this.obs = this.subj.asObservable(); + } + + get actionList(): NavigationAction[] { + return Object.values(this.actions); + } + + get emitter(): Observable { + return this.obs; + } + + addAction(name: string, action: NavigationAction): NavigationAction[] { + console.log(this.actions); + this.actions[name] = action; + this.subj.next(this.actionList); + return this.actionList; + } +} diff --git a/ui/src/app/metadata/configuration/service/configuration.service.spec.ts b/ui/src/app/metadata/configuration/service/configuration.service.spec.ts index 3d44cae6a..49e9014ab 100644 --- a/ui/src/app/metadata/configuration/service/configuration.service.spec.ts +++ b/ui/src/app/metadata/configuration/service/configuration.service.spec.ts @@ -4,9 +4,13 @@ import { HttpTestingController, HttpClientTestingModule } from '@angular/common/ import { MetadataConfigurationService } from './configuration.service'; import { FileBackedHttpMetadataProviderEditor } from '../../provider/model'; import { MetadataSourceEditor } from '../../domain/model/wizards/metadata-source-editor'; -import { PATHS } from '../configuration.values'; +import { ResolverService } from '../../domain/service/resolver.service'; +import { of } from 'rxjs'; + +describe(`Configuration Service`, () => { + + let resolverService: any; -describe(`Attributes Service`, () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ @@ -14,21 +18,27 @@ describe(`Attributes Service`, () => { HttpClientTestingModule ], providers: [ - MetadataConfigurationService + MetadataConfigurationService, + { + provide: ResolverService, useValue: { + find: () => of([]) + } + } ] }); + + resolverService = TestBed.get(ResolverService); + }); describe('find method', () => { it(`should send an expected GET request`, async(inject([MetadataConfigurationService, HttpTestingController], (service: MetadataConfigurationService, backend: HttpTestingController) => { + spyOn(resolverService, 'find').and.callThrough(); const type = 'resolver'; const id = 'foo'; service.find(id, type).subscribe(); - backend.expectOne((req: HttpRequest) => { - return req.url === `${service.base}/${PATHS[type]}/${id}` - && req.method === 'GET'; - }, `GET metadata by id and type`); + expect(resolverService.find).toHaveBeenCalledWith(id); } ))); }); diff --git a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.html b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.html index 7b4273ac1..6023d63a5 100644 --- a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.html +++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.html @@ -24,16 +24,28 @@ [infiniteScrollThrottle]="50" (scrolled)="onScroll($event)"> - {{ resolver.name }} + + {{ resolver.name }} + + + {{ resolver.name }} + {{ resolver.getDisplayId() }} {{ resolver.createdBy }} {{ resolver.getCreationDate() ? (resolver.getCreationDate() | customDate) : '—' }} - - Incomplete Form + + +   + + Incomplete Form + { }); describe('edit method', () => { - it('should route to the edit page', () => { - spyOn(router, 'navigate'); - instance.edit(resolver); - expect(router.navigate).toHaveBeenCalledWith(['metadata', 'resolver', resolver.id, 'edit']); - }); it('should route to the wizard page', () => { + const evt = new Event('a type'); spyOn(router, 'navigate'); - instance.edit(draft); + spyOn(evt, 'preventDefault'); + instance.edit(evt, draft); expect(router.navigate).toHaveBeenCalledWith(['metadata', 'resolver', 'new', 'blank', 'common'], { queryParams: { id: '1' } }); + expect(evt.preventDefault).toHaveBeenCalled(); }); }); diff --git a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts index 2654b1e01..bde5bc624 100644 --- a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts +++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts @@ -72,16 +72,13 @@ export class DashboardResolversListComponent implements OnInit { this.loadMore(this.page + 1); } - edit(entity: MetadataEntity): void { - if (entity.isDraft()) { - this.router.navigate(['metadata', 'resolver', 'new', 'blank', 'common'], { - queryParams: { - id: entity.getId() - } - }); - } else { - this.router.navigate(['metadata', 'resolver', entity.getId(), 'edit']); - } + edit(evt: Event, entity: MetadataEntity): void { + evt.preventDefault(); + this.router.navigate(['metadata', 'resolver', 'new', 'blank', 'common'], { + queryParams: { + id: entity.getId() + } + }); } toggleEntity(entity: MetadataEntity): void { diff --git a/ui/src/app/metadata/manager/container/manager.component.spec.ts b/ui/src/app/metadata/manager/container/manager.component.spec.ts index a9213a014..d33c28860 100644 --- a/ui/src/app/metadata/manager/container/manager.component.spec.ts +++ b/ui/src/app/metadata/manager/container/manager.component.spec.ts @@ -1,9 +1,12 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { StoreModule, combineReducers } from '@ngrx/store'; + import { ManagerComponent } from './manager.component'; -import { RouterModule, Router } from '@angular/router'; +import { Router } from '@angular/router'; import { RouterStub, RouterLinkStubDirective, RouterOutletStubComponent } from '../../../../testing/router.stub'; import { MockI18nModule } from '../../../../testing/i18n.stub'; +import * as fromDashboard from '../reducer'; describe('Metadata Manager Parent Page', () => { let fixture: ComponentFixture; @@ -16,7 +19,10 @@ describe('Metadata Manager Parent Page', () => { ], imports: [ NoopAnimationsModule, - MockI18nModule + MockI18nModule, + StoreModule.forRoot({ + manager: combineReducers(fromDashboard.reducers), + }) ], declarations: [ ManagerComponent, diff --git a/ui/src/app/metadata/manager/container/manager.component.ts b/ui/src/app/metadata/manager/container/manager.component.ts index 77a9b0cbb..e6932a1bd 100644 --- a/ui/src/app/metadata/manager/container/manager.component.ts +++ b/ui/src/app/metadata/manager/container/manager.component.ts @@ -1,4 +1,9 @@ import { Component } from '@angular/core'; +import { Store } from '@ngrx/store'; +import { LoadResolverRequest } from '../../resolver/action/collection.action'; +import { LoadDraftRequest } from '../../resolver/action/draft.action'; +import * as fromRoot from '../../../app.reducer'; +import { LoadProviderRequest } from '../../provider/action/collection.action'; @Component({ selector: 'manager-page', @@ -6,5 +11,11 @@ import { Component } from '@angular/core'; styleUrls: ['./manager.component.scss'] }) export class ManagerComponent { - constructor() {} + constructor( + private store: Store + ) { + this.store.dispatch(new LoadResolverRequest()); + this.store.dispatch(new LoadDraftRequest()); + this.store.dispatch(new LoadProviderRequest()); + } } diff --git a/ui/src/app/metadata/manager/reducer/index.ts b/ui/src/app/metadata/manager/reducer/index.ts index 2585fb182..584760916 100644 --- a/ui/src/app/metadata/manager/reducer/index.ts +++ b/ui/src/app/metadata/manager/reducer/index.ts @@ -2,8 +2,6 @@ import { createSelector, createFeatureSelector } from '@ngrx/store'; import * as fromRoot from '../../../core/reducer'; import * as fromDashboard from './manager.reducer'; import * as fromSearch from './search.reducer'; -import { MetadataEntity } from '../../domain/model'; -import { Metadata } from '../../domain/domain.type'; export interface DashboardState { manager: fromDashboard.State; diff --git a/ui/src/app/metadata/metadata.component.spec.ts b/ui/src/app/metadata/metadata.component.spec.ts index b8f284611..5ce3c61c7 100644 --- a/ui/src/app/metadata/metadata.component.spec.ts +++ b/ui/src/app/metadata/metadata.component.spec.ts @@ -50,6 +50,5 @@ describe('Metadata Root Component', () => { it('should load metadata objects', async(() => { expect(app).toBeTruthy(); - expect(store.dispatch).toHaveBeenCalledTimes(3); })); }); diff --git a/ui/src/app/metadata/metadata.component.ts b/ui/src/app/metadata/metadata.component.ts index df271e2fd..5ffdd926a 100644 --- a/ui/src/app/metadata/metadata.component.ts +++ b/ui/src/app/metadata/metadata.component.ts @@ -1,10 +1,7 @@ import { Component, ChangeDetectionStrategy } from '@angular/core'; import { Store } from '@ngrx/store'; -import { LoadResolverRequest } from './resolver/action/collection.action'; -import { LoadDraftRequest } from './resolver/action/draft.action'; import * as fromRoot from '../app.reducer'; -import { LoadProviderRequest } from './provider/action/collection.action'; @Component({ selector: 'metadata-page', @@ -13,12 +10,7 @@ import { LoadProviderRequest } from './provider/action/collection.action'; styleUrls: [] }) export class MetadataPageComponent { - constructor( private store: Store - ) { - this.store.dispatch(new LoadResolverRequest()); - this.store.dispatch(new LoadDraftRequest()); - this.store.dispatch(new LoadProviderRequest()); - } + ) {} } diff --git a/ui/src/app/metadata/metadata.module.ts b/ui/src/app/metadata/metadata.module.ts index 3712ba969..6867ed75c 100644 --- a/ui/src/app/metadata/metadata.module.ts +++ b/ui/src/app/metadata/metadata.module.ts @@ -1,4 +1,5 @@ import { NgModule } from '@angular/core'; +import { Store } from '@ngrx/store'; import { ResolverModule } from './resolver/resolver.module'; import { FilterModule } from './filter/filter.module'; @@ -12,6 +13,12 @@ import { CustomWidgetRegistry } from '../schema-form/registry'; import { WidgetRegistry, SchemaValidatorFactory } from 'ngx-schema-form'; import { CustomSchemaValidatorFactory } from '../schema-form/service/schema-validator'; import { MetadataConfigurationModule } from './configuration/configuration.module'; +import { NavigationService } from '../core/service/navigation.service'; +import { MetadataResolver } from './domain/model'; +import { AddDraftRequest } from './resolver/action/draft.action'; +import * as fromResolver from './resolver/reducer'; +import * as fromProvider from './provider/reducer'; +import { Router } from '@angular/router'; @NgModule({ imports: [ @@ -35,4 +42,36 @@ import { MetadataConfigurationModule } from './configuration/configuration.modul MetadataPageComponent ] }) -export class MetadataModule { } +export class MetadataModule { + constructor( + private navService: NavigationService, + private store: Store, + private router: Router + ) { + this.navService.addAction('add-md-source', { + content: 'label.metadata-source', + label: 'action.add-new-source', + action: (event) => { + event.preventDefault(); + const resolver = { + id: `r-${Date.now()}` + }; + this.store.dispatch(new AddDraftRequest(resolver)); + this.router.navigate(['/metadata', 'resolver', 'new'], {queryParams: { id: resolver.id}}); + }, + category: 'metadata', + icon: 'fa-cube' + }); + + this.navService.addAction('add-md-provider', { + content: 'label.metadata-provider', + label: 'action.add-new-provider', + action: (event) => { + event.preventDefault(); + this.router.navigate(['/metadata', 'provider', 'wizard']); + }, + category: 'metadata', + icon: 'fa-cubes' + }); + } +} diff --git a/ui/src/app/metadata/provider/container/provider.component.html b/ui/src/app/metadata/provider/container/provider.component.html deleted file mode 100644 index 8d471248b..000000000 --- a/ui/src/app/metadata/provider/container/provider.component.html +++ /dev/null @@ -1,3 +0,0 @@ -
    - -
    \ No newline at end of file diff --git a/ui/src/app/metadata/provider/container/provider.component.spec.ts b/ui/src/app/metadata/provider/container/provider.component.spec.ts deleted file mode 100644 index c04839b6f..000000000 --- a/ui/src/app/metadata/provider/container/provider.component.spec.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { Component, ViewChild } from '@angular/core'; -import { TestBed, async, ComponentFixture } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; - -import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; - -import { ProviderComponent } from './provider.component'; - -@Component({ - template: ` - - ` -}) -class TestHostComponent { - @ViewChild(ProviderComponent) - public componentUnderTest: ProviderComponent; -} - -describe('Provider Component', () => { - - let fixture: ComponentFixture; - let instance: TestHostComponent; - let app: ProviderComponent; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - NgbDropdownModule, - RouterTestingModule - ], - declarations: [ - ProviderComponent, - TestHostComponent - ], - }).compileComponents(); - - fixture = TestBed.createComponent(TestHostComponent); - instance = fixture.componentInstance; - app = instance.componentUnderTest; - fixture.detectChanges(); - })); - - it('should instantiate the component', async(() => { - expect(app).toBeTruthy(); - })); -}); diff --git a/ui/src/app/metadata/provider/container/provider.component.ts b/ui/src/app/metadata/provider/container/provider.component.ts deleted file mode 100644 index 54757e53d..000000000 --- a/ui/src/app/metadata/provider/container/provider.component.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Component } from '@angular/core'; -import { Store } from '@ngrx/store'; -import * as fromProvider from '../reducer'; - -@Component({ - selector: 'provider-page', - templateUrl: './provider.component.html', - styleUrls: [] -}) -export class ProviderComponent { - constructor() {} -} diff --git a/ui/src/app/metadata/provider/provider.component.ts b/ui/src/app/metadata/provider/provider.component.ts new file mode 100644 index 000000000..3572b8642 --- /dev/null +++ b/ui/src/app/metadata/provider/provider.component.ts @@ -0,0 +1,20 @@ +import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { Store } from '@ngrx/store'; + +import { LoadProviderRequest } from './action/collection.action'; +import * as fromRoot from '../../app.reducer'; + +@Component({ + selector: 'metadata-provider-page', + changeDetection: ChangeDetectionStrategy.OnPush, + template: '
    ', + styleUrls: [] +}) +export class MetadataProviderPageComponent { + + constructor( + private store: Store + ) { + // this.store.dispatch(new LoadProviderRequest()); + } +} diff --git a/ui/src/app/metadata/provider/provider.module.ts b/ui/src/app/metadata/provider/provider.module.ts index b06a9cae0..38bfecdf1 100644 --- a/ui/src/app/metadata/provider/provider.module.ts +++ b/ui/src/app/metadata/provider/provider.module.ts @@ -9,7 +9,6 @@ import { NgbDropdownModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap'; import { ProviderWizardComponent } from './container/provider-wizard.component'; import { ProviderWizardStepComponent } from './container/provider-wizard-step.component'; -import { ProviderComponent } from './container/provider.component'; import { WizardModule } from '../../wizard/wizard.module'; import * as fromProvider from './reducer'; import { EditorEffects } from './effect/editor.effect'; @@ -26,17 +25,18 @@ import { ContentionModule } from '../../contention/contention.module'; import { DeleteFilterComponent } from './component/delete-filter.component'; import { I18nModule } from '../../i18n/i18n.module'; import { DomainModule } from '../domain/domain.module'; +import { MetadataProviderPageComponent } from './provider.component'; @NgModule({ declarations: [ - ProviderComponent, ProviderWizardComponent, ProviderWizardStepComponent, ProviderEditComponent, ProviderEditStepComponent, ProviderSelectComponent, ProviderFilterListComponent, - DeleteFilterComponent + DeleteFilterComponent, + MetadataProviderPageComponent ], entryComponents: [ DeleteFilterComponent diff --git a/ui/src/app/metadata/provider/provider.routing.ts b/ui/src/app/metadata/provider/provider.routing.ts index 0e8d69549..036750a3e 100644 --- a/ui/src/app/metadata/provider/provider.routing.ts +++ b/ui/src/app/metadata/provider/provider.routing.ts @@ -1,6 +1,5 @@ import { Routes } from '@angular/router'; -import { ProviderComponent } from './container/provider.component'; import { ProviderWizardComponent } from './container/provider-wizard.component'; import { ProviderWizardStepComponent } from './container/provider-wizard-step.component'; import { ProviderEditComponent } from './container/provider-edit.component'; @@ -13,11 +12,12 @@ import { EditFilterComponent } from '../filter/container/edit-filter.component'; import { CanDeactivateGuard } from '../../core/service/can-deactivate.guard'; import { FilterComponent } from '../filter/container/filter.component'; import { AdminGuard } from '../../core/service/admin.guard'; +import { MetadataProviderPageComponent } from './provider.component'; export const ProviderRoutes: Routes = [ { path: 'provider', - component: ProviderComponent, + component: MetadataProviderPageComponent, canActivate: [AdminGuard], children: [ { diff --git a/ui/src/app/metadata/resolver/container/new-resolver.component.ts b/ui/src/app/metadata/resolver/container/new-resolver.component.ts index 9d8f8b40b..09efb0f1f 100644 --- a/ui/src/app/metadata/resolver/container/new-resolver.component.ts +++ b/ui/src/app/metadata/resolver/container/new-resolver.component.ts @@ -33,11 +33,11 @@ export class NewResolverComponent implements OnDestroy { }) ); - this.actionsSubscription = this.route.data.pipe( + this.actionsSubscription = this.route.queryParams.pipe( takeUntil(this.ngUnsubscribe), distinctUntilChanged(), map(data => { - return new SelectDraftRequest(data.draft); + return new SelectDraftRequest(data.id); }) ).subscribe(this.store); } diff --git a/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts b/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts index 984a746a2..1b6c5df32 100644 --- a/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts +++ b/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts @@ -2,7 +2,7 @@ import { Component, ViewChild } from '@angular/core'; import { TestBed, async, ComponentFixture } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { StoreModule, Store, combineReducers } from '@ngrx/store'; -import { RouterStateSnapshot } from '@angular/router'; +import { RouterStateSnapshot, ActivatedRouteSnapshot } from '@angular/router'; import { NgbDropdownModule, NgbPopoverModule, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { of } from 'rxjs'; @@ -116,12 +116,23 @@ describe('Resolver Wizard Component', () => { describe('canDeactivate method', () => { it('should return true if moving to another page', async(() => { - app.canDeactivate(null, null, { - url: 'blank', - root: { - queryParams: { id: 'foo' } - } - } as RouterStateSnapshot).subscribe((can) => { + app.canDeactivate( + null, + { + url: 'foo', + root: { + queryParams: { + id: 'foo' + } + } + } as RouterStateSnapshot, + { + url: 'blank', + root: { + queryParams: { id: 'foo' } + } + } as RouterStateSnapshot + ).subscribe((can) => { expect(can).toBe(true); }); })); @@ -129,9 +140,23 @@ describe('Resolver Wizard Component', () => { it('should open a modal', () => { app.changes = {id: 'bar', serviceProviderName: 'foo', createdBy: 'admin'}; spyOn(modal, 'open').and.callThrough(); - app.canDeactivate(null, null, { - url: 'foo' - } as RouterStateSnapshot); + app.canDeactivate(null, + { + url: 'foo', + root: { + queryParams: { + id: 'foo' + } + } + } as RouterStateSnapshot, + { + url: 'foo', + root: { + queryParams: { + id: 'foo' + } + } + } as RouterStateSnapshot); expect(modal.open).toHaveBeenCalled(); }); @@ -139,8 +164,20 @@ describe('Resolver Wizard Component', () => { app.changes = {} as MetadataResolver; spyOn(store, 'select').and.returnValue(of(true)); spyOn(modal, 'open').and.callThrough(); - app.canDeactivate(null, null, { - url: 'foo' + app.canDeactivate(null, { + url: 'foo', + root: { + queryParams: { + id: 'foo' + } + } + } as RouterStateSnapshot, { + url: 'foo', + root: { + queryParams: { + id: 'foo' + } + } } as RouterStateSnapshot).subscribe((can) => { expect(can).toBe(true); expect(modal.open).not.toHaveBeenCalled(); diff --git a/ui/src/app/metadata/resolver/container/resolver-wizard.component.ts b/ui/src/app/metadata/resolver/container/resolver-wizard.component.ts index c4c4f7192..3ccddc90e 100644 --- a/ui/src/app/metadata/resolver/container/resolver-wizard.component.ts +++ b/ui/src/app/metadata/resolver/container/resolver-wizard.component.ts @@ -186,7 +186,8 @@ export class ResolverWizardComponent implements OnDestroy, CanComponentDeactivat currentState: RouterStateSnapshot, nextState: RouterStateSnapshot ): Observable { - if (nextState.url.match('blank') && !!nextState.root.queryParams.id) { + const changingIds = currentState.root.queryParams.id !== nextState.root.queryParams.id; + if (nextState.url.match('blank') && !!nextState.root.queryParams.id && !changingIds) { return of(true); } if (this.hasChanges(this.changes)) { diff --git a/ui/src/app/metadata/resolver/effect/wizard.effect.ts b/ui/src/app/metadata/resolver/effect/wizard.effect.ts index e64362c32..9f94182f3 100644 --- a/ui/src/app/metadata/resolver/effect/wizard.effect.ts +++ b/ui/src/app/metadata/resolver/effect/wizard.effect.ts @@ -38,19 +38,6 @@ export class WizardEffects { map(provider => new Clear()) ); - @Effect({ dispatch: false }) - updateEntityIdInUrl$ = this.actions$.pipe( - ofType(DraftActionTypes.SELECT_SUCCESS), - map(action => action.payload), - tap((id) => { - this.router.navigate([], { - relativeTo: this.activatedRoute, - queryParams: { id }, - queryParamsHandling: 'merge' - }); - }) - ); - constructor( private store: Store, private actions$: Actions, diff --git a/ui/src/app/metadata/resolver/resolver.component.ts b/ui/src/app/metadata/resolver/resolver.component.ts new file mode 100644 index 000000000..d488a26d8 --- /dev/null +++ b/ui/src/app/metadata/resolver/resolver.component.ts @@ -0,0 +1,22 @@ +import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { Store } from '@ngrx/store'; + +import { LoadResolverRequest } from './action/collection.action'; +import { LoadDraftRequest } from './action/draft.action'; +import * as fromRoot from '../../app.reducer'; + +@Component({ + selector: 'metadata-resolver-page', + changeDetection: ChangeDetectionStrategy.OnPush, + template: '', + styleUrls: [] +}) +export class MetadataResolverPageComponent { + + constructor( + private store: Store + ) { + // this.store.dispatch(new LoadResolverRequest()); + // this.store.dispatch(new LoadDraftRequest()); + } +} diff --git a/ui/src/app/metadata/resolver/resolver.module.ts b/ui/src/app/metadata/resolver/resolver.module.ts index c5290431f..e0cb4bb5b 100644 --- a/ui/src/app/metadata/resolver/resolver.module.ts +++ b/ui/src/app/metadata/resolver/resolver.module.ts @@ -35,7 +35,7 @@ import { ResolverSelectComponent } from './container/resolver-select.component'; import { MetadataSourceEditor } from '../domain/model/wizards/metadata-source-editor'; import { FinishFormComponent } from './component/finish-form.component'; import { ProviderFormFragmentComponent } from './component/provider-form-fragment.component'; -import { CreateDraftResolverService } from './service/create-draft.resolver'; +import { MetadataResolverPageComponent } from './resolver.component'; @NgModule({ declarations: [ @@ -50,7 +50,8 @@ import { CreateDraftResolverService } from './service/create-draft.resolver'; ResolverWizardComponent, ResolverWizardStepComponent, FinishFormComponent, - ProviderFormFragmentComponent + ProviderFormFragmentComponent, + MetadataResolverPageComponent ], entryComponents: [], imports: [ @@ -76,8 +77,7 @@ export class ResolverModule { return { ngModule: RootResolverModule, providers: [ - CopyIsSetGuard, - CreateDraftResolverService + CopyIsSetGuard ] }; } diff --git a/ui/src/app/metadata/resolver/resolver.routing.ts b/ui/src/app/metadata/resolver/resolver.routing.ts index 9916e2206..fc92ebd02 100644 --- a/ui/src/app/metadata/resolver/resolver.routing.ts +++ b/ui/src/app/metadata/resolver/resolver.routing.ts @@ -13,18 +13,16 @@ import { ResolverWizardStepComponent } from './container/resolver-wizard-step.co import { ResolverEditComponent } from './container/resolver-edit.component'; import { ResolverEditStepComponent } from './container/resolver-edit-step.component'; import { ResolverSelectComponent } from './container/resolver-select.component'; -import { CreateDraftResolverService } from './service/create-draft.resolver'; +import { MetadataResolverPageComponent } from './resolver.component'; export const ResolverRoutes: Routes = [ { path: 'resolver', + component: MetadataResolverPageComponent, children: [ { path: 'new', component: NewResolverComponent, - resolve: { - draft: CreateDraftResolverService - }, children: [ { path: '', redirectTo: 'blank/common', pathMatch: 'prefix' }, { @@ -60,7 +58,6 @@ export const ResolverRoutes: Routes = [ { path: ':id', component: ResolverSelectComponent, - canActivate: [], children: [ { path: 'edit', diff --git a/ui/src/app/metadata/resolver/service/create-draft.resolver.ts b/ui/src/app/metadata/resolver/service/create-draft.resolver.ts deleted file mode 100644 index 1c6cb84a0..000000000 --- a/ui/src/app/metadata/resolver/service/create-draft.resolver.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; -import { Observable, of } from 'rxjs'; -import { Store } from '@ngrx/store'; -import { MetadataResolver } from '../../domain/model'; -import { AddDraftRequest } from '../action/draft.action'; -import * as fromResolver from '../reducer'; -import { EntityDraftService } from '../../domain/service/draft.service'; - -@Injectable() -export class CreateDraftResolverService { - constructor( - private store: Store, - private draftService: EntityDraftService - ) { } - - resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable | Observable { - let id = route.queryParamMap.get('id'); - if (id) { - let exists = this.draftService.exists(id); - if (!exists) { - let resolver = {id}; - this.store.dispatch(new AddDraftRequest(resolver)); - } - } - if (!id) { - let resolver = { - id: `r-${Date.now()}` - }; - id = resolver.id; - this.store.dispatch(new AddDraftRequest(resolver)); - } - return of(id); - } -} diff --git a/ui/src/testing/activated-route.stub.ts b/ui/src/testing/activated-route.stub.ts index 062493069..733b6df8e 100644 --- a/ui/src/testing/activated-route.stub.ts +++ b/ui/src/testing/activated-route.stub.ts @@ -28,7 +28,7 @@ export class ActivatedRouteStub { // ActivatedRoute.snapshot.paramMap get snapshot() { return { - paramMap: this.testParamMap + paramMap: this.testParamMap, }; } diff --git a/ui/src/testing/navigation-service.stub.ts b/ui/src/testing/navigation-service.stub.ts new file mode 100644 index 000000000..a0e745068 --- /dev/null +++ b/ui/src/testing/navigation-service.stub.ts @@ -0,0 +1,10 @@ +import { of } from 'rxjs'; +import { NavigationService } from '../app/core/service/navigation.service'; + +export const definition: unknown = { + emitter: of([]), + actionList: [], + addAction: jasmine.createSpy('navService') +}; + +export const NavigationServiceStub = definition as NavigationService; diff --git a/ui/src/testing/provider.stub.ts b/ui/src/testing/provider.stub.ts index 344ba5ef0..59fa89ea6 100644 --- a/ui/src/testing/provider.stub.ts +++ b/ui/src/testing/provider.stub.ts @@ -7,9 +7,11 @@ import { LogoutEndpoint } from '../app/metadata/domain/model'; -export const draft = { +const d: unknown = { serviceProviderName: 'bar' -} as MetadataProvider; +}; + +export const draft = d as MetadataProvider; export const provider = { ...draft, From d3da0192f0b5095a9a970d23e845b2ca7f223cc3 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Wed, 3 Jul 2019 10:22:02 -0400 Subject: [PATCH 101/112] Fix tests --- .../EntityDescriptorControllerTests.groovy | 24 ++++++++++++------- .../VersionJsonSerializationBasicTests.groovy | 2 +- .../UsersControllerIntegrationTests.groovy | 18 +++++++------- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerTests.groovy index 89cb89d54..bf3778fbb 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerTests.groovy @@ -147,7 +147,8 @@ class EntityDescriptorControllerTests extends Specification { "relyingPartyOverrides": null, "attributeRelease": null, "version": $version, - "createdBy": null + "createdBy": null, + "current": false } ] """ @@ -202,7 +203,8 @@ class EntityDescriptorControllerTests extends Specification { "relyingPartyOverrides": null, "attributeRelease": null, "version": $versionOne, - "createdBy": null + "createdBy": null, + "current": false }, { "id": "uuid-2", @@ -221,7 +223,8 @@ class EntityDescriptorControllerTests extends Specification { "relyingPartyOverrides": null, "attributeRelease": null, "version": $versionTwo, - "createdBy": null + "createdBy": null, + "current": false } ] """ @@ -273,7 +276,8 @@ class EntityDescriptorControllerTests extends Specification { "relyingPartyOverrides": null, "attributeRelease": null, "version": $versionOne, - "createdBy": "someUser" + "createdBy": "someUser", + "current": false } ] """ @@ -325,7 +329,8 @@ class EntityDescriptorControllerTests extends Specification { "securityInfo": null, "assertionConsumerServices": null, "relyingPartyOverrides": null, - "attributeRelease": null + "attributeRelease": null, + "current": false } """ @@ -348,7 +353,8 @@ class EntityDescriptorControllerTests extends Specification { "relyingPartyOverrides": null, "attributeRelease": null, "version": $version, - "createdBy": null + "createdBy": null, + "current": false } """ @@ -504,7 +510,8 @@ class EntityDescriptorControllerTests extends Specification { "relyingPartyOverrides": null, "attributeRelease": null, "version": $version, - "createdBy": null + "createdBy": null, + "current": false } """ @@ -556,7 +563,8 @@ class EntityDescriptorControllerTests extends Specification { "relyingPartyOverrides": null, "attributeRelease": null, "version": $version, - "createdBy": "someUser" + "createdBy": "someUser", + "current": false } """ diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy index c05d9e52b..b7fecdf4d 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy @@ -22,7 +22,7 @@ class VersionJsonSerializationBasicTests extends Specification { def "Verify basic Version JSON serialization"() { given: def staticDate = ZonedDateTime.parse("2019-05-20T15:00:00.574Z") - def version = new Version('2', 'kramer', staticDate, false) + def version = new Version('2', 'kramer', staticDate) def expectedJson = """ { "id": "2", diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersControllerIntegrationTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersControllerIntegrationTests.groovy index 0e96fc1b7..ab60461a0 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersControllerIntegrationTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersControllerIntegrationTests.groovy @@ -39,30 +39,30 @@ class UsersControllerIntegrationTests extends Specification { def expectedJson = """ [ { - "modifiedBy" : null, + "modifiedBy" : anonymousUser, "firstName" : "Joe", "emailAddress" : "joe@institution.edu", "role" : "ROLE_ADMIN", "username" : "admin", - "createdBy" : null, + "createdBy" : anonymousUser, "lastName" : "Doe" }, { - "modifiedBy" : null, + "modifiedBy" : anonymousUser, "firstName" : "Peter", "emailAddress" : "peter@institution.edu", "role" : "ROLE_USER", "username" : "nonadmin", - "createdBy" : null, + "createdBy" : anonymousUser, "lastName" : "Vandelay" }, { - "modifiedBy" : null, + "modifiedBy" : anonymousUser, "firstName" : "Anon", "emailAddress" : "anon@institution.edu", "role" : "ROLE_ADMIN", "username" : "anonymousUser", - "createdBy" : null, + "createdBy" : anonymousUser, "lastName" : "Ymous" } ]""" @@ -83,12 +83,12 @@ class UsersControllerIntegrationTests extends Specification { given: def expectedJson = """ { - "modifiedBy" : null, + "modifiedBy" : anonymousUser, "firstName" : "Joe", "emailAddress" : "joe@institution.edu", "role" : "ROLE_ADMIN", "username" : "admin", - "createdBy" : null, + "createdBy" : anonymousUser, "lastName" : "Doe" }""" when: 'GET request is made for one existing user' @@ -229,4 +229,4 @@ class UsersControllerIntegrationTests extends Specification { then: result.andExpect(status().isNotFound()) } -} \ No newline at end of file +} From a477eb7d006a55e3dad3e365c045bbe6bd8b181e Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Wed, 3 Jul 2019 15:20:59 -0400 Subject: [PATCH 102/112] Kick off build --- .../admin/ui/repository/envers/EnversTestsSupport.groovy | 4 ---- 1 file changed, 4 deletions(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy index cd1bb58b5..2052cf9d1 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EnversTestsSupport.groovy @@ -13,10 +13,6 @@ import org.springframework.transaction.PlatformTransactionManager import org.springframework.transaction.support.DefaultTransactionDefinition import javax.persistence.EntityManager -import java.time.LocalDateTime -import java.time.ZoneId -import java.time.ZoneOffset -import java.time.ZonedDateTime import static org.springframework.transaction.TransactionDefinition.PROPAGATION_REQUIRES_NEW From 7c74fe803b584921af4050c0b1150d26b7916fb5 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 5 Jul 2019 13:53:32 -0500 Subject: [PATCH 103/112] [SHIBUI-1263] remove Filter versioning since it is rolling up into the resolver --- backend/build.gradle | 6 + .../AbstractAttributeExtensibleXMLObject.java | 25 +++- .../admin/ui/domain/DigestMethod.java | 29 ++++ .../admin/ui/domain/RequestInitiator.java | 26 ++++ .../admin/ui/domain/SigningMethod.java | 55 +++++++ .../JPAXMLObjectProviderInitializer.java | 2 +- .../jpa-saml2-metadata-algorithm-config.xml | 34 +++++ .../templates/AlgorithmBuilderTemplate.java | 22 +++ .../EntityDescriptorRepositoryTest.groovy | 43 +++++- .../test/resources/metadata/SHIBUI-950.xml | 141 ++++++++++++++++++ 10 files changed, 372 insertions(+), 11 deletions(-) create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/DigestMethod.java create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/SigningMethod.java create mode 100644 backend/src/main/resources/jpa-saml2-metadata-algorithm-config.xml create mode 100644 backend/src/main/templates/AlgorithmBuilderTemplate.java create mode 100644 backend/src/test/resources/metadata/SHIBUI-950.xml diff --git a/backend/build.gradle b/backend/build.gradle index 4e5822e2e..970b23f4c 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -266,6 +266,12 @@ task generateSources { xmlSecBuilders.ObjectProviders.ObjectProvider.BuilderClass.each { processLine(it['@className'].toString(), 'src/main/templates/XMLSecBuilderTemplate.java') } + + new XmlSlurper().parse(file('src/main/resources/jpa-saml2-metadata-algorithm-config.xml')).with { builders -> + builders.ObjectProviders.ObjectProvider.BuilderClass.each { + processLine(it['@className'].toString(), 'src/main/templates/AlgorithmBuilderTemplate.java') + } + } } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAttributeExtensibleXMLObject.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAttributeExtensibleXMLObject.java index 075280330..3e029e17e 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAttributeExtensibleXMLObject.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAttributeExtensibleXMLObject.java @@ -5,17 +5,21 @@ import org.opensaml.core.xml.util.AttributeMap; import javax.annotation.Nonnull; +import javax.persistence.ElementCollection; import javax.persistence.MappedSuperclass; +import javax.persistence.PostLoad; +import javax.persistence.PrePersist; import javax.persistence.Transient; +import javax.xml.namespace.QName; +import java.util.HashMap; +import java.util.Map; @MappedSuperclass -@EqualsAndHashCode(callSuper = true, exclude={"unknownAttributes"}) +@EqualsAndHashCode(callSuper = true, exclude={"storageAttributeMap"}) public abstract class AbstractAttributeExtensibleXMLObject extends AbstractXMLObject implements AttributeExtensibleXMLObject { - - private transient final AttributeMap unknownAttributes; + private transient final AttributeMap unknownAttributes = new AttributeMap(this); AbstractAttributeExtensibleXMLObject() { - unknownAttributes = new AttributeMap(this); } @Nonnull @@ -24,4 +28,17 @@ public abstract class AbstractAttributeExtensibleXMLObject extends AbstractXMLOb public AttributeMap getUnknownAttributes() { return this.unknownAttributes; } + + @ElementCollection + private Map storageAttributeMap = new HashMap<>(); + + @PrePersist + void prePersist() { + this.storageAttributeMap = this.unknownAttributes; + } + + @PostLoad + void postLoad() { + this.unknownAttributes.putAll(this.storageAttributeMap); + } } \ No newline at end of file diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/DigestMethod.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/DigestMethod.java new file mode 100644 index 000000000..bb0fe5359 --- /dev/null +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/DigestMethod.java @@ -0,0 +1,29 @@ +package edu.internet2.tier.shibboleth.admin.ui.domain; + +import lombok.EqualsAndHashCode; + +import javax.annotation.Nullable; +import javax.persistence.Entity; + +@Entity +@EqualsAndHashCode(callSuper = true) +public class DigestMethod extends AbstractElementExtensibleXMLObject implements org.opensaml.saml.ext.saml2alg.DigestMethod { + private String algorithm; + + public DigestMethod() {} + + public DigestMethod(String algorithm) { + this.algorithm = algorithm; + } + + @Nullable + @Override + public String getAlgorithm() { + return null; + } + + @Override + public void setAlgorithm(@Nullable String value) { + + } +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RequestInitiator.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RequestInitiator.java index 78fd0028e..dbd667ff9 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RequestInitiator.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RequestInitiator.java @@ -1,9 +1,20 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; +import lombok.EqualsAndHashCode; import org.opensaml.core.xml.util.AttributeMap; import javax.annotation.Nonnull; +import javax.persistence.ElementCollection; +import javax.persistence.Entity; +import javax.persistence.PostLoad; +import javax.persistence.PrePersist; +import javax.persistence.Transient; +import javax.xml.namespace.QName; +import java.util.HashMap; +import java.util.Map; +@Entity +@EqualsAndHashCode(callSuper = true, exclude = {"storageAttributeMap"}) public class RequestInitiator extends AbstractElementExtensibleXMLObject implements org.opensaml.saml.ext.saml2mdreqinit.RequestInitiator { private String binding; @Override @@ -40,10 +51,25 @@ public void setResponseLocation(String location) { this.responseLocation = location; } + @ElementCollection + private Map storageAttributeMap = new HashMap<>(); + + @Transient private AttributeMap attributeMap = new AttributeMap(this); + @PrePersist + void prePersist() { + this.storageAttributeMap = this.attributeMap; + } + + @PostLoad + void postLoad() { + this.attributeMap.putAll(this.storageAttributeMap); + } + @Nonnull @Override + @Transient public AttributeMap getUnknownAttributes() { return this.attributeMap; } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/SigningMethod.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/SigningMethod.java new file mode 100644 index 000000000..c66996c9b --- /dev/null +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/SigningMethod.java @@ -0,0 +1,55 @@ +package edu.internet2.tier.shibboleth.admin.ui.domain; + +import lombok.EqualsAndHashCode; + +import javax.annotation.Nullable; +import javax.persistence.Entity; + +@Entity +@EqualsAndHashCode(callSuper = true) +public class SigningMethod extends AbstractElementExtensibleXMLObject implements org.opensaml.saml.ext.saml2alg.SigningMethod { + private String algorithm; + private Integer minKeySize; + private Integer maxKeySize; + + public SigningMethod() {} + + public SigningMethod(String algorithm, Integer minKeySize, Integer maxKeySize) { + this.algorithm = algorithm; + this.minKeySize = minKeySize; + this.maxKeySize = maxKeySize; + } + + @Nullable + @Override + public String getAlgorithm() { + return this.algorithm; + } + + @Override + public void setAlgorithm(@Nullable String value) { + this.algorithm = value; + } + + @Nullable + @Override + public Integer getMinKeySize() { + return this.minKeySize; + } + + @Override + public void setMinKeySize(@Nullable Integer value) { + this.minKeySize = value; + } + + @Nullable + @Override + public Integer getMaxKeySize() { + return this.maxKeySize; + } + + @Override + public void setMaxKeySize(@Nullable Integer value) { + this.maxKeySize = value; + } +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/opensaml/config/JPAXMLObjectProviderInitializer.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/opensaml/config/JPAXMLObjectProviderInitializer.java index 2b6718dd1..25000ae67 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/opensaml/config/JPAXMLObjectProviderInitializer.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/opensaml/config/JPAXMLObjectProviderInitializer.java @@ -14,8 +14,8 @@ protected String[] getConfigResources() { "/jpa-schema-config.xml", "/jpa-saml2-metadata-ui-config.xml", "/jpa-signature-config.xml", + "/jpa-saml2-metadata-algorithm-config.xml", "/encryption-config.xml", - "/saml2-metadata-algorithm-config.xml", "/jpa-saml2-metadata-reqinit-config.xml", "/saml2-protocol-config.xml", "/modified-saml2-assertion-config.xml" diff --git a/backend/src/main/resources/jpa-saml2-metadata-algorithm-config.xml b/backend/src/main/resources/jpa-saml2-metadata-algorithm-config.xml new file mode 100644 index 000000000..f6432a71a --- /dev/null +++ b/backend/src/main/resources/jpa-saml2-metadata-algorithm-config.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/backend/src/main/templates/AlgorithmBuilderTemplate.java b/backend/src/main/templates/AlgorithmBuilderTemplate.java new file mode 100644 index 000000000..26d1e3077 --- /dev/null +++ b/backend/src/main/templates/AlgorithmBuilderTemplate.java @@ -0,0 +1,22 @@ +package edu.internet2.tier.shibboleth.admin.ui.domain; + +import edu.internet2.tier.shibboleth.admin.ui.opensaml.xml.AbstractSAMLObjectBuilder; +import org.opensaml.saml.common.xml.SAMLConstants; + +public class {{TOKEN}}Builder extends AbstractSAMLObjectBuilder<{{TOKEN}}> { + public {{TOKEN}}Builder() { + } + + public {{TOKEN}} buildObject() { + return buildObject(SAMLConstants.SAML20ALG_NS, {{TOKEN}}.DEFAULT_ELEMENT_LOCAL_NAME, + SAMLConstants.SAML20ALG_PREFIX); + } + + public {{TOKEN}} buildObject(final String namespaceURI, final String localName, final String namespacePrefix) { + {{TOKEN}} o = new {{TOKEN}}(); + o.setNamespaceURI(namespaceURI); + o.setElementLocalName(localName); + o.setNamespacePrefix(namespacePrefix); + return o; + } +} diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepositoryTest.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepositoryTest.groovy index 4ecb6e758..741df5ac5 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepositoryTest.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepositoryTest.groovy @@ -1,21 +1,25 @@ package edu.internet2.tier.shibboleth.admin.ui.repository -import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration -import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration -import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration +import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.opensaml.OpenSamlChainingMetadataResolver import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects import edu.internet2.tier.shibboleth.admin.ui.security.repository.RoleRepository import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository import edu.internet2.tier.shibboleth.admin.ui.security.service.UserService import edu.internet2.tier.shibboleth.admin.ui.service.JPAEntityDescriptorServiceImpl import edu.internet2.tier.shibboleth.admin.ui.service.JPAEntityServiceImpl +import org.apache.lucene.analysis.Analyzer +import org.apache.lucene.analysis.en.EnglishAnalyzer +import org.opensaml.saml.metadata.resolver.MetadataResolver import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.domain.EntityScan import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest +import org.springframework.boot.test.context.TestConfiguration +import org.springframework.context.annotation.Bean import org.springframework.data.jpa.repository.config.EnableJpaRepositories - +import org.springframework.test.annotation.DirtiesContext import org.springframework.test.context.ContextConfiguration import spock.lang.Specification @@ -25,9 +29,10 @@ import javax.persistence.EntityManager * A highly unnecessary test so that I can check to make sure that persistence is correct for the model */ @DataJpaTest -@ContextConfiguration(classes=[CoreShibUiConfiguration, SearchConfiguration, TestConfiguration, InternationalizationConfiguration]) +@ContextConfiguration(classes=[CoreShibUiConfiguration, InternationalizationConfiguration]) @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") +@DirtiesContext(methodMode = DirtiesContext.MethodMode.AFTER_METHOD) class EntityDescriptorRepositoryTest extends Specification { @Autowired EntityDescriptorRepository entityDescriptorRepository @@ -42,7 +47,7 @@ class EntityDescriptorRepositoryTest extends Specification { UserRepository userRepository OpenSamlObjects openSamlObjects = new OpenSamlObjects().with { - init() + it.init() it } @@ -61,4 +66,30 @@ class EntityDescriptorRepositoryTest extends Specification { then: item1.hashCode() == item2.hashCode() } + + def "SHIBUI-950"() { + when: + def input = openSamlObjects.unmarshalFromXml(this.class.getResource('/metadata/SHIBUI-950.xml').bytes) as EntityDescriptor + entityDescriptorRepository.save(input) + + then: + noExceptionThrown() + } + + @TestConfiguration + static class Config { + @Bean + MetadataResolver metadataResolver() { + new OpenSamlChainingMetadataResolver().with { + it.id = 'tester' + it.initialize() + return it + } + } + + @Bean + Analyzer analyzer() { + return new EnglishAnalyzer() + } + } } diff --git a/backend/src/test/resources/metadata/SHIBUI-950.xml b/backend/src/test/resources/metadata/SHIBUI-950.xml new file mode 100644 index 000000000..1d534cf44 --- /dev/null +++ b/backend/src/test/resources/metadata/SHIBUI-950.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + +0uoDhgpIppfgBW09Xl/CzKh+FtwMpQnyrKUFp4Z4xzM= + + +mR7mTtB6hQYGchYSvOp9xt5emHVT3/vq7ikVkARf3OF3mLkILMX60m5h73T3ZrBK +siVglL2USnsaecbqxZ/zn0Kd+PHcrUyMBBUnZdsmX+C8DfSKvV6fdDRWjcsjG4pt +DvnX+6UwqESev7wIm0rBfYJMMMEimxsWssQQg7v/yAuoeMCoz8sUPIpMm6sB6qXl +6ldXLt2dmDSXtrtd2Er+e8lp4QvpohI9DyzDqtHKAKD0y3TMqniZ8LA59cnjTcQg +MCD9DszcBuexniOMTqrgDG4VFAexSn6k2le/eXJIOsRouVizHOZSei1VxZoFl3IR +PPs+eFOTsligBCEVBPWEUg== +MIIDQjCCAiqgAwIBAgIJAMI1r/DZzTEJMA0GCSqGSIb3DQEBBQUAME8xEzARBgoJ +kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMRwwGgYD +VQQDExN3aWtpLnNoaWJib2xldGgubmV0MB4XDTEzMTEyNTE0NTcyOFoXDTM3MDMw +NDE0NTcyOFowTzETMBEGCgmSJomT8ixkARkWA25ldDEaMBgGCgmSJomT8ixkARkW +CnNoaWJib2xldGgxHDAaBgNVBAMTE3dpa2kuc2hpYmJvbGV0aC5uZXQwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1viMiWhYa8cmxJ6rQ8yORYMD6Gx5n +r/r9wQko+Tbjl/qGS0LaTfPQCokvwrD06506MPHainaMqbjlO4gDjq2LpU9/iy0s +iLuY7UHgDqNNZOELBTQOMwLAFcuEA10FCWjJRglT+6w3xEFeU+dZkBXV1VvKBvsZ +SiuQw437CcV3ueEF4+ZB0l9uyq8o3wzKRZ9DnpyFL7SUJiHJPuqqXZuyQnjLrbVZ +KjjumGnY3LJTUo1xoUEuhqj5RMfspn2oc5YnIYka5YrCBmYKJV3QtCFbLA/cz8nF +m+lOvYGz8nl3wHNkZIVRoetVw/Mhf7lzex0rh3XBdS6vVcT75uH0X1OPAgMBAAGj +ITAfMB0GA1UdDgQWBBQe1XwZavrgAhRXrfhv1gGUwSkc7DANBgkqhkiG9w0BAQUF +AAOCAQEADCGhWJ+oZ8ltcjJ7D66rMg1HOZT6GFCVeZ7MfhY/KFrvsnITNbTA+SgZ +tCJt/BLlZXxpzmix19bD9bNwqEMo7WSqBy77X7SS97ZXti6y6vwAz8h78vzQopOd +rnn8XXyWxtrtRRCK4RMpZGrVm3sfBPW68j9hiPHZqewE4nLavjCki/I9rCMe5dJE +3+ZRf4Ip/9hYqM+a5Chcvbo2zJEOtw+EUQqNTZ51j33H/2qF9UoSpt74UFh+Jd5y +L2GoFSt/gCld78j/7cU3ObGQEme+hVVZ8/uGa/cCYvFt75vNBdnlj4icZ6fgFe9R +9h5hlBTGD3PULSFmCdkgxtwIyd855Q== + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MIIDQjCCAiqgAwIBAgIJAMI1r/DZzTEJMA0GCSqGSIb3DQEBBQUAME8xEzARBgoJ +kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMRwwGgYD +VQQDExN3aWtpLnNoaWJib2xldGgubmV0MB4XDTEzMTEyNTE0NTcyOFoXDTM3MDMw +NDE0NTcyOFowTzETMBEGCgmSJomT8ixkARkWA25ldDEaMBgGCgmSJomT8ixkARkW +CnNoaWJib2xldGgxHDAaBgNVBAMTE3dpa2kuc2hpYmJvbGV0aC5uZXQwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1viMiWhYa8cmxJ6rQ8yORYMD6Gx5n +r/r9wQko+Tbjl/qGS0LaTfPQCokvwrD06506MPHainaMqbjlO4gDjq2LpU9/iy0s +iLuY7UHgDqNNZOELBTQOMwLAFcuEA10FCWjJRglT+6w3xEFeU+dZkBXV1VvKBvsZ +SiuQw437CcV3ueEF4+ZB0l9uyq8o3wzKRZ9DnpyFL7SUJiHJPuqqXZuyQnjLrbVZ +KjjumGnY3LJTUo1xoUEuhqj5RMfspn2oc5YnIYka5YrCBmYKJV3QtCFbLA/cz8nF +m+lOvYGz8nl3wHNkZIVRoetVw/Mhf7lzex0rh3XBdS6vVcT75uH0X1OPAgMBAAGj +ITAfMB0GA1UdDgQWBBQe1XwZavrgAhRXrfhv1gGUwSkc7DANBgkqhkiG9w0BAQUF +AAOCAQEADCGhWJ+oZ8ltcjJ7D66rMg1HOZT6GFCVeZ7MfhY/KFrvsnITNbTA+SgZ +tCJt/BLlZXxpzmix19bD9bNwqEMo7WSqBy77X7SS97ZXti6y6vwAz8h78vzQopOd +rnn8XXyWxtrtRRCK4RMpZGrVm3sfBPW68j9hiPHZqewE4nLavjCki/I9rCMe5dJE +3+ZRf4Ip/9hYqM+a5Chcvbo2zJEOtw+EUQqNTZ51j33H/2qF9UoSpt74UFh+Jd5y +L2GoFSt/gCld78j/7cU3ObGQEme+hVVZ8/uGa/cCYvFt75vNBdnlj4icZ6fgFe9R +9h5hlBTGD3PULSFmCdkgxtwIyd855Q== + + + + + + + + + + + + + + + + + + + urn:oasis:names:tc:SAML:2.0:nameid-format:persistent + urn:oasis:names:tc:SAML:2.0:nameid-format:transient + + + + + + + + Shibboleth Federated Wiki + + A shared Wiki service with automatic registration for users who can supply a supported + identifier, such as eduPersonPrincipalName or eduPersonTargetedID. + + + + + + + + + + + + + Shibboleth Consortium + Shibboleth Consortium + http://www.shibboleth.net/ + + + Shibboleth.Net Technical Support + contact@shibboleth.net + \ No newline at end of file From 362a5d76e7201c612af1297efe09dda8633a4d4a Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Mon, 8 Jul 2019 11:05:17 -0700 Subject: [PATCH 104/112] SHIBUI-1311 Updated dashboard provider list --- .../main/resources/i18n/messages.properties | 2 + .../component/enable-metadata.component.html | 3 +- .../component/enable-metadata.component.ts | 6 -- ui/src/app/core/model/action.ts | 2 +- .../core/service/navigation.service.spec.ts | 50 +++++++++++++ ui/src/app/core/service/navigation.service.ts | 1 - .../metadata/manager/action/manager.action.ts | 12 --- .../metadata/manager/action/search.action.ts | 24 +++--- .../dashboard-providers-list.component.html | 57 ++++++++++++++ .../dashboard-providers-list.component.scss | 14 ++++ ...dashboard-providers-list.component.spec.ts | 50 ++++++++++--- .../dashboard-providers-list.component.ts | 74 +++++++++++++++---- ...dashboard-resolvers-list.component.spec.ts | 26 +++++-- .../dashboard-resolvers-list.component.ts | 41 +++++----- .../metadata/manager/effect/search.effects.ts | 43 ++++++----- ui/src/app/metadata/manager/reducer/index.ts | 5 -- .../manager/reducer/manager.reducer.spec.ts | 30 -------- .../manager/reducer/manager.reducer.ts | 29 -------- .../manager/reducer/search.reducer.ts | 14 ++-- .../provider/effect/collection.effect.ts | 1 + ui/src/app/metadata/provider/reducer/index.ts | 1 + 21 files changed, 305 insertions(+), 180 deletions(-) create mode 100644 ui/src/app/core/service/navigation.service.spec.ts delete mode 100644 ui/src/app/metadata/manager/action/manager.action.ts create mode 100644 ui/src/app/metadata/manager/container/dashboard-providers-list.component.scss delete mode 100644 ui/src/app/metadata/manager/reducer/manager.reducer.spec.ts delete mode 100644 ui/src/app/metadata/manager/reducer/manager.reducer.ts diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties index 389162b05..e04fe3b90 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -393,6 +393,8 @@ label.title=Title label.enabled=Enabled label.author=Author label.creation-date=Creation Date +label.order=Order +label.provider-type=Provider Type label.metadata-resolver-history=Metadata resolver history label.metadata-version-history=Metadata Version History diff --git a/ui/src/app/admin/component/enable-metadata.component.html b/ui/src/app/admin/component/enable-metadata.component.html index cba54f177..01465184f 100644 --- a/ui/src/app/admin/component/enable-metadata.component.html +++ b/ui/src/app/admin/component/enable-metadata.component.html @@ -4,9 +4,8 @@ aria-label="Provider Item Accordion. Press Spacebar to open"> resolvers.map(r => new FileBackedHttpMetadataResolver(r))) ); this.loading$ = this.store.select(fromDashboard.getSearchLoading); - this.entitiesOpen$ = this.store.select(fromDashboard.getOpenProviders); this.total$ = this.resolvers$.pipe(map(list => list.length)); } @@ -51,10 +49,6 @@ export class EnableMetadataComponent implements OnInit { this.router.navigate(['metadata', 'resolver', entity.getId(), 'edit']); } - toggleEntity(entity: MetadataEntity): void { - this.store.dispatch(new ToggleEntityDisplay(entity.getId())); - } - openPreviewDialog(entity: MetadataEntity): void { this.store.dispatch(new PreviewEntity({ id: entity.getId(), entity })); } diff --git a/ui/src/app/core/model/action.ts b/ui/src/app/core/model/action.ts index 6d796da39..2f7e1ca3c 100644 --- a/ui/src/app/core/model/action.ts +++ b/ui/src/app/core/model/action.ts @@ -1,6 +1,6 @@ export interface NavigationAction { action: ($event: Event) => void; - category: string; + category?: string; label: string; content: string; icon?: string; diff --git a/ui/src/app/core/service/navigation.service.spec.ts b/ui/src/app/core/service/navigation.service.spec.ts new file mode 100644 index 000000000..d036019e4 --- /dev/null +++ b/ui/src/app/core/service/navigation.service.spec.ts @@ -0,0 +1,50 @@ +import { TestBed, async } from '@angular/core/testing'; + +import { NavigationService } from './navigation.service'; + +describe('Navigation Service', () => { + let service: NavigationService; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [], + providers: [ + NavigationService + ] + }); + service = TestBed.get(NavigationService); + }); + + it('should instantiate', () => { + expect(service).toBeDefined(); + }); + + describe('addAction method', () => { + it('should add a navigation option to the list of actions', () => { + service.addAction('foo', { + action: () => {}, + category: 'bar', + label: 'baz', + content: 'something' + }); + + expect(service.actionList.length).toBe(1); + }); + + it('should emit the value from an observable when an action is added', (done: DoneFn) => { + const action = { + action: () => { }, + category: 'bar', + label: 'baz', + content: 'something' + }; + const actionName = 'foo'; + service.addAction(actionName, action); + + service.emitter.subscribe((actions) => { + expect(actions.length).toBe(1); + done(); + }); + }); + }); +}); diff --git a/ui/src/app/core/service/navigation.service.ts b/ui/src/app/core/service/navigation.service.ts index 4d6f3821e..dc7b01342 100644 --- a/ui/src/app/core/service/navigation.service.ts +++ b/ui/src/app/core/service/navigation.service.ts @@ -23,7 +23,6 @@ export class NavigationService { } addAction(name: string, action: NavigationAction): NavigationAction[] { - console.log(this.actions); this.actions[name] = action; this.subj.next(this.actionList); return this.actionList; diff --git a/ui/src/app/metadata/manager/action/manager.action.ts b/ui/src/app/metadata/manager/action/manager.action.ts deleted file mode 100644 index cf95aa494..000000000 --- a/ui/src/app/metadata/manager/action/manager.action.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Action } from '@ngrx/store'; - -export const TOGGLE_ENTITY_DISPLAY = '[Dashboard] Display Entity'; - -export class ToggleEntityDisplay implements Action { - readonly type = TOGGLE_ENTITY_DISPLAY; - - constructor(public payload: string) { } -} - -export type Actions = - | ToggleEntityDisplay; diff --git a/ui/src/app/metadata/manager/action/search.action.ts b/ui/src/app/metadata/manager/action/search.action.ts index 457a9c371..c10361a81 100644 --- a/ui/src/app/metadata/manager/action/search.action.ts +++ b/ui/src/app/metadata/manager/action/search.action.ts @@ -1,32 +1,34 @@ -import { Action } from '@ngrx/store'; -import { MetadataEntity } from '../../domain/model'; +import { Action, MemoizedSelector } from '@ngrx/store'; +import { Metadata } from '../../domain/domain.type'; -export const ENTITY_SEARCH = '[Metadata Entity Search] Entity Search'; -export const ENTITY_FILTER = '[Metadata Entity Filter] Entity Filter'; -export const ENTITY_SEARCH_COMPLETE = '[Metadata Entity Search] Entity Search COMPLETE'; +export enum DashboardSearchActionTypes { + ENTITY_SEARCH_COMPLETE = '[Metadata Entity Search] Entity Search COMPLETE', + ENTITY_FILTER = '[Metadata Entity Filter] Entity Filter', + ENTITY_SEARCH = '[Metadata Entity Search] Entity Search', +} /** * Add Resolver to Collection Actions */ export class SearchAction implements Action { - readonly type = ENTITY_SEARCH; + readonly type = DashboardSearchActionTypes.ENTITY_SEARCH; - constructor(public payload: string) { } + constructor(public payload: { query: string, selector: MemoizedSelector }) { } } export class FilterAction implements Action { - readonly type = ENTITY_FILTER; + readonly type = DashboardSearchActionTypes.ENTITY_FILTER; constructor(public payload: string) { } } export class SearchCompleteAction implements Action { - readonly type = ENTITY_SEARCH_COMPLETE; + readonly type = DashboardSearchActionTypes.ENTITY_SEARCH_COMPLETE; - constructor(public payload: Array) { } + constructor(public payload: Array) { } } -export type Actions = +export type DashboardSearchActionsUnion = | SearchAction | FilterAction | SearchCompleteAction; diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html index b0f47ee04..07d0bf58d 100644 --- a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html +++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html @@ -8,6 +8,62 @@
    • + + +
    + + + + + + + + + + + + + + + + + + + +
    OrderTitleProvider TypeAuthorCreated DateEnabled
    +
    +
    {{ i }}
    +
    —
    +   + + +
    +     		+ {{ provider.name }} + {{ provider['@type'] }}{{ provider.createdBy }}{{ provider.createdDate | customDate : '—' }} + + Enabled + Enabled + +
    +
    +
    diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.scss b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.scss new file mode 100644 index 000000000..133f4a03c --- /dev/null +++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.scss @@ -0,0 +1,14 @@ +@import '../../../../theme/palette'; +.provider-index { + font-size: 1.8rem; + line-height: 1.8rem; + font-weight: lighter; + font-family: monospace; + width: 45px; +} + +.table-providers { + tr > td { + vertical-align: middle; + } +} \ No newline at end of file diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.spec.ts b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.spec.ts index 1a8c447e3..4b5d1c38a 100644 --- a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.spec.ts +++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.spec.ts @@ -1,6 +1,6 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; -import { Router } from '@angular/router'; +import { Router, RouterModule } from '@angular/router'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { StoreModule, Store, combineReducers } from '@ngrx/store'; import { NgbPaginationModule, NgbModal, NgbModalModule } from '@ng-bootstrap/ng-bootstrap'; @@ -12,10 +12,10 @@ import { NgbModalStub } from '../../../../testing/modal.stub'; import { DashboardProvidersListComponent } from './dashboard-providers-list.component'; import { MetadataProvider } from '../../domain/model'; import { ProviderItemComponent } from '../component/provider-item.component'; -import { FileBackedHttpMetadataResolver } from '../../domain/entity'; import { MockI18nModule } from '../../../../testing/i18n.stub'; import { CustomDatePipe } from '../../../shared/pipe/date.pipe'; -import { Observable, of } from 'rxjs'; +import { of } from 'rxjs'; +import { InfiniteScrollModule } from 'ngx-infinite-scroll'; describe('Dashboard Providers List Page', () => { @@ -30,6 +30,8 @@ describe('Dashboard Providers List Page', () => { name: 'bar' }; + let dispatchSpy, selectSpy; + beforeEach(() => { TestBed.configureTestingModule({ providers: [ @@ -44,7 +46,9 @@ describe('Dashboard Providers List Page', () => { ReactiveFormsModule, NgbPaginationModule, NgbModalModule, - MockI18nModule + MockI18nModule, + InfiniteScrollModule, + RouterModule ], declarations: [ DashboardProvidersListComponent, @@ -61,8 +65,8 @@ describe('Dashboard Providers List Page', () => { router = TestBed.get(Router); modal = TestBed.get(NgbModal); - spyOn(store, 'dispatch').and.callThrough(); - spyOn(store, 'select').and.returnValues(of([]), of({'foo': true})); + dispatchSpy = spyOn(store, 'dispatch').and.callThrough(); + selectSpy = spyOn(store, 'select').and.returnValues(of([]), of({'foo': true})); }); it('should compile', () => { @@ -71,10 +75,19 @@ describe('Dashboard Providers List Page', () => { expect(fixture).toBeDefined(); }); - describe('toggleProvider method', () => { - it('should fire a redux action', () => { - instance.toggleEntity(provider); + describe('search method', () => { + it('should default to an empty string', () => { + instance.search(); expect(store.dispatch).toHaveBeenCalled(); + const action = dispatchSpy.calls.mostRecent().args[0]; + expect(action.payload.query).toBe(''); + }); + + it('should search with the provided query string', () => { + instance.search('foo'); + expect(store.dispatch).toHaveBeenCalled(); + const action = dispatchSpy.calls.mostRecent().args[0]; + expect(action.payload.query).toBe('foo'); }); }); @@ -85,4 +98,23 @@ describe('Dashboard Providers List Page', () => { expect(router.navigate).toHaveBeenCalledWith(['metadata', 'provider', provider.resourceId, 'edit']); }); }); + + describe('loadMore method', () => { + it('should call the page observable to emit the next value', (done: DoneFn) => { + instance.loadMore(5); + instance.page$.subscribe(val => { + expect(val).toBe(5); + expect(instance.page).toBe(5); + done(); + }); + }); + }); + + describe('onScroll method', () => { + it('should call the loadMore method', () => { + spyOn(instance, 'loadMore'); + instance.onScroll(new Event('scrolled')); + expect(instance.loadMore).toHaveBeenCalledWith(instance.page + 1); + }); + }); }); diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts index de7c3644f..6d09cf0fa 100644 --- a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts +++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts @@ -1,34 +1,80 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { MetadataProvider } from '../../domain/model'; -import { Observable } from '../../../../../node_modules/rxjs'; +import { Observable, BehaviorSubject, combineLatest } from 'rxjs'; import { Store } from '@ngrx/store'; -import { ProviderState, getOrderedProviders } from '../../provider/reducer'; -import { getOpenProviders } from '../reducer'; -import { ToggleEntityDisplay } from '../action/manager.action'; -import { map } from 'rxjs/operators'; +import { ProviderState, getOrderedProvidersInSearch, getOrderedProviders } from '../../provider/reducer'; +import * as fromDashboard from '../reducer'; +import { map, startWith } from 'rxjs/operators'; import { ChangeProviderOrderUp, ChangeProviderOrderDown } from '../../provider/action/collection.action'; import { Metadata } from '../../domain/domain.type'; +import { MetadataProvider } from '../../domain/model'; +import { SearchAction } from '../action/search.action'; +import { withLatestFrom } from 'rxjs/operators'; @Component({ selector: 'dashboard-providers-list', - templateUrl: './dashboard-providers-list.component.html' + templateUrl: './dashboard-providers-list.component.html', + styleUrls: ['./dashboard-providers-list.component.scss'] }) export class DashboardProvidersListComponent implements OnInit { - providers$: Observable; - providersOpen$: Observable<{ [key: string]: boolean }>; + providers$: Observable; + searchQuery$: Observable; + loading$: Observable; + + total$: Observable; + page = 1; + limit = 20; + limited$: Observable; + + isSearching$: Observable; + + private subj: BehaviorSubject = new BehaviorSubject(this.page); + readonly page$: Observable = this.subj.asObservable(); constructor( private store: Store, private router: Router - ) { } + ) { + const providers = this.store.select(fromDashboard.getSearchResults) as Observable; + this.providers$ = providers as Observable; + + this.searchQuery$ = store.select(fromDashboard.getSearchQuery); + this.loading$ = store.select(fromDashboard.getSearchLoading); + + this.total$ = this.providers$.pipe(map(list => list.length)); + + this.isSearching$ = this.searchQuery$.pipe(map(q => q.length > 0)); + + this.limited$ = combineLatest( + this.providers$, + this.page$ + ).pipe( + map(([list, page]) => { + let maxIndex = (page * this.limit) - 1, + minIndex = 0; + return list.filter((provider: Metadata, index: number) => (maxIndex >= index && index >= minIndex)); + }) + ); + } ngOnInit(): void { - this.providers$ = this.store.select(getOrderedProviders); - this.providersOpen$ = this.store.select(getOpenProviders); + this.search(); + } + + loadMore(index: number): void { + this.subj.next(index); + this.page = index; + } + + search(query: string = ''): void { + this.store.dispatch(new SearchAction({query, selector: getOrderedProviders})); + } + + onScroll(event: Event): void { + this.loadMore(this.page + 1); } view(id: string, page: string): void { @@ -43,10 +89,6 @@ export class DashboardProvidersListComponent implements OnInit { this.view(provider.resourceId, 'filters'); } - toggleEntity(provider: MetadataProvider): void { - this.store.dispatch(new ToggleEntityDisplay(provider.resourceId)); - } - updateOrderUp(provider: MetadataProvider): void { this.store.dispatch(new ChangeProviderOrderUp(provider.resourceId)); } diff --git a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts index 14a153197..0bbaa7f59 100644 --- a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts +++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts @@ -76,13 +76,6 @@ describe('Dashboard Resolvers List Page', () => { expect(fixture).toBeDefined(); }); - describe('toggleResolver method', () => { - it('should fire a redux action', () => { - instance.toggleEntity(draft); - expect(store.dispatch).toHaveBeenCalled(); - }); - }); - describe('search method', () => { it('should fire a redux action', () => { instance.search(); @@ -107,6 +100,25 @@ describe('Dashboard Resolvers List Page', () => { }); }); + describe('loadMore method', () => { + it('should call the page observable to emit the next value', (done: DoneFn) => { + instance.loadMore(5); + instance.page$.subscribe(val => { + expect(val).toBe(5); + expect(instance.page).toBe(5); + done(); + }); + }); + }); + + describe('onScroll method', () => { + it('should call the loadMore method', () => { + spyOn(instance, 'loadMore'); + instance.onScroll(new Event('scrolled')); + expect(instance.loadMore).toHaveBeenCalledWith(instance.page + 1); + }); + }); + describe('deleteResolver method', () => { it('should call the modal service', () => { spyOn(modal, 'open').and.callFake(() => { diff --git a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts index bde5bc624..3e298d14d 100644 --- a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts +++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts @@ -1,16 +1,17 @@ -import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { Store } from '@ngrx/store'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { Observable } from 'rxjs'; +import { Observable, BehaviorSubject, combineLatest } from 'rxjs'; import { map } from 'rxjs/operators'; import { MetadataEntity, MetadataResolver } from '../../domain/model'; import * as searchActions from '../action/search.action'; import * as fromDashboard from '../reducer'; -import { ToggleEntityDisplay } from '../action/manager.action'; import { DeleteDialogComponent } from '../component/delete-dialog.component'; import { RemoveDraftRequest } from '../../resolver/action/draft.action'; +import { getAllResolvers } from '../../resolver/reducer'; +import { FileBackedHttpMetadataResolver } from '../../domain/entity'; @Component({ selector: 'dashboard-resolvers-list', @@ -27,30 +28,26 @@ export class DashboardResolversListComponent implements OnInit { limit = 20; limited$: Observable; - entitiesOpen$: Observable<{ [key: string]: boolean }>; + private subj: BehaviorSubject = new BehaviorSubject(this.page); + readonly page$: Observable = this.subj.asObservable(); constructor( private store: Store, private router: Router, private modalService: NgbModal ) { - this.resolvers$ = store.select(fromDashboard.getSearchResults); + const resolvers: unknown = store.select(fromDashboard.getSearchResults); + this.resolvers$ = (resolvers as Observable) + .pipe( + map(list => list.map(resolver => new FileBackedHttpMetadataResolver(resolver as MetadataResolver))) + ); this.searchQuery$ = store.select(fromDashboard.getSearchQuery); this.loading$ = store.select(fromDashboard.getSearchLoading); - this.entitiesOpen$ = store.select(fromDashboard.getOpenProviders); this.total$ = this.resolvers$.pipe(map(list => list.length)); - this.limited$ = this.getPagedResolvers(this.page, this.resolvers$); - } - - ngOnInit(): void { - this.search(); - } - - getPagedResolvers(page: number, list$: Observable): Observable { - return list$.pipe( - map((providers: MetadataEntity[]) => { + this.limited$ = combineLatest(this.resolvers$, this.page$).pipe( + map(([providers, page]) => { let maxIndex = (page * this.limit) - 1, minIndex = 0; return providers.filter((resolver: MetadataEntity, index: number) => (maxIndex >= index && index >= minIndex)); @@ -58,13 +55,17 @@ export class DashboardResolversListComponent implements OnInit { ); } + ngOnInit(): void { + this.search(); + } + loadMore(index: number): void { + this.subj.next(index); this.page = index; - this.limited$ = this.getPagedResolvers(index, this.resolvers$); } search(query: string = ''): void { - this.store.dispatch(new searchActions.SearchAction(query)); + this.store.dispatch(new searchActions.SearchAction({query, selector: getAllResolvers})); this.page = 1; } @@ -81,10 +82,6 @@ export class DashboardResolversListComponent implements OnInit { }); } - toggleEntity(entity: MetadataEntity): void { - this.store.dispatch(new ToggleEntityDisplay(entity.getId())); - } - viewMetadataHistory(entity: MetadataEntity): void { this.router.navigate(['metadata', 'resolver', entity.getId(), 'versions']); } diff --git a/ui/src/app/metadata/manager/effect/search.effects.ts b/ui/src/app/metadata/manager/effect/search.effects.ts index e1da7c539..81ce788c4 100644 --- a/ui/src/app/metadata/manager/effect/search.effects.ts +++ b/ui/src/app/metadata/manager/effect/search.effects.ts @@ -1,23 +1,27 @@ import { Injectable } from '@angular/core'; import { Effect, Actions, ofType } from '@ngrx/effects'; -import { Store } from '@ngrx/store'; +import { Store, MemoizedSelector } from '@ngrx/store'; import { Observable, of } from 'rxjs'; import { switchMap, map, combineLatest } from 'rxjs/operators'; -import * as entitySearch from '../action/search.action'; +import { + DashboardSearchActionTypes, + SearchAction, + DashboardSearchActionsUnion, + SearchCompleteAction +} from '../action/search.action'; import * as fromManager from '../reducer'; -import * as fromResolver from '../../resolver/reducer'; -import { MetadataProvider } from '../../domain/model/metadata-provider'; -import { FileBackedHttpMetadataResolver } from '../../domain/entity'; +import { Metadata } from '../../domain/domain.type'; +import { MetadataResolver } from '../../domain/model'; @Injectable() export class SearchEffects { @Effect() - search$ = this.actions$.pipe( - ofType(entitySearch.ENTITY_SEARCH), + searchResolvers$ = this.actions$.pipe( + ofType(DashboardSearchActionTypes.ENTITY_SEARCH), map(action => action.payload), - switchMap(() => this.performSearch()) + switchMap(({ selector }) => this.performSearch(selector)) ); matcher = (value, query) => value ? value.toLocaleLowerCase().match(query.toLocaleLowerCase()) : false; @@ -27,26 +31,21 @@ export class SearchEffects { private store: Store ) { } - private performSearch(): Observable { + private performSearch(selector: MemoizedSelector): Observable { return of([]).pipe( combineLatest( - this.store.select(fromResolver.getAllResolvers), - (o: any[], p: MetadataProvider[]): Array => { - return o.concat( - p.map(provider => new FileBackedHttpMetadataResolver(provider)) - ); - } + this.store.select(selector), + (o: any[], p: Metadata[]): Array => o.concat(p) ), combineLatest( this.store.select(fromManager.getSearchQuery), - (entities, term) => { - const filtered = entities.filter( - e => this.matcher(e.name, term) || this.matcher(e.entityId, term) - ); - return filtered; - } + (entities, term) => + entities.filter( + e => this.matcher(e.name, term) ? true : + ('entityId' in e) ? this.matcher((e as MetadataResolver).entityId, term) : this.matcher(e['@type'], term) + ) ), - map(entities => new entitySearch.SearchCompleteAction(entities)) + map(entities => new SearchCompleteAction(entities)) ); } } /* istanbul ignore next */ diff --git a/ui/src/app/metadata/manager/reducer/index.ts b/ui/src/app/metadata/manager/reducer/index.ts index 584760916..7c308183c 100644 --- a/ui/src/app/metadata/manager/reducer/index.ts +++ b/ui/src/app/metadata/manager/reducer/index.ts @@ -1,10 +1,8 @@ import { createSelector, createFeatureSelector } from '@ngrx/store'; import * as fromRoot from '../../../core/reducer'; -import * as fromDashboard from './manager.reducer'; import * as fromSearch from './search.reducer'; export interface DashboardState { - manager: fromDashboard.State; search: fromSearch.SearchState; } @@ -13,13 +11,10 @@ export interface State extends fromRoot.State { } export const reducers = { - manager: fromDashboard.reducer, search: fromSearch.reducer }; export const getFeatureState = createFeatureSelector('manager'); -export const getDashboardState = createSelector(getFeatureState, (state: DashboardState) => state.manager); -export const getOpenProviders = createSelector(getDashboardState, (manager: fromDashboard.State) => manager.resolversOpen); export const getSearchState = createSelector(getFeatureState, (state: DashboardState) => state.search diff --git a/ui/src/app/metadata/manager/reducer/manager.reducer.spec.ts b/ui/src/app/metadata/manager/reducer/manager.reducer.spec.ts deleted file mode 100644 index 9a57ad2fc..000000000 --- a/ui/src/app/metadata/manager/reducer/manager.reducer.spec.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { reducer } from './manager.reducer'; -import * as fromDashboard from './manager.reducer'; -import { ToggleEntityDisplay } from '../action/manager.action'; - -describe('Dashboard Reducer', () => { - const initialState: fromDashboard.State = { - resolversOpen: {} - }; - - describe('undefined action', () => { - it('should return the default state', () => { - const result = reducer(undefined, {} as any); - - expect(result).toEqual(initialState); - }); - }); - - describe('Toggle Resolver Display', () => { - it('should toggle the selected providers open state', () => { - const id = 'foo'; - const action = new ToggleEntityDisplay(id); - - const result = reducer(initialState, action); - - expect(result).toEqual( - Object.assign({}, initialState, { resolversOpen: { foo: true } }) - ); - }); - }); -}); diff --git a/ui/src/app/metadata/manager/reducer/manager.reducer.ts b/ui/src/app/metadata/manager/reducer/manager.reducer.ts deleted file mode 100644 index b37bb940f..000000000 --- a/ui/src/app/metadata/manager/reducer/manager.reducer.ts +++ /dev/null @@ -1,29 +0,0 @@ -import * as manager from '../action/manager.action'; - -export interface State { - resolversOpen: {[key: string]: boolean}; -} - -export const initialState: State = { - resolversOpen: {} -}; - -export function reducer(state = initialState, action: manager.Actions): State { - switch (action.type) { - case manager.TOGGLE_ENTITY_DISPLAY: { - return { - ...state, - resolversOpen: { - ...state.resolversOpen, - ...{[action.payload]: !state.resolversOpen[action.payload]} - } - }; - } - default: { - // console.log(state); - return state; - } - } -} - -export const resolversOpen = (state: State) => state.resolversOpen; diff --git a/ui/src/app/metadata/manager/reducer/search.reducer.ts b/ui/src/app/metadata/manager/reducer/search.reducer.ts index 17e700abd..38b6cf327 100644 --- a/ui/src/app/metadata/manager/reducer/search.reducer.ts +++ b/ui/src/app/metadata/manager/reducer/search.reducer.ts @@ -1,8 +1,8 @@ -import * as searchActions from '../action/search.action'; -import { MetadataEntity } from '../../domain/model'; +import { DashboardSearchActionTypes, DashboardSearchActionsUnion } from '../action/search.action'; +import { Metadata } from '../../domain/domain.type'; export interface SearchState { - entities: MetadataEntity[]; + entities: Metadata[]; loading: boolean; query: string; } @@ -13,17 +13,17 @@ const initialState: SearchState = { query: '' }; -export function reducer(state = initialState, action: searchActions.Actions): SearchState { +export function reducer(state = initialState, action: DashboardSearchActionsUnion): SearchState { switch (action.type) { - case searchActions.ENTITY_SEARCH: { + case DashboardSearchActionTypes.ENTITY_SEARCH: { return { ...state, - query: action.payload, + query: action.payload.query, loading: true, }; } - case searchActions.ENTITY_SEARCH_COMPLETE: { + case DashboardSearchActionTypes.ENTITY_SEARCH_COMPLETE: { return { entities: action.payload, loading: false, diff --git a/ui/src/app/metadata/provider/effect/collection.effect.ts b/ui/src/app/metadata/provider/effect/collection.effect.ts index 7091e46d8..8b1003912 100644 --- a/ui/src/app/metadata/provider/effect/collection.effect.ts +++ b/ui/src/app/metadata/provider/effect/collection.effect.ts @@ -235,6 +235,7 @@ export class CollectionEffects { withLatestFrom(this.store.select(fromProvider.getProviderOrder)), map(([id, order]) => { const index = order.indexOf(id); + console.log(id, order); if (index > 0) { const newOrder = array_move(order, index, index - 1); return new SetOrderProviderRequest(newOrder); diff --git a/ui/src/app/metadata/provider/reducer/index.ts b/ui/src/app/metadata/provider/reducer/index.ts index c05a233e3..d40313299 100644 --- a/ui/src/app/metadata/provider/reducer/index.ts +++ b/ui/src/app/metadata/provider/reducer/index.ts @@ -71,3 +71,4 @@ export const getProviderFilters = createSelector(getSelectedProvider, provider = export const getProviderXmlIds = createSelector(getAllProviders, (providers: MetadataProvider[]) => providers.map(p => p.xmlId)); export const getOrderedProviders = createSelector(getAllProviders, getProviderOrder, utils.mergeOrderFn); +export const getOrderedProvidersInSearch = createSelector(getAllProviders, getProviderOrder, utils.mergeOrderFn); From 751a0de8ec5f8940d3c41962d7fb5ea1579159ab Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Thu, 11 Jul 2019 07:34:56 -0700 Subject: [PATCH 105/112] NOJIRA: fixed issue with date --- .../manager/container/dashboard-providers-list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html index 07d0bf58d..25860cf59 100644 --- a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html +++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html @@ -50,7 +50,7 @@ {{ provider['@type'] }} {{ provider.createdBy }} - {{ provider.createdDate | customDate : '—' }} + {{ provider.createdDate | customDate }} Date: Thu, 11 Jul 2019 07:57:08 -0700 Subject: [PATCH 106/112] SHIBUI fixed route for provider edit --- .../dashboard-providers-list.component.html | 22 ++----------------- .../dashboard-providers-list.component.ts | 3 ++- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html index 25860cf59..bceba636f 100644 --- a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html +++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html @@ -46,7 +46,8 @@
    - {{ provider.name }} + + {{ provider.name }} {{ provider['@type'] }} {{ provider.createdBy }} @@ -63,25 +64,6 @@
    -

    diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts index 6d09cf0fa..6a206d9a1 100644 --- a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts +++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts @@ -81,7 +81,8 @@ export class DashboardProvidersListComponent implements OnInit { this.router.navigate(['metadata', 'provider', id, page]); } - edit(provider: MetadataProvider): void { + edit(provider: MetadataProvider, event: Event): void { + event.preventDefault(); this.view(provider.resourceId, 'edit'); } From 762d61c389bfa10941c213b9e5be84d8daa16619 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Thu, 11 Jul 2019 08:27:02 -0700 Subject: [PATCH 107/112] Fixed header component --- .../component/metadata-header.component.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.html b/ui/src/app/metadata/configuration/component/metadata-header.component.html index 4da057c91..64a1a2a2c 100644 --- a/ui/src/app/metadata/configuration/component/metadata-header.component.html +++ b/ui/src/app/metadata/configuration/component/metadata-header.component.html @@ -1,11 +1,12 @@
    -

    - Saved  - {{ version.date | date }}, - by  +

    + Saved:  + {{ version.date | date:'medium' }} +
    + By:  {{ version.creator }} -
    +

    Enabled Disabled From 61ea9229638ca0dcaabb59011dc4a619e23ff6cb Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Thu, 11 Jul 2019 08:27:56 -0700 Subject: [PATCH 108/112] Fixed header text --- backend/src/main/resources/i18n/messages.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties index e04fe3b90..f3054d636 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -84,7 +84,6 @@ value.dynamic-http-metadata-provider=DynamicHttpMetadataProvider value.entity-attributes-filter=EntityAttributes Filter value.spdescriptor=SPSSODescriptor value.attr-auth-descriptor=AttributeAuthorityDescriptor -value.dynamic-http-metadata-provider=DynamicHttpMetadataProvider value.local-dynamic-metadata-provider=LocalDynamicMetadataProvider value.md-query-protocol=MetadataQueryProtocol @@ -409,7 +408,7 @@ label.restore=Restore label.compare-selected=Compare Selected label.saved=Saved -label.by=by +label.by=By message.delete-user-title=Delete User? message.delete-user-body=You are requesting to delete a user. If you complete this process the user will be removed. This cannot be undone. Do you wish to continue? From 5dcf0eaf789d0a241040c89d2d64575a6d094001 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Thu, 11 Jul 2019 10:49:31 -0700 Subject: [PATCH 109/112] SHIBUI-1352 fixed provider selection issue --- ...dynamic-http-metadata-provider.schema.json | 30 ++++++++++++ .../file-system-metadata-provider.schema.json | 6 +-- ...ocal-dynamic-metadata-provider.schema.json | 8 +-- .../container/provider-select.component.ts | 8 +-- .../model/dynamic-http.provider.form.ts | 33 ++++++++++++- .../provider/reducer/collection.reducer.ts | 5 +- .../provider/filebacked-http.schema.json | 49 ++----------------- 7 files changed, 77 insertions(+), 62 deletions(-) diff --git a/backend/src/main/resources/dynamic-http-metadata-provider.schema.json b/backend/src/main/resources/dynamic-http-metadata-provider.schema.json index 68fdf6fd7..f7106c6e5 100644 --- a/backend/src/main/resources/dynamic-http-metadata-provider.schema.json +++ b/backend/src/main/resources/dynamic-http-metadata-provider.schema.json @@ -1,11 +1,41 @@ { "type": "object", "required": [ + "name", + "@type", "xmlId", "metadataURL", "metadataRequestURLConstructionScheme" ], "properties": { + "name": { + "title": "label.metadata-provider-name-dashboard-display-only", + "description": "tooltip.metadata-provider-name-dashboard-display-only", + "type": "string", + "widget": { + "id": "string", + "help": "message.must-be-unique" + } + }, + "@type": { + "title": "label.metadata-provider-type", + "description": "tooltip.metadata-provider-type", + "placeholder": "label.select-metadata-type", + "type": "string", + "readOnly": true, + "widget": { + "id": "select", + "disabled": true + }, + "oneOf": [ + { + "enum": [ + "DynamicHttpMetadataResolver" + ], + "description": "value.dynamic-http-metadata-provider" + } + ] + }, "enabled": { "title": "label.enable-provider-upon-saving", "description": "tooltip.enable-provider-upon-saving", diff --git a/backend/src/main/resources/file-system-metadata-provider.schema.json b/backend/src/main/resources/file-system-metadata-provider.schema.json index cbfec6b8c..af2f8af0a 100644 --- a/backend/src/main/resources/file-system-metadata-provider.schema.json +++ b/backend/src/main/resources/file-system-metadata-provider.schema.json @@ -8,8 +8,8 @@ ], "properties": { "name": { - "title": "label.service-provider-name-dashboard-display-only", - "description": "tooltip.metadata-provider-name", + "title": "label.metadata-provider-name-dashboard-display-only", + "description": "tooltip.metadata-provider-name-dashboard-display-only", "type": "string", "widget": { "id": "string", @@ -29,7 +29,7 @@ "oneOf": [ { "enum": [ - "FileSystemMetadataResolver" + "FilesystemMetadataResolver" ], "description": "value.file-system-metadata-provider" } diff --git a/backend/src/main/resources/local-dynamic-metadata-provider.schema.json b/backend/src/main/resources/local-dynamic-metadata-provider.schema.json index d683db316..f39904f36 100644 --- a/backend/src/main/resources/local-dynamic-metadata-provider.schema.json +++ b/backend/src/main/resources/local-dynamic-metadata-provider.schema.json @@ -8,8 +8,8 @@ ], "properties": { "name": { - "title": "label.metadata-provider-name-display-only", - "description": "tooltip.metadata-provider-name-display-only", + "title": "label.metadata-provider-name-dashboard-display-only", + "description": "tooltip.metadata-provider-name-dashboard-display-only", "type": "string", "widget": { "id": "string", @@ -29,9 +29,9 @@ "oneOf": [ { "enum": [ - "FileSystemMetadataResolver" + "LocalDynamicMetadataResolver" ], - "description": "value.file-system-metadata-provider" + "description": "value.local-dynamic-metadata-provider" } ] }, diff --git a/ui/src/app/metadata/provider/container/provider-select.component.ts b/ui/src/app/metadata/provider/container/provider-select.component.ts index b0c07f6fd..37519a259 100644 --- a/ui/src/app/metadata/provider/container/provider-select.component.ts +++ b/ui/src/app/metadata/provider/container/provider-select.component.ts @@ -20,6 +20,7 @@ import { ClearEditor } from '../action/editor.action'; export class ProviderSelectComponent implements OnDestroy { actionsSubscription: Subscription; + providerSubscription: Subscription; provider$: Observable; @@ -31,11 +32,9 @@ export class ProviderSelectComponent implements OnDestroy { map(params => new SelectProviderRequest(params.providerId)) ).subscribe(store); - this.provider$ = this.store.select(fromProviders.getSelectedProvider).pipe(filter(p => { - return p; - })); + this.provider$ = this.store.select(fromProviders.getSelectedProvider).pipe(filter(p => !!p)); - this.provider$.subscribe(provider => { + this.providerSubscription = this.provider$.subscribe(provider => { this.setDefinition(provider); }); } @@ -50,6 +49,7 @@ export class ProviderSelectComponent implements OnDestroy { ngOnDestroy() { this.actionsSubscription.unsubscribe(); + this.providerSubscription.unsubscribe(); this.store.dispatch(new ClearProvider()); this.store.dispatch(new ClearWizard()); this.store.dispatch(new ClearEditor()); diff --git a/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts b/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts index a0ca22143..2583e3c69 100644 --- a/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts +++ b/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts @@ -6,7 +6,6 @@ export const DynamicHttpMetadataProviderWizard: Wizard { let base = BaseMetadataProviderEditor.formatter(changes); if (base.dynamicMetadataResolverAttributes) { @@ -136,13 +135,43 @@ export const DynamicHttpMetadataProviderEditor: Wizard Date: Thu, 11 Jul 2019 11:56:24 -0700 Subject: [PATCH 110/112] SHIBUI-1352 Fixed unit test --- .../container/dashboard-providers-list.component.spec.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.spec.ts b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.spec.ts index 4b5d1c38a..b70132eba 100644 --- a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.spec.ts +++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.spec.ts @@ -93,8 +93,11 @@ describe('Dashboard Providers List Page', () => { describe('edit method', () => { it('should route to the edit page', () => { + const evt = new Event('a type'); spyOn(router, 'navigate'); - instance.edit(provider); + spyOn(evt, 'preventDefault'); + instance.edit(provider, evt); + expect(evt.preventDefault).toHaveBeenCalled(); expect(router.navigate).toHaveBeenCalledWith(['metadata', 'provider', provider.resourceId, 'edit']); }); }); From 33929b4b2158411e2abee495b7fc9b9184aa78d5 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Fri, 12 Jul 2019 08:42:02 -0400 Subject: [PATCH 111/112] Polishing --- .../shibboleth/admin/ui/envers/EnversVersionServiceSupport.java | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java index b5e713143..bbf399227 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java @@ -32,7 +32,6 @@ public List findVersionsForPersistentEntity(String resourceId, Class .getResultList(); Object listOfVersions = revs.stream() - //.map(it -> ((Object[]) it)) .map(it -> { return new Version(((PrincipalAwareRevisionEntity) ((Object[]) it)[1]).idAsString(), ((AbstractAuditable) ((Object[]) it)[0]).getModifiedBy(), From d3e14210c1b4904f593580ca5d8743560a470f47 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 15 Jul 2019 13:38:46 -0400 Subject: [PATCH 112/112] Fixing tests OOM --- build.gradle | 6 ++++++ gradle.properties | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ff3c80edc..5b78682dc 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,12 @@ plugins { id 'com.github.breadmoirai.github-release' version '2.2.9' } +subprojects { + tasks.withType(Test) { + maxHeapSize = "3g" + } +} + tasks.findByName('release').dependsOn project.getTasksByName('test', true) githubRelease { diff --git a/gradle.properties b/gradle.properties index 335e4cb7b..4fdf282d7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ hibernate.version=5.2.11.Final lucene.version=7.2.1 -org.gradle.jvmargs=-Xmx4g -XX:-UseGCOverheadLimit +org.gradle.jvmargs=-Xmx1g -XX:-UseGCOverheadLimit # set token in personal global i2.github.token=