Implement export preview aggregate.

Initial contents are the same as the export aggregate.
internet2 · Aug 22, 2014 · 5b994ed · 5b994ed
1 parent 01ebc62
commit 5b994ed
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -141,6 +141,7 @@
 /xml/member-dates.txt
 /xml/ukfederation-metadata-master.xml
 /xml/ukfederation-export-unsigned.xml
+/xml/ukfederation-export-preview-unsigned.xml
 /xml/ukfederation-test-unsigned.xml
 /xml/ukfederation-export.xml
 /xml/ukfederation-test.xml

diff --git a/build.xml b/build.xml
@@ -107,6 +107,8 @@
     <property name="md.prod.unsigned"   value="ukfederation-metadata-unsigned.xml"/>
     <property name="md.test.unsigned"   value="ukfederation-test-unsigned.xml"/>
     <property name="md.export.unsigned" value="ukfederation-export-unsigned.xml"/>
+    <property name="md.export.preview.unsigned"
+                                        value="ukfederation-export-preview-unsigned.xml"/>
     <property name="md.back.unsigned"   value="ukfederation-back-unsigned.xml"/>
     <property name="md.wayf.unsigned"   value="ukfederation-wayf-unsigned.xml"/>
     <property name="md.cdsall.unsigned" value="ukfederation-cdsall-unsigned.xml"/>
@@ -118,6 +120,8 @@
     <property name="md.prod.signed"     value="ukfederation-metadata.xml"/>
     <property name="md.test.signed"     value="ukfederation-test.xml"/>
     <property name="md.export.signed"   value="ukfederation-export.xml"/>
+    <property name="md.export.preview.signed"
+                                        value="ukfederation-export-preview.xml"/>
     <property name="md.back.signed"     value="ukfederation-back.xml"/>
     <property name="md.wayf.signed"     value="ukfederation-wayf.xml"/>
     <property name="md.cdsall.signed"   value="ukfederation-cdsall.xml"/>
@@ -280,6 +284,7 @@
                 <include name="${md.test.signed}"/>
                 <include name="${md.back.signed}"/>
                 <include name="${md.export.signed}"/>
+                <include name="${md.export.preview.signed}"/>
             </fileset>
         </scp>
     </target>
@@ -352,6 +357,7 @@
         <VFY.remote i="${md.test.signed}"/>
         <VFY.remote.both i="${md.back.signed}"/>
         <VFY.remote i="${md.export.signed}"/>
+        <VFY.remote i="${md.export.preview.signed}"/>
         <echo>Verification completed.</echo>
     </target>
 
@@ -413,6 +419,7 @@
                WAYF/CDS aggregates
                test aggregate
                export aggregate
+               export preview aggregate
                fallback aggregate
                statistics
         -->
@@ -427,6 +434,7 @@
         <MDNORM.noblank i="${xml.dir}/${md.cms.unsigned}"/>
         <MDNORM i="${xml.dir}/${md.test.unsigned}"/>
         <MDNORM i="${xml.dir}/${md.export.unsigned}"/>
+        <MDNORM i="${xml.dir}/${md.export.preview.unsigned}"/>
         <MDNORM i="${xml.dir}/${md.back.unsigned}"/>
         <fixcrlf file="${xml.dir}/ukfederation-stats.html" eol="lf" encoding="UTF-8"/>
 
@@ -809,6 +817,9 @@
         <echo>Signing UK export metadata.</echo>
         <SIGN.uk i="${md.export.unsigned}" o="${md.export.signed}" digest="SHA-256"/>
 
+        <echo>Signing UK export preview metadata.</echo>
+        <SIGN.uk i="${md.export.preview.unsigned}" o="${md.export.preview.signed}" digest="SHA-256"/>
+
         <echo>Signing UK fallback metadata.</echo>
         <SIGN.uk i="${md.back.unsigned}" o="${md.back.signed}" digest="SHA-256"/>
 
@@ -856,6 +867,9 @@
         <echo>Verifying signed UK export metadata.</echo>
         <XMLSECTOOL.VFY.uk i="${md.export.signed}"/>
 
+        <echo>Verifying signed UK export preview metadata.</echo>
+        <XMLSECTOOL.VFY.uk i="${md.export.preview.signed}"/>
+
         <echo>Verifying signed UK fallback metadata.</echo>
         <VFY.uk.both i="${md.back.signed}"/>
 

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
@@ -724,6 +724,56 @@
         </property>
     </bean>
 
+    <!--
+        ***********************************************************
+        ***                                                     ***
+        ***   E X P O R T   P R E V I E W   A G G R E G A T E   ***
+        ***                                                     ***
+        ***********************************************************
+    -->
+
+    <bean id="uk_exportPreviewPipeline" parent="SimplePipeline"
+        p:id="uk_exportPreviewPipeline">
+        <property name="stages">
+            <list>
+                <!--
+                    Enforce IdP display name uniqueness before assembling aggregate
+                -->
+                <ref bean="check_dup_display"/>
+                <ref bean="errorTerminatingFilter"/>
+
+                <ref bean="stripUkfedlabelNamespace"/>
+                <ref bean="stripWayfNamespace"/>
+                <ref bean="stripKeyNames"/>
+                <ref bean="uk_assemble"/>
+                <ref bean="stripEntityScopes"/>
+                <ref bean="removeEmptyExtensions"/>
+                <ref bean="uk_finaliseExport"/>
+                <ref bean="uk_normaliseExport"/>
+
+                <!--
+                    Schema validity and other checks MUST pass.
+                    
+                    These are a subset of the publishability tests applied to
+                    aggregates published to federation members.
+                -->
+                <ref bean="checkSchemas"/>
+                <ref bean="check_aggregate"/>
+                <ref bean="check_namespaces"/>
+                <ref bean="errorTerminatingFilter"/>
+
+                <bean parent="SerializationStage" p:id="serializeUnsignedExportPreviewAggregate">
+                    <property name="outputFile">
+                        <bean class="java.io.File">
+                            <constructor-arg value="${basedir}/xml/ukfederation-export-preview-unsigned.xml"/>
+                        </bean>
+                    </property>
+                </bean>
+
+            </list>
+        </property>
+    </bean>
+
     <!--
         *************************************
         ***                               ***
@@ -884,12 +934,12 @@
                 -->
 
                 <!--
-                    Fork a new output pipeline for the export aggregate.
+                    Fork a new output pipeline for the export and export preview aggregates.
                     
-                    The export aggregate only includes UK-registered entities,
+                    These aggregates only include UK-registered entities,
                     so the fork needs to occur before any others are introduced.
                     
-                    The export aggregate is also intended to reflect the registered
+                    The export aggregates are also intended to reflect the registered
                     metadata as closely as possible, so the fork must happen before
                     too many UK-specific transformations are performed.
                 -->
@@ -901,6 +951,10 @@
                                 <constructor-arg ref="uk_exportPipeline"/>
                                 <constructor-arg ref="uk_exportSelector"/>
                             </bean>
+                            <bean class="net.shibboleth.utilities.java.support.collection.Pair">
+                                <constructor-arg ref="uk_exportPreviewPipeline"/>
+                                <constructor-arg ref="uk_exportSelector"/>
+                            </bean>
                         </list>
                     </property>
                     <property name="waitingForPipelines" value="true"/>