From ae0721804a0ed45106096f28a0780e06f2607810 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 27 Jun 2012 15:11:23 +0000
Subject: [PATCH] Add eduGAIN handling for se_swamid channel.

---
 build.xml               |  3 +-
 mdx/se_swamid/beans.xml | 68 ++++++++++++++++++++++++++++++++++++-----
 mdx/se_swamid/verbs.xml | 35 +++++++++++++++++----
 3 files changed, 91 insertions(+), 15 deletions(-)

diff --git a/build.xml b/build.xml
index 97c8f787..878c5820 100644
--- a/build.xml
+++ b/build.xml
@@ -871,7 +871,6 @@
         <CHANNEL.import channel="lv_laife"/>
 		<CHANNEL.import channel="nl_surfconext"/>
 		<CHANNEL.import channel="nz_tuakiri"/>
-        <CHANNEL.import channel="se_swamid"/>
         <CHANNEL.import channel="si_arnes"/>
         <CHANNEL.import channel="uk_eduserv"/>
         <CHANNEL.import channel="us_incommon"/>
@@ -895,6 +894,7 @@
     	<CHANNEL.do verb="importProduction" channel="it_idem"/>
     	<CHANNEL.do verb="importProduction" channel="nl_surfnet"/>
     	<CHANNEL.do verb="importProduction" channel="no_feide"/>
+    	<CHANNEL.do verb="importProduction" channel="se_swamid"/>
     </target>
     
     <!--
@@ -916,6 +916,7 @@
     	<CHANNEL.do verb="importEdugain" channel="it_idem"/>
     	<CHANNEL.do verb="importEdugain" channel="nl_surfnet"/>
     	<CHANNEL.do verb="importEdugain" channel="no_feide"/>
+    	<CHANNEL.do verb="importEdugain" channel="se_swamid"/>
     </target>
     
 	<!--
diff --git a/mdx/se_swamid/beans.xml b/mdx/se_swamid/beans.xml
index 74300e0b..58022063 100644
--- a/mdx/se_swamid/beans.xml
+++ b/mdx/se_swamid/beans.xml
@@ -12,20 +12,43 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
     
     <!--
-        Fetch the SWAMID production.
+        Location of various resources.
+    -->
+    <bean id="se_swamid_productionAggregate_url" class="java.lang.String">
+        <constructor-arg value="http://md.swamid.se/md/swamid-1.0.xml"/>
+    </bean>
+    <bean id="se_swamid_edugainAggregate_url" class="java.lang.String">
+        <constructor-arg value="http://md2.swamid.se/md/swamid-edugain-1.0.xml"/>
+    </bean>
+    
+    <!--
+        Fetch the production aggregate.
     -->
     <bean id="se_swamid_productionAggregate" parent="domResourceStage_parent"
         p:id="se_swamid_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
-                <constructor-arg name="url" value="http://md.swamid.se/md/swamid-1.0.xml"/>
+                <constructor-arg name="url"    ref="se_swamid_productionAggregate_url"/>
             </bean>
         </property>
     </bean>
     
     <!--
-        SWAMID federation signing certificate.
+        Fetch the eduGAIN export aggregate.
+    -->
+    <bean id="se_swamid_edugainAggregate" parent="domResourceStage_parent"
+        p:id="se_swamid_edugainAggregate">
+        <property name="domResource">
+            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url"    ref="se_swamid_edugainAggregate_url"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        Federation signing certificate.
     -->
     <bean id="se_swamid_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
         <property name="certificateFile">
@@ -36,7 +59,7 @@
     </bean>
     
     <!--
-        Check SWAMID signing signature.
+        Check signing signature.
     -->
     <bean id="se_swamid_checkSignature" parent="stage_parent"
         class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
@@ -45,13 +68,12 @@
     </bean>
     
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch and process the production entities as a collection.
     -->
-    <bean id="se_swamid_exportedEntities" parent="composite_parent"
-        p:id="se_swamid_exportedEntities">
+    <bean id="se_swamid_productionEntities" parent="composite_parent"
+        p:id="se_swamid_productionEntities">
         <property name="composedStages">
             <list>
-                <!-- no export aggregate; use the production one instead -->
                 <ref bean="se_swamid_productionAggregate"/>
 
                 <!--
@@ -75,4 +97,34 @@
         </property>
     </bean>
     
+    <!--
+        Fetch and process the eduGAIN export entities as a collection.
+    -->
+    <bean id="se_swamid_edugainEntities" parent="composite_parent"
+        p:id="se_swamid_edugainEntities">
+        <property name="composedStages">
+            <list>
+                <ref bean="se_swamid_edugainAggregate"/>
+                
+                <!--
+                    Check for fatal errors at the aggregate level:
+                        missing or expired validUntil attribute
+                        invalid signature
+                -->
+                <ref bean="check_validUntil"/>
+                <ref bean="se_swamid_checkSignature"/>
+                <ref bean="errorTerminatingFilter"/>
+                
+                <ref bean="disassemble"/>
+                
+                <ref bean="standardImportActions"/>
+            </list>
+        </property>
+    </bean>
+    
+    <!--
+        Select primary export aggregate.
+    -->
+    <alias alias="se_swamid_exportedAggregate" name="se_swamid_edugainAggregate"/>
+    <alias alias="se_swamid_exportedEntities"  name="se_swamid_edugainEntities"/>
 </beans>
diff --git a/mdx/se_swamid/verbs.xml b/mdx/se_swamid/verbs.xml
index bdc6b2dc..611795af 100644
--- a/mdx/se_swamid/verbs.xml
+++ b/mdx/se_swamid/verbs.xml
@@ -30,19 +30,19 @@
         </property>
     </bean>
     
-    <bean id="import" parent="pipeline_parent"
-        p:id="import">
+    <bean id="importProduction" parent="pipeline_parent"
+        p:id="importProduction">
         <property name="stages">
             <list>
-                <ref bean="se_swamid_exportedEntities"/>
+                <ref bean="se_swamid_productionEntities"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
         </property>
     </bean>
-
-    <bean id="importRaw" parent="pipeline_parent"
-        p:id="importRaw">
+    
+    <bean id="importProductionRaw" parent="pipeline_parent"
+        p:id="importProductionRaw">
         <property name="stages">
             <list>
                 <ref bean="se_swamid_productionAggregate"/>
@@ -51,4 +51,27 @@
         </property>
     </bean>
     
+    <bean id="importEdugain" parent="pipeline_parent"
+        p:id="importEdugain">
+        <property name="stages">
+            <list>
+                <ref bean="se_swamid_edugainEntities"/>
+                <ref bean="standardImportTail"/>
+                <ref bean="serializeImported"/>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="importEdugainRaw" parent="pipeline_parent"
+        p:id="importEdugainRaw">
+        <property name="stages">
+            <list>
+                <ref bean="se_swamid_edugainAggregate"/>
+                <ref bean="serializeImported"/>
+            </list>
+        </property>
+    </bean>
+    
+    <alias alias="import"    name="importEdugain"/>
+    <alias alias="importRaw" name="importEdugainRaw"/>
 </beans>