SHIBUI-980 wip

TIER · Nov 27, 2018 · b499bb9 · b499bb9
1 parent 49485f4
commit b499bb9
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 1 deletion.
diff --git a/...ain/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersController.java b/...ain/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersController.java
@@ -3,6 +3,7 @@
 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.MetadataFilter;
+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.MetadataResolver;
@@ -224,6 +225,12 @@ else if(filterWithUpdatedData instanceof RequiredValidUntilFilter) {
             RequiredValidUntilFilter fromFilter = RequiredValidUntilFilter.class.cast(filterWithUpdatedData);
             toFilter.setMaxValidityInterval(fromFilter.getMaxValidityInterval());
         }
+        else if (filterWithUpdatedData instanceof NameIdFormatFilter) {
+            NameIdFormatFilter toFilter = NameIdFormatFilter.class.cast(filterToBeUpdated);
+            NameIdFormatFilter fromFilter = NameIdFormatFilter.class.cast(filterWithUpdatedData);
+            toFilter.setRemoveExistingFormats(fromFilter.getRemoveExistingFormats());
+            toFilter.setFormats(fromFilter.getFormats());
+        }
         //TODO: add other types of concrete filters update here
     }
 

diff --git a/...y/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy b/...y/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy
@@ -177,6 +177,7 @@ class MetadataFiltersControllerTests extends Specification {
         'entityRoleWhiteList' | _
         'signatureValidation' | _
         'requiredValidUntil'  | _
+        'nameIdFormat'        | _
     }
 
     @Unroll
@@ -222,6 +223,7 @@ class MetadataFiltersControllerTests extends Specification {
         'entityRoleWhiteList' | _
         'signatureValidation' | _
         'requiredValidUntil'  | _
+        'nameIdFormat'        | _
     }
 
     def "FilterController.update filter 409's if the version numbers don't match"() {

diff --git a/...et2/tier/shibboleth/admin/ui/domain/filters/PolymorphicFiltersJacksonHandlingTests.groovy b/...et2/tier/shibboleth/admin/ui/domain/filters/PolymorphicFiltersJacksonHandlingTests.groovy
@@ -193,6 +193,10 @@ class PolymorphicFiltersJacksonHandlingTests extends Specification {
                   "format" : "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress",
                   "value" : "https://sp2.example.org",
                   "type" : "ENTITY"
+                }, {
+                  "format" : "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent",
+                  "value" : "conditionRefBeanId",
+                  "type" : "CONDITION_REF"
                 }, {
                   "format" : "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress",
                   "value" : "input.getEntityID().equals(\\"https://sp1.example.org\\");",

diff --git a/...est/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/FilterRepositoryTests.groovy b/...est/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/FilterRepositoryTests.groovy
@@ -83,6 +83,6 @@ class FilterRepositoryTests extends Specification {
 
         then:
         persistedFilter.audId > 0L
-        persistedFilter.formats.size() == 3
+        persistedFilter.formats.size() == 4
     }
 }
diff --git a/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
@@ -155,6 +155,9 @@ class TestObjectGenerator {
             case 'requiredValidUntil':
                 randomFilter = requiredValidUntilFilter()
                 break
+            case 'nameIdFormat':
+                randomFilter = nameIdFormatFilter()
+                break
             default:
                 throw new RuntimeException("Did you forget to create a TestObjectGenerator.copyOf method for filtertype: ${filterType} ?");
         }
@@ -229,6 +232,9 @@ class TestObjectGenerator {
                     new FormatAndTarget(
                             format: 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress',
                             type: Type.ENTITY, value: 'https://sp2.example.org'),
+                    new FormatAndTarget(
+                            format: 'urn:oasis:names:tc:SAML:1.1:nameid-format:persistent',
+                            type: Type.CONDITION_REF, value: 'conditionRefBeanId'),
                     new FormatAndTarget(
                             format: 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress',
                             type: Type.CONDITION_SCRIPT, value: 'input.getEntityID().equals("https://sp1.example.org");')
@@ -283,6 +289,16 @@ class TestObjectGenerator {
         }
     }
 
+    static NameIdFormatFilter copyOf(NameIdFormatFilter nameIdFormatFilter) {
+        new NameIdFormatFilter().with {
+            it.name = nameIdFormatFilter.name
+            it.resourceId = nameIdFormatFilter.resourceId
+            it.removeExistingFormats = nameIdFormatFilter.removeExistingFormats
+            it.formats = nameIdFormatFilter.formats
+            it
+        }
+    }
+
     MetadataFilter buildFilter(Supplier<? extends MetadataFilter> filterSupplier) {
         MetadataFilter filter = filterSupplier.get()
         filter.setFilterEnabled(generator.randomBoolean())