Merge branch 'master' of bitbucket.org:unicon/shib-idp-ui into featur…

…e/SHIBUI-1361
TIER · Aug 13, 2019 · 3cd6ed1 · 3cd6ed1
2 parents 8b14299 + 319ccf9
commit 3cd6ed1
Show file tree

Hide file tree

Showing 15 changed files with 7,411 additions and 16 deletions.
diff --git a/...eth/admin/ui/controller/MetadataResolverControllerVersionEndpointsIntegrationTests.groovy b/...eth/admin/ui/controller/MetadataResolverControllerVersionEndpointsIntegrationTests.groovy
@@ -1,5 +1,7 @@
 package edu.internet2.tier.shibboleth.admin.ui.controller
 
+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.FilesystemMetadataResolver
@@ -103,6 +105,37 @@ class MetadataResolverControllerVersionEndpointsIntegrationTests extends Specifi
         mrv2.body.name == 'resolverUPDATED'
     }
 
+    def "SHIBUI-1386"() {
+        MetadataResolver mr = new FileBackedHttpMetadataResolver(name: 'testme')
+        mr = repository.save(mr)
+
+        when: 'add a filter'
+        // def filterValue = '''{"type":"EntityAttributes","@type":"EntityAttributes","filterEnabled":true,"entityAttributesFilterTarget":{"entityAttributesFilterTargetType":"ENTITY","value":["https://idp.unicon.net/idp/shibboleth"]},"relyingPartyOverrides":{"signAssertion":false,"dontSignResponse":false,"turnOffEncryption":false,"useSha":false,"ignoreAuthenticationMethod":false,"omitNotBefore":false,"nameIdFormats":[],"authenticationMethods":[],"forceAuthn":false},"attributeRelease":[],"name":"Test Filter 1"}'''
+        def filter = new EntityAttributesFilter(
+                name: 'testme',
+                filterEnabled: true
+        ).with {
+            it.relyingPartyOverrides = [
+                    'signAssertion': true
+            ]
+            it.setEntityAttributesFilterTarget(new EntityAttributesFilterTarget().with {
+                it.entityAttributesFilterTargetType = EntityAttributesFilterTarget.EntityAttributesFilterTargetType.ENTITY
+                it.value = ['https://testme/sp']
+                it
+            })
+            it
+        }
+        mr.metadataFilters.add(filter)
+        mr = repository.save(mr)
+
+        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:
+        noExceptionThrown()
+    }
+
     private getAllMetadataResolverVersions(String resourceId, responseType) {
         this.restTemplate.getForEntity(resourceUriFor(ALL_VERSIONS_URI, resourceId), responseType)
     }

diff --git a/...du/internet2/tier/shibboleth/admin/ui/service/envers/EnversVersioningMetadataTests.groovy b/...du/internet2/tier/shibboleth/admin/ui/service/envers/EnversVersioningMetadataTests.groovy
@@ -60,9 +60,9 @@ class EnversVersioningMetadataTests extends Specification {
 
         then:
         mrVersions[0].creator == mr.createdBy
-        mrVersions[0].date == mr.createdDateAsZonedDateTime()
+        mrVersions[0].date == mr.modifiedDateAsZonedDateTime()
         edVersions[0].creator == ed.createdBy
-        edVersions[0].date == ed.createdDateAsZonedDateTime()
+        edVersions[0].date == ed.modifiedDateAsZonedDateTime()
 
         when: 'new version due to update'
         mr.name = 'UPDATED'

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
@@ -106,12 +106,18 @@ class SeleniumSIDETest extends Specification {
 //        'Create and Delete Name ID Format Regex Filter'     | '/CreateAndDeleteNameIDFormatRegexFilter.side'
 //        'Create and Delete Name ID Format Script Filter'    | '/CreateAndDeleteNameIDFormatScriptFilter.side'
 //        'Create and Modify Filter Order'                    | '/ModifyFilterOrder.side'
-        'SHIBUI-1281: Metadata Source Dashboard'            | '/SHIBUI-1281.side'
-        'SHIBUI-1311: Metadata Provider Dashboard'          | '/SHIBUI-1311.side'
-        'SHIBUI-950: Metadata Source from XML w/ digest'    | '/SHIBUI-950.side'
-        'SHIBUI-1352: Create LocalDynamic provider'         | '/SHIBUI-1352-1.side'
-        'SHIBUI-1352: Create FileSystem provider'           | '/SHIBUI-1352-2.side'
-        'SHIBUI-1333: Verify metadata source configuration' | '/SHIBUI-1333.side'
+        'SHIBUI-1281: Metadata Source Dashboard'                            | '/SHIBUI-1281.side'
+        'SHIBUI-1311: Metadata Provider Dashboard'                          | '/SHIBUI-1311.side'
+        'SHIBUI-950: Metadata Source from XML w/ digest'                    | '/SHIBUI-950.side'
+        'SHIBUI-1352: Create LocalDynamic provider'                         | '/SHIBUI-1352-1.side'
+        'SHIBUI-1352: Create FileSystem provider'                           | '/SHIBUI-1352-2.side'
+        'SHIBUI-1333: Verify metadata source configuration'                 | '/SHIBUI-1333.side'
+        'SHIBUI-1334: Verify metadata source versioning'                    | '/SHIBUI-1334-1.side'
+        'SHIBUI-1334: Verify metadata provider versioning'                  | '/SHIBUI-1334-2.side'
+        'SHIBUI-1335: Verify File Backed HTTP Metadata Provider Filters'    | '/SHIBUI-1335-1.side'
+        'SHIBUI-1335: Verify Filesystem Metadata Provider Filters'          | '/SHIBUI-1335-2.side'
+        'SHIBUI-1335: Verify Local Dynamic Metadata Provider Filters'       | '/SHIBUI-1335-3.side'
+        'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters'        | '/SHIBUI-1335-4.side'
     }
 }
 
diff --git a/backend/src/integration/resources/SHIBUI-1311.side b/backend/src/integration/resources/SHIBUI-1311.side
@@ -73,6 +73,13 @@
         ["xpath=//a[2]", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "69432299-f150-4bea-9e07-7ef222d7c71f",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=/name",
+      "targets": [],
+      "value": "10000"
     }, {
       "id": "b49d6ed7-75ea-4be8-9a79-c7fd83287aa0",
       "comment": "",
@@ -103,7 +110,7 @@
       "id": "add874d5-e3b2-4412-8039-2b9d2619ed19",
       "comment": "",
       "command": "select",
-      "target": "id=/@type",
+      "target": "id=/type",
       "targets": [
         ["css=select-component > .widget", "css:finder"],
         ["xpath=//select-component/div", "xpath:position"]
@@ -119,6 +126,13 @@
         ["xpath=//li[2]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "a237669b-daf4-42f6-bc7f-dc4cb5548f56",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=/xmlId",
+      "targets": [],
+      "value": "10000"
     }, {
       "id": "86262eda-4a44-41b0-b7aa-fa46406e2601",
       "comment": "",
@@ -573,6 +587,13 @@
         ["xpath=//a[2]", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "664722f5-86a5-49a8-b60e-fac67544fbea",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=/name",
+      "targets": [],
+      "value": "10000"
     }, {
       "id": "6437379e-d34f-479e-82f1-bf52654a95cb",
       "comment": "",
@@ -603,7 +624,7 @@
       "id": "90dffd02-8971-4bf5-bc57-33194fdb27a2",
       "comment": "",
       "command": "select",
-      "target": "id=/@type",
+      "target": "id=/type",
       "targets": [
         ["id=/@type", "id"],
         ["name=field38", "name"],
@@ -622,6 +643,13 @@
         ["xpath=//li[2]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "a8d021db-c36c-4cf7-9211-17751cf0624a",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=/xmlId",
+      "targets": [],
+      "value": "10000"
     }, {
       "id": "5795f70f-79e1-4b45-9c38-ef96d5197e70",
       "comment": "",