[SHIBUI-704]

Added null check for scheme.content. Attempted test fixes.
TIER · Nov 15, 2018 · 50043c3 · 50043c3
1 parent 531c813
commit 50043c3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -295,21 +295,27 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                 case MetadataRequestURLConstructionScheme.SchemeType.METADATA_QUERY_PROTOCOL:
                     MetadataQueryProtocolScheme scheme = (MetadataQueryProtocolScheme) resolver.metadataRequestURLConstructionScheme
                     MetadataQueryProtocol(transformRef: scheme.transformRef) {
-                        mkp.yield(scheme.content)
+                        if (scheme.content != null) {
+                            mkp.yield(scheme.content)
+                        }
                     }
                     break
                 case MetadataRequestURLConstructionScheme.SchemeType.TEMPLATE:
                     TemplateScheme scheme = (TemplateScheme) resolver.metadataRequestURLConstructionScheme
                     Template(encodingStyle: scheme.encodingStyle,
                             transformRef: scheme.transformRef,
                             velocityEngine: scheme.velocityEngine) {
-                        mkp.yield(scheme.content)
+                        if (scheme.content != null) {
+                            mkp.yield(scheme.content)
+                        }
                     }
                     break
                 case MetadataRequestURLConstructionScheme.SchemeType.REGEX:
                     RegexScheme scheme = (RegexScheme) resolver.metadataRequestURLConstructionScheme
                     Regex(match: scheme.match) {
-                        mkp.yield(scheme.content)
+                        if (scheme.content != null) {
+                            mkp.yield(scheme.content)
+                        }
                     }
                     break
                 default:

diff --git a/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy b/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy
@@ -57,8 +57,6 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
         metadataResolverRepository.save(mr)
         def output = metadataResolverService.generateConfiguration()
 
-        println(output.documentElement)
-
         then:
         generatedXmlIsTheSameAsExpectedXml('/conf/278.xml', output)
     }

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
@@ -512,6 +512,11 @@ class TestObjectGenerator {
             it.dynamicMetadataResolverAttributes = new DynamicMetadataResolverAttributes().with {
                 it
             }
+            it.metadataRequestURLConstructionScheme = new MetadataQueryProtocolScheme().with {
+                it.transformRef = 'transformRef'
+                it.content = 'content'
+                it
+            }
             it
         }
     }

diff --git a/backend/src/test/resources/conf/278.2.xml b/backend/src/test/resources/conf/278.2.xml
@@ -23,6 +23,7 @@
                       socketTimeout="PT5S"
                       supportedContentTypes="[]"
                       xsi:type="DynamicHttpMetadataProvider">
+        <MetadataQueryProtocol transformRef="transformRef">content</MetadataQueryProtocol>
         <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" xsi:type="SignatureValidation"/>
         <MetadataFilter maxValidityInterval="P14D" xsi:type="RequiredValidUntil"/>
         <MetadataFilter xsi:type="EntityAttributes">

diff --git a/backend/src/test/resources/conf/278.xml b/backend/src/test/resources/conf/278.xml
@@ -23,6 +23,7 @@
                       socketTimeout="PT5S"
                       supportedContentTypes="[]"
                       xsi:type="DynamicHttpMetadataProvider">
+        <MetadataQueryProtocol transformRef="transformRef">content</MetadataQueryProtocol>
         <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" xsi:type="SignatureValidation"/>
         <MetadataFilter maxValidityInterval="P14D" xsi:type="RequiredValidUntil"/>
         <MetadataFilter xsi:type="EntityRoleWhiteList" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">