Merged in SHIBUI-1588 (pull request #430)

SHIBUI-1588
TIER · Nov 20, 2019 · cbda5be · cbda5be
2 parents 7393c1b + ab7450a
commit cbda5be
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/...a/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilterTarget.java b/...a/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilterTarget.java
@@ -8,6 +8,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -31,6 +32,7 @@ public enum EntityAttributesFilterTargetType {
 
     @ElementCollection
     @OrderColumn
+    @Column(length = 4000)
     private List<String> value;
 
     public EntityAttributesFilterTargetType getEntityAttributesFilterTargetType() {

diff --git a/.../edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolverRepositoryTests.groovy b/.../edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolverRepositoryTests.groovy
@@ -25,6 +25,8 @@ import spock.lang.Specification
 
 import javax.persistence.EntityManager
 
+import static edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget.EntityAttributesFilterTargetType.CONDITION_SCRIPT
+
 /**
  * Testing persistence of the MetadataResolver models
  */
@@ -198,7 +200,42 @@ class MetadataResolverRepositoryTests extends Specification {
         basicPersistenceOfResolverIsCorrectFor { it instanceof LocalDynamicMetadataResolver }
     }
 
+    def "persisting entity attributes filter target with script of more than 255 characters"() {
+        given:
+        def mdr = new MetadataResolver().with {
+            it.name = "SHIBUI-1588"
+            it
+        }
+        def filter = new EntityAttributesFilter().with {
+            it.name = 'SHIBUI-1588'
+            it.resourceId = 'SHIBUI-1588'
+            it.entityAttributesFilterTarget = new EntityAttributesFilterTarget().with {
+                it.entityAttributesFilterTargetType = CONDITION_SCRIPT
+                it.singleValue = """
+                /*
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut 
+                labore et dolore magna aliqua. Cras fermentum odio eu feugiat pretium nibh ipsum. Sed augue lacus viverra vitae. 
+                Fermentum et sollicitudin ac orci. Platea dictumst vestibulum rhoncus est pellentesque elit ullamcorper dignissim. 
+                Rhoncus urna neque viverra justo nec ultrices dui sapien. Tortor id aliquet lectus proin nibh nisl condimentum id venenatis. 
+                Massa id neque aliquam vestibulum morbi blandit cursus risus. Metus aliquam eleifend mi in nulla posuere sollicitudin. 
+                Arcu ac tortor dignissim convallis aenean. Et tortor consequat id porta nibh venenatis cras. 
+                Netus et malesuada fames ac turpis egestas. Bibendum arcu vitae elementum curabitur. 
+                Volutpat consequat mauris nunc congue nisi vitae suscipit.
+                */
+                """
+                it
+            }
+            it
+        }
+        mdr.addFilter(filter)
 
+        when:
+        metadataResolverRepository.save(mdr)
+        entityManager.flush()
+
+        then:
+        noExceptionThrown()
+    }
 
     private void basicPersistenceOfResolverIsCorrectFor(Closure resolverTypeCheck) {
         assert metadataResolverRepository.findAll().size() > 0
@@ -227,5 +264,4 @@ class MetadataResolverRepositoryTests extends Specification {
         }
         resolver
     }
-
 }