From de9bfbe44289ea9730ab759418afa506f027e1f6 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 2 Sep 2013 15:45:40 +0000
Subject: [PATCH] Incorporate eduGAIN import channel.  Also implement an
 imported entity blacklist facility that we can use to make signings less
 noisy by removing known-bad entities prior to checking.

---
 mdx/uk/blacklist.xml | 28 ++++++++++++++++++++++++++++
 mdx/uk/generate.xml  | 25 +++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 mdx/uk/blacklist.xml

diff --git a/mdx/uk/blacklist.xml b/mdx/uk/blacklist.xml
new file mode 100644
index 00000000..72d470c0
--- /dev/null
+++ b/mdx/uk/blacklist.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
+    xmlns:p="http://www.springframework.org/schema/p"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        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">
+
+    <!--
+        *********************************************************
+        ***                                                   ***
+        ***   I M P O R T   E N T I T Y   B L A C K L I S T   ***
+        ***                                                   ***
+        *********************************************************
+    -->
+
+    <!--
+        Any entity listed in the set below will be discarded from all import channels
+        without being processed.  This will mean that no errors will be observed for it,
+        reducing the noise involved in a signing run.
+    -->
+    <util:set id="importEntityBlacklist">
+    </util:set>
+    
+</beans>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index de8ca906..e7692fa6 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -21,6 +21,7 @@
         Import channel-specific beans.
     -->
     <import resource="classpath:uk/beans.xml"/>
+    <import resource="classpath:uk/blacklist.xml"/>
     
     <!--
         Import beans from other channels.
@@ -28,6 +29,7 @@
     <import resource="classpath:ie_edugate/beans.xml"/>
     <import resource="classpath:se_swamid/beans.xml"/>
     <import resource="classpath:us_incommon/beans.xml"/>
+    <import resource="classpath:int_edugain/beans.xml"/>
 
 
     <!--
@@ -215,6 +217,17 @@
         <property name="whitelistingRegistrationAuthorities" value="false"/>
     </bean>
 
+    <!--
+        removeBlacklistedEntities
+        
+        Filter out entities which are included in our global import blacklist.
+    -->
+    <bean id="removeBlacklistedEntities" parent="stage_parent"
+        class="net.shibboleth.metadata.dom.saml.EntityFilterStage"
+        p:id="us_incommon_pilot_filterEntities"
+        p:whitelistingEntities="false"
+        p:designatedEntities-ref="importEntityBlacklist"/>
+
     <!--
         importCommonTail
         
@@ -225,6 +238,7 @@
         <property name="composedStages">
             <list>
                 <ref bean="removeUKEntities"/>
+                <ref bean="removeBlacklistedEntities"/>
                 <ref bean="standardImportActions"/>
                 <ref bean="uk_fix_mailto"/>
                 <ref bean="uk_hide_idps"/>
@@ -232,6 +246,16 @@
         </property>
     </bean>
 
+    <bean id="uk_int_edugain_importPipeline" parent="SimplePipeline"
+        p:id="uk_int_edugain_importPipeline">
+        <property name="stages">
+            <list>
+                <ref bean="int_edugain_productionEntities"/>
+                <ref bean="importCommonTail"/>
+            </list>
+        </property>
+    </bean>
+    
     <bean id="uk_ie_edugate_importPipeline" parent="SimplePipeline"
         p:id="uk_ie_edugate_importPipeline">
         <property name="stages">
@@ -957,6 +981,7 @@
                             <ref bean="uk_ie_edugate_importPipeline"/>
                             <ref bean="uk_us_incommon_importPipeline"/>
                             <ref bean="uk_se_swamid_importPipeline"/>
+                            <ref bean="uk_int_edugain_importPipeline"/>
                         </list>
                     </property>
                 </bean>