From 0fa807297c87b6d58add294cb5ed6ff23ab06ad1 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 8 May 2017 12:06:06 +0100
Subject: [PATCH] Discard UKf entities at start of eduGAIN verify flows

See ukf/ukf-meta#118.
---
 mdx/int_edugain/verbs.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
index 15d98b02..21f8be8a 100644
--- a/mdx/int_edugain/verbs.xml
+++ b/mdx/int_edugain/verbs.xml
@@ -31,6 +31,20 @@
         </property>
     </bean>
     
+    <!--
+        removeUKEntities
+
+        Filter out entities which declare themselves as registered
+        by the UK federation, as we don't need to verify those.
+    -->
+    <bean id="removeUKEntities" parent="mda.EntityRegistrationAuthorityFilterStage">
+        <property name="designatedRegistrationAuthorities">
+            <list>
+                <ref bean="uk_ukf_registrar"/>
+            </list>
+        </property>
+    </bean>
+
     <bean id="importProduction" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
@@ -74,6 +88,7 @@
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
+                <ref bean="removeUKEntities"/>
                 <bean id="removeBlacklistedEntities" parent="mda.EntityFilterStage"
                     p:whitelistingEntities="false"
                     p:designatedEntities-ref="int_edugain_verify_blacklist"/>
@@ -93,6 +108,7 @@
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
+                <ref bean="removeUKEntities"/>
                 <bean id="removeBlacklistedEntities" parent="mda.EntityFilterStage"
                     p:whitelistingEntities="false"
                     p:designatedEntities-ref="int_edugain_verify_blacklist"/>
@@ -113,6 +129,7 @@
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
+                <ref bean="removeUKEntities"/>
                 
                 <!-- remove all entities which still have errors -->
                 <ref bean="standardImportActions"/>
@@ -145,6 +162,7 @@
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
+                <ref bean="removeUKEntities"/>
                 
                 <ref bean="standardImportActions"/>
                 <ref bean="warningAndErrorAnnouncer"/>