Fixed merge conflict

TIER · Feb 7, 2019 · 4d6e15e · 4d6e15e
2 parents 84c0aac + f6ee403
commit 4d6e15e
Show file tree

Hide file tree

Showing 13 changed files with 2,442 additions and 2,409 deletions.
diff --git a/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -281,13 +281,15 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
     }
 
     void constructXmlNodeForFilter(EntityRoleWhiteListFilter filter, def markupBuilderDelegate) {
-        markupBuilderDelegate.MetadataFilter(
-                'xsi:type': 'EntityRoleWhiteList',
-                'xmlns:md': 'urn:oasis:names:tc:SAML:2.0:metadata'
-        ) {
-            filter.retainedRoles.each {
-                // TODO: fix
-                markupBuilderDelegate.RetainedRole(it.startsWith('md:') ? it : "md:${it}")
+        if (!filter.retainedRoles?.isEmpty()) {
+            markupBuilderDelegate.MetadataFilter(
+                    'xsi:type': 'EntityRoleWhiteList',
+                    'xmlns:md': 'urn:oasis:names:tc:SAML:2.0:metadata'
+            ) {
+                filter.retainedRoles.each {
+                    // TODO: fix
+                    markupBuilderDelegate.RetainedRole(it.startsWith('md:') ? it : "md:${it}")
+                }
             }
         }
     }

diff --git a/...main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersController.java b/...main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersController.java
@@ -59,8 +59,9 @@ public List<User> getAll() {
 
     @Transactional(readOnly = true)
     @GetMapping("/current")
-    public Principal getCurrentUser(Principal principal) {
-        return principal;
+    public User getCurrentUser(Principal principal) {
+        // TODO: fix this
+        return userService.getCurrentUser();
     }
 
     @PreAuthorize("hasRole('ADMIN')")

diff --git a/...nd/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/UserService.java b/...nd/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/UserService.java
@@ -51,7 +51,7 @@ public User getCurrentUser() {
         //TODO: Consider returning an Optional here
         User user = null;
         if (SecurityContextHolder.getContext() != null && SecurityContextHolder.getContext().getAuthentication() != null) {
-            String principal = (String) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+            String principal = SecurityContextHolder.getContext().getAuthentication().getName();
             if (StringUtils.isNotBlank(principal)) {
                 Optional<User> persistedUser = userRepository.findByUsername(principal);
                 if (persistedUser.isPresent()) {

diff --git a/.../edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerTests.groovy b/.../edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerTests.groovy
@@ -95,7 +95,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def emptyRecordsFromRepository = [].stream()
         def expectedEmptyListResponseBody = '[]'
@@ -118,7 +118,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def entityDescriptor = new EntityDescriptor(resourceId: 'uuid-1', entityID: 'eid1', serviceProviderName: 'sp1', serviceEnabled: true,
@@ -168,7 +168,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def entityDescriptorOne = new EntityDescriptor(resourceId: 'uuid-1', entityID: 'eid1', serviceProviderName: 'sp1',
@@ -242,7 +242,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'someUser'
         def role = 'ROLE_USER'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def entityDescriptorOne = new EntityDescriptor(resourceId: 'uuid-1', entityID: 'eid1', serviceProviderName: 'sp1',
@@ -293,7 +293,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def expectedEntityId = 'https://shib'
@@ -376,7 +376,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'someUser'
         def role = 'ROLE_USER'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedEntityId = 'https://shib'
         def expectedSpName = 'sp1'
@@ -453,7 +453,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def providedResourceId = 'uuid-1'
 
@@ -470,7 +470,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def providedResourceId = 'uuid-1'
@@ -521,7 +521,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'someUser'
         def role = 'ROLE_USER'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def providedResourceId = 'uuid-1'
@@ -573,7 +573,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'someUser'
         def role = 'ROLE_USER'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def providedResourceId = 'uuid-1'
@@ -599,7 +599,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def providedResourceId = 'uuid-1'
@@ -634,7 +634,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'someUser'
         def role = 'ROLE_USER'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def providedResourceId = 'uuid-1'
@@ -670,7 +670,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'someUser'
         def role = 'ROLE_USER'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def providedResourceId = 'uuid-1'
@@ -700,7 +700,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def postedBody = '''<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://test.scaldingspoon.org/test1">
@@ -820,7 +820,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def postedMetadataUrl = "http://test.scaldingspoon.org/test1"
         def restXml = '''<?xml version="1.0" encoding="UTF-8"?>
@@ -903,7 +903,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def entityDescriptor = generator.buildEntityDescriptor()
         def updatedEntityDescriptor = generator.buildEntityDescriptor()
@@ -934,7 +934,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'someUser'
         def role = 'ROLE_USER'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def entityDescriptor = generator.buildEntityDescriptor()
         entityDescriptor.serviceEnabled = false
@@ -964,7 +964,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'someUser'
         def role = 'ROLE_USERN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def entityDescriptor = generator.buildEntityDescriptor()
         entityDescriptor.createdBy = 'someoneElse'
@@ -990,7 +990,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def entityDescriptor = generator.buildEntityDescriptor()
         def updatedEntityDescriptor = generator.buildEntityDescriptor()

diff --git a/...edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy b/...edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
@@ -8,6 +8,7 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration
 import edu.internet2.tier.shibboleth.admin.ui.configuration.ShibUIConfiguration
 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.filters.MetadataFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.RequiredValidUntilFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ClasspathMetadataResource
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver
@@ -239,6 +240,26 @@ class JPAMetadataResolverServiceImplTests extends Specification {
         generatedXmlIsTheSameAsExpectedXml('/conf/532.xml', domBuilder.parseText(writer.toString()))
     }
 
+    def 'SHIBUI-960 test generating FileBackedHttpMetadataResolver with empty EntityRoleWhitelistFilter produces no filter in the xml'() {
+        given:
+        def resolver = testObjectGenerator.fileBackedHttpMetadataResolver()
+        def erwFilter = testObjectGenerator.entityRoleWhitelistFilter()
+        erwFilter.retainedRoles.clear()
+        resolver.metadataFilters.add(erwFilter)
+
+        when:
+        genXmlSnippet(markupBuilder) {
+            JPAMetadataResolverServiceImpl.cast(metadataResolverService).constructXmlNodeForResolver(resolver, markupBuilder) {
+                resolver.metadataFilters.each { MetadataFilter filter ->
+                    JPAMetadataResolverServiceImpl.cast(metadataResolverService).constructXmlNodeForFilter(filter, markupBuilder)
+                }
+            }
+        }
+
+        then:
+        generatedXmlIsTheSameAsExpectedXml('/conf/532.xml', domBuilder.parseText(writer.toString()))
+    }
+
     def 'test generating ResourceBackedMetadataResolver with SVN resource type xml snippet'() {
         given:
         def resolver = new edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ResourceBackedMetadataResolver().with {