Merged in merge-master-1743 (pull request #525)

Merge master 1743
TIER · Sep 9, 2021 · f9ccfce · f9ccfce
2 parents 9cde801 + c23ba82
commit f9ccfce
Show file tree

Hide file tree

Showing 132 changed files with 3,959 additions and 1,259 deletions.
diff --git a/.gitignore b/.gitignore
@@ -406,4 +406,5 @@ beacon/spring/out
 *.classpath
 *.settings
 *.project
-*bin
+*bin
+/a.json
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -47,6 +47,23 @@ configurations {
 
 def generatedSrcDir = new File(buildDir, 'generated/src/main/java')
 
+//test {
+//    exclude 'edu/internet2/tier/shibboleth/admin/ui/configuration/*.class'
+//    exclude 'edu/internet2/tier/shibboleth/admin/ui/controller/*.class'
+//    exclude 'edu/internet2/tier/shibboleth/admin/ui/domain/*.class'
+//    exclude 'edu/internet2/tier/shibboleth/admin/ui/domain/filters/*.class'
+//    exclude 'edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/*.class'
+//    exclude 'edu/internet2/tier/shibboleth/admin/ui/domain/versioning/*.class'
+//    exclude 'edu/internet2/tier/shibboleth/admin/ui/repository/*.class'
+//    exclude 'edu/internet2/tier/shibboleth/admin/ui/scheduled/*.class'
+//    exclude 'edu/internet2/tier/shibboleth/admin/ui/security/controller/*.class'
+//    exclude 'edu/internet2/tier/shibboleth/admin/ui/security/repository/*.class'
+////    exclude 'edu/internet2/tier/shibboleth/admin/ui/security/service/*.class'
+////    exclude 'edu/internet2/tier/shibboleth/admin/ui/security/springsecurity/*.class'
+//    exclude 'edu/internet2/tier/shibboleth/admin/ui/service/*.class'
+//    exclude 'edu/internet2/tier/shibboleth/admin/ui/util/*.class'
+//}
+
 sourceSets {
     main {
         groovy {
@@ -353,4 +370,4 @@ dockerRun {
     daemonize true
     command '--spring.profiles.include=very-dangerous,dev', '--shibui.default-password={noop}password'
     clean true
-}
+}
diff --git a/...eth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy b/...eth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy
@@ -1,22 +1,11 @@
 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.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.frontend.EntityDescriptorRepresentation
 import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository
-import groovy.json.JsonOutput
-import groovy.json.JsonSlurper
 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.http.HttpEntity
-import org.springframework.http.HttpHeaders
-import org.springframework.http.HttpMethod
-import org.springframework.http.MediaType
-import org.springframework.test.annotation.DirtiesContext
 import org.springframework.test.context.ActiveProfiles
 import spock.lang.Specification
 
@@ -111,44 +100,9 @@ class EntityDescriptorControllerVersionEndpointsIntegrationTests extends Specifi
         edv2.body.serviceProviderName == 'SP2'
     }
 
-    @DirtiesContext(methodMode = DirtiesContext.MethodMode.AFTER_METHOD)
-    def 'SHIBUI-1414'() {
-        given:
-        def ed = new EntityDescriptor(entityID: 'testme', serviceProviderName: 'testme').with {
-            entityDescriptorRepository.save(it)
-        }.with {
-            it.setOrganization(new Organization().with {
-                it.organizationNames = [new OrganizationName(value: 'testme', XMLLang: 'en')]
-                it.organizationDisplayNames = [new OrganizationDisplayName(value: 'testme', XMLLang: 'en')]
-                it.organizationURLs = [new OrganizationURL(value: 'http://testme.org', XMLLang: 'en')]
-                it
-            })
-            entityDescriptorRepository.save(it)
-        }
-        when:
-        def headers = new HttpHeaders().with {
-            it.set(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-            it
-        }
-
-        def allVersions = getAllEntityDescriptorVersions(ed.resourceId, List)
-        String edv1 = getEntityDescriptorForVersion(ed.resourceId, allVersions.body[0].id, String).body
-        def tedv2 = getEntityDescriptorForVersion(ed.resourceId, allVersions.body[1].id, EntityDescriptorRepresentation).body
-
-        def aedv1 = new JsonSlurper().parseText(edv1).with {
-            it.put('version', tedv2.version)
-            it
-        }.with {
-            JsonOutput.toJson(it)
-        }
-
-        def request = new HttpEntity(aedv1, headers)
-        def response = this.restTemplate.exchange("/api/EntityDescriptor/${ed.resourceId}", HttpMethod.PUT, request, String)
-
-        then:
-        response.statusCodeValue != 400
-        noExceptionThrown()
-    }
+// Moved to its own test in the main testing package
+//    def 'SHIBUI-1414'() {
+//    }
 
     private getAllEntityDescriptorVersions(String resourceId, responseType) {
         this.restTemplate.getForEntity(resourceUriFor(ALL_VERSIONS_URI, resourceId), responseType)

diff --git a/.../tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy b/.../tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy
@@ -58,7 +58,7 @@ class EnversEntityDescriptorVersionServiceTests extends Specification {
 
         when: 'Second version'
         ed.serviceProviderName = 'SP2'
-        ed = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction(txMgr) {
+        ed = EnversTestsSupport.doInExplicitTransaction(txMgr) {
             entityDescriptorRepository.save(ed)
         }
         versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId)
@@ -71,7 +71,7 @@ class EnversEntityDescriptorVersionServiceTests extends Specification {
 
         when: 'Third version'
         ed.serviceProviderName = 'SP3'
-        ed = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction(txMgr) {
+        ed = EnversTestsSupport.doInExplicitTransaction(txMgr) {
             entityDescriptorRepository.save(ed)
         }
         versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId)
@@ -86,7 +86,7 @@ class EnversEntityDescriptorVersionServiceTests extends Specification {
     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) {
+        ed = EnversTestsSupport.doInExplicitTransaction(txMgr) {
             entityDescriptorRepository.save(ed)
         }
         def versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId)
@@ -98,7 +98,7 @@ class EnversEntityDescriptorVersionServiceTests extends Specification {
 
         when: 'Update the original'
         ed.serviceProviderName = 'SP2'
-        ed = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction(txMgr) {
+        ed = EnversTestsSupport.doInExplicitTransaction(txMgr) {
             entityDescriptorRepository.save(ed)
         }
         versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId)
@@ -112,17 +112,17 @@ class EnversEntityDescriptorVersionServiceTests extends Specification {
     def "versioning service throws EntityNotFoundException 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) {
+        ed = EnversTestsSupport.doInExplicitTransaction(txMgr) {
             entityDescriptorRepository.save(ed)
         }
 
         then:
         try { 
             def edRepresentation = entityDescriptorVersionService.findSpecificVersionOfEntityDescriptor(ed.resourceId, '1000')
-            1 == 2
+            false
         }
         catch (EntityNotFoundException expected) {
-            1 == 1
+            true
         }
     }
-}
+}
diff --git a/...end/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/...end/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
@@ -131,6 +131,8 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-1740: Verify dev profile group membership'                  | '/SHIBUI-1740-2.side'
         'SHIBUI-1740: Verify admin-owned resource not visible to nonadmins' | '/SHIBUI-1740-3.side'
         'SHIBUI-1740: Verify nonadmin-owned resource visibility'            | '/SHIBUI-1740-4.side'
+        'SHIBUI-1742: Verify enabler role allows enabling'                  | '/SHIBUI-1742-1.side'
+        'SHIBUI-1742: Verify role CRUD operations'                          | '/SHIBUI-1742-2.side'
     }
 }