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

---
 build.xml                |  3 +-
 mdx/nl_surfnet/beans.xml | 59 +++++++++++++++++++++++++++++++++++++---
 mdx/nl_surfnet/verbs.xml | 37 ++++++++++++++++++++-----
 3 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/build.xml b/build.xml
index a6221dfd..67b481d6 100644
--- a/build.xml
+++ b/build.xml
@@ -872,7 +872,6 @@
         <CHANNEL.import channel="jp_gakunin"/>
         <CHANNEL.import channel="lv_laife"/>
 		<CHANNEL.import channel="nl_surfconext"/>
-        <CHANNEL.import channel="nl_surfnet"/>
         <CHANNEL.import channel="no_feide"/>
 		<CHANNEL.import channel="nz_tuakiri"/>
         <CHANNEL.import channel="se_swamid"/>
@@ -895,6 +894,7 @@
     	<CHANNEL.do verb="importProduction" channel="es_sir"/>
     	<CHANNEL.do verb="importProduction" channel="fi_haka"/>
     	<CHANNEL.do verb="importProduction" channel="gr_grnet"/>
+    	<CHANNEL.do verb="importProduction" channel="nl_surfnet"/>
     </target>
     
     <!--
@@ -912,6 +912,7 @@
     	<CHANNEL.do verb="importEdugain" channel="fi_haka"/>
     	<CHANNEL.do verb="importEdugain" channel="gr_grnet"/>
     	<CHANNEL.do verb="importEdugain" channel="hr_eduhr"/>
+    	<CHANNEL.do verb="importEdugain" channel="nl_surfnet"/>
     </target>
     
 	<!--
diff --git a/mdx/nl_surfnet/beans.xml b/mdx/nl_surfnet/beans.xml
index ad9af249..cdfdcb04 100644
--- a/mdx/nl_surfnet/beans.xml
+++ b/mdx/nl_surfnet/beans.xml
@@ -11,6 +11,26 @@
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
     
+    <!--
+        Location of various resources.
+    -->
+    <bean id="nl_surfnet_edugainAggregate_url" class="java.lang.String">
+        <constructor-arg value="https://wayf.surfnet.nl/federate/surfnet/edugain"/>
+    </bean>
+    
+    <!--
+        Fetch the eduGAIN export aggregate.
+    -->
+    <bean id="nl_surfnet_edugainAggregate" parent="domResourceStage_parent"
+        p:id="nl_surfnet_edugainAggregate">
+        <property name="domResource">
+            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url"    ref="nl_surfnet_edugainAggregate_url"/>
+            </bean>
+        </property>
+    </bean>
+    
     <!--
         Metadata signing certificate.
     -->
@@ -58,13 +78,14 @@
     </bean>
     
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch and process the production entities as a collection.
+        
+        Fake this up by combining separate IdP and SP aggregates.
     -->
-    <bean id="nl_surfnet_exportedEntities" parent="composite_parent"
-        p:id="nl_surfnet_exportedEntities">
+    <bean id="nl_surfnet_productionEntities" parent="composite_parent"
+        p:id="nl_surfnet_productionEntities">
         <property name="composedStages">
             <list>
-                <!-- no export aggregate; use the production ones instead -->
                 <ref bean="nl_surfnet_idpAggregate"/>
 
                 <!--
@@ -84,4 +105,34 @@
         </property>
     </bean>
     
+    <!--
+        Fetch and process the eduGAIN export entities as a collection.
+    -->
+    <bean id="nl_surfnet_edugainEntities" parent="composite_parent"
+        p:id="nl_surfnet_edugainEntities">
+        <property name="composedStages">
+            <list>
+                <ref bean="nl_surfnet_edugainAggregate"/>
+                
+                <!--
+                    Check for fatal errors at the aggregate level:
+                        missing or expired validUntil attribute
+                        invalid signature
+                -->
+                <ref bean="check_validUntil"/>
+                <ref bean="nl_surfnet_checkSignature"/>
+                <ref bean="errorTerminatingFilter"/>
+                
+                <ref bean="disassemble"/>
+                
+                <ref bean="standardImportActions"/>
+            </list>
+        </property>
+    </bean>
+    
+    <!--
+        Select primary export aggregate.
+    -->
+    <alias alias="nl_surfnet_exportedAggregate" name="nl_surfnet_edugainAggregate"/>
+    <alias alias="nl_surfnet_exportedEntities"  name="nl_surfnet_edugainEntities"/>
 </beans>
diff --git a/mdx/nl_surfnet/verbs.xml b/mdx/nl_surfnet/verbs.xml
index 8c6ac634..d6593391 100644
--- a/mdx/nl_surfnet/verbs.xml
+++ b/mdx/nl_surfnet/verbs.xml
@@ -30,25 +30,25 @@
         </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="nl_surfnet_exportedEntities"/>
+                <ref bean="nl_surfnet_productionEntities"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
         </property>
     </bean>
-
+    
     <!--
-        importRaw
+        importProductionRaw
         
         Fetch the separate IdP and SP aggregates, disassemble them into individual entities
         and then build up a single aggregate from all combined.
     -->
-    <bean id="importRaw" parent="pipeline_parent"
-        p:id="importRaw">
+    <bean id="importProductionRaw" parent="pipeline_parent"
+        p:id="importProductionRaw">
         <property name="stages">
             <list>
                 <ref bean="nl_surfnet_idpAggregate"/>
@@ -60,4 +60,27 @@
         </property>
     </bean>
     
+    <bean id="importEdugain" parent="pipeline_parent"
+        p:id="importEdugain">
+        <property name="stages">
+            <list>
+                <ref bean="nl_surfnet_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="nl_surfnet_edugainAggregate"/>
+                <ref bean="serializeImported"/>
+            </list>
+        </property>
+    </bean>
+    
+    <alias alias="import"    name="importEdugain"/>
+    <alias alias="importRaw" name="importEdugainRaw"/>
 </beans>