Merged in SHIBUI-1499 (pull request #377)

SHIBUI-1499 Approved-by: Ryan Mathis <rmathis@unicon.net>
TIER · Sep 23, 2019 · a62decd · a62decd
2 parents 7839faf + 0445081
commit a62decd
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/...eth/admin/ui/controller/MetadataResolverControllerVersionEndpointsIntegrationTests.groovy b/...eth/admin/ui/controller/MetadataResolverControllerVersionEndpointsIntegrationTests.groovy
@@ -3,6 +3,8 @@ 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.filters.EntityRoleWhiteListFilter
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.NameIdFormatFilter
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.NameIdFormatFilterTarget
 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
@@ -15,6 +17,8 @@ import org.springframework.boot.test.web.client.TestRestTemplate
 import org.springframework.test.context.ActiveProfiles
 import spock.lang.Specification
 
+import static edu.internet2.tier.shibboleth.admin.ui.domain.filters.NameIdFormatFilterTarget.NameIdFormatFilterTargetType.ENTITY
+
 /**
  * @author Dmitriy Kopylenko
  */
@@ -154,6 +158,30 @@ class MetadataResolverControllerVersionEndpointsIntegrationTests extends Specifi
         (mrv1.getBody() as MetadataResolver).modifiedDate < (mrv2.getBody() as MetadataResolver).modifiedDate
     }
 
+    def "SHIBUI-1499"() {
+        MetadataResolver mr = new FileBackedHttpMetadataResolver(name: 'shibui-1499')
+        mr = repository.save(mr)
+
+        when: 'add a name id filter'
+        def filter = new NameIdFormatFilter(name: 'nameIDFilter').with {
+            it.nameIdFormatFilterTarget = new NameIdFormatFilterTarget().with {
+                it.nameIdFormatFilterTargetType = ENTITY
+                it.value = ['https://testme/sp']
+                it
+            }
+            it
+        }
+        mr.addFilter(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/.../java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilterTarget.java b/.../java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilterTarget.java
@@ -1,5 +1,6 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain.filters;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -17,6 +18,7 @@
 @ToString
 @Audited
 @AuditOverride(forClass = AbstractAuditable.class)
+@JsonIgnoreProperties({"handler", "hibernateLazyInitializer"})
 public class NameIdFormatFilterTarget extends AbstractAuditable {
 
     public enum NameIdFormatFilterTargetType {