From 2c340a87ecf59d8f094fd129264fafa7b7c6fde8 Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Wed, 28 Nov 2018 11:49:21 -0500
Subject: [PATCH] SHIBUI-799: testing

---
 .../JPAMetadataResolverServiceImpl.groovy     |  3 ++-
 ...JPAMetadataResolverServiceImplTests.groovy | 11 +++++++++
 .../admin/ui/util/TestObjectGenerator.groovy  |  6 ++---
 backend/src/test/resources/conf/799.xml       | 24 +++++++++++++++++++
 4 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 backend/src/test/resources/conf/799.xml

diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
index ac71a6976..518c3bbf4 100644
--- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
+++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -239,9 +239,10 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                     ConditionRef(it.value)
                 }
                 else if(it.type == CONDITION_SCRIPT) {
+                    def scriptText = it.value
                     ConditionScript() {
                         Script() {
-                            mkp.yieldUnescaped("\n<![CDATA[\n${it.value}\n]]>\n")
+                            mkp.yieldUnescaped("\n<![CDATA[\n${scriptText}\n]]>\n")
                         }
                     }
                 }
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
index 8bb9bc7d4..47e21c3a9 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
@@ -199,6 +199,17 @@ class JPAMetadataResolverServiceImplTests extends Specification {
         generatedXmlIsTheSameAsExpectedXml('/conf/552.xml', domBuilder.parseText(writer.toString()))
     }
 
+    def 'test generating NameIdFormatFilter xml snippet'() {
+        given:
+        def filter = TestObjectGenerator.nameIdFormatFilter()
+
+        when:
+        genXmlSnippet(markupBuilder) { JPAMetadataResolverServiceImpl.cast(metadataResolverService).constructXmlNodeForFilter(filter, it) }
+
+        then:
+        generatedXmlIsTheSameAsExpectedXml('/conf/799.xml', domBuilder.parseText(writer.toString()))
+    }
+
     def 'test generating FileBackedHttMetadataResolver xml snippet'() {
         given:
         def resolver = testObjectGenerator.fileBackedHttpMetadataResolver()
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
index 1a44cf1c7..8fec66063 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
@@ -230,13 +230,13 @@ class TestObjectGenerator {
                             format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent',
                             type: Type.ENTITY, value: 'https://sp1.example.org'),
                     new FormatAndTarget(
-                            format: 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress',
+                            format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:emailAddress',
                             type: Type.ENTITY, value: 'https://sp2.example.org'),
                     new FormatAndTarget(
-                            format: 'urn:oasis:names:tc:SAML:1.1:nameid-format:persistent',
+                            format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent',
                             type: Type.CONDITION_REF, value: 'conditionRefBeanId'),
                     new FormatAndTarget(
-                            format: 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress',
+                            format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent',
                             type: Type.CONDITION_SCRIPT, value: 'input.getEntityID().equals("https://sp1.example.org");')
             ]
             it
diff --git a/backend/src/test/resources/conf/799.xml b/backend/src/test/resources/conf/799.xml
new file mode 100644
index 000000000..b7e32082a
--- /dev/null
+++ b/backend/src/test/resources/conf/799.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is an EXAMPLE metadata configuration file. -->
+<MetadataProvider id="ShibbolethMetadata"
+                  xmlns="urn:mace:shibboleth:2.0:metadata"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:type="ChainingMetadataProvider"
+                  xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd">
+    <MetadataFilter xsi:type="NameIDFormat" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+        <Format>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</Format>
+        <Entity>https://sp1.example.org</Entity>
+        <Format>urn:oasis:names:tc:SAML:2.0:nameid-format:emailAddress</Format>
+        <Entity>https://sp2.example.org</Entity>
+        <Format>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</Format>
+        <ConditionRef>conditionRefBeanId</ConditionRef>
+        <Format>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</Format>
+        <ConditionScript>
+            <Script>
+                <![CDATA[
+            input.getEntityID().equals("https://sp1.example.org");
+        ]]>
+            </Script>
+        </ConditionScript>
+    </MetadataFilter>
+</MetadataProvider>