From 6fb1ba2cffc68d61e6d648a5d9093bfd8153de5c Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 5 May 2014 13:47:12 +0000
Subject: [PATCH] Bugzilla 1082, 1096: resolve by blacklisting one IdP in each
 clashing pair. Entity selected for blacklisting in each case selected in
 consultation with the originating registrar.

---
 mdx/int_edugain/beans.xml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index c7d03228..044ecb99 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -12,6 +12,11 @@
         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">
     
+    <!--
+        Import additional channel-local beans.
+    -->
+    <import resource="classpath:int_edugain/entity-blacklist.xml"/>
+    
     <!--
         Import eduGAIN participant beans for namespace stripping stages.
     -->
@@ -74,7 +79,15 @@
         p:id="int_edugain_checkSignature">
         <property name="verificationCertificate" ref="int_edugain_signingCertificate"/>
     </bean>
-    
+
+    <!--
+        Remove blacklisted entities.
+    -->
+    <bean id="int_edugain_removeBlacklistedEntities" parent="EntityFilterStage"
+        p:id="int_edugain_removeBlacklistedEntities"
+        p:whitelistingEntities="false"
+        p:designatedEntities-ref="int_edugain_entity_blacklist"/>
+
     <!--
         Fetch the production entities as a collection.
     -->
@@ -95,6 +108,8 @@
                 
                 <ref bean="disassemble"/>
                 
+                <ref bean="int_edugain_removeBlacklistedEntities"/>
+
                 <!--
                     Strip participant-specific namespaces.
                 -->
@@ -130,6 +145,8 @@
                 
                 <ref bean="disassemble"/>
 
+                <ref bean="int_edugain_removeBlacklistedEntities"/>
+                
                 <!--
                     Strip participant-specific namespaces.
                 -->