From 17293d323b1ef5733d47cf29fb5d5a504f128825 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 28 May 2015 15:12:31 +0100
Subject: [PATCH] Exbed eduGAIN policy.

---
 mdx/incommon/edugain-policy.xml | 77 +++++++++++++++++++++++++++++++++
 mdx/incommon/import.xml         | 52 ++++------------------
 2 files changed, 85 insertions(+), 44 deletions(-)
 create mode 100644 mdx/incommon/edugain-policy.xml

diff --git a/mdx/incommon/edugain-policy.xml b/mdx/incommon/edugain-policy.xml
new file mode 100644
index 00000000..f7233259
--- /dev/null
+++ b/mdx/incommon/edugain-policy.xml
@@ -0,0 +1,77 @@
+<?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.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+    <!--
+        Import entity whitelist.
+    -->
+    <import resource="classpath:incommon/import-whitelist.xml"/>
+
+    <!--
+        edugainPolicy
+
+        Applies policy to entities sourced from eduGAIN.
+
+        Entities may be transformed by policy, or marked as being in error.
+
+        Entities with errors are NOT removed here, so that this policy can be
+        used in contexts where reporting is more appropriate than just removal.
+    -->
+    <bean id="edugainPolicy" parent="CompositeStage"
+        p:id="edugainPolicy">
+        <property name="composedStages">
+            <list>
+
+                <!--
+                    removeInCommonEntities
+
+                    Filter out entities that declare themselves as registered
+                    by our federation.  We don't want those coming back in
+                    from another registrar or metadata exchange as they may be
+                    old versions of entities we have deregistered, or spoofed.
+                -->
+                <bean p:id="removeInCommonEntities" parent="EntityRegistrationAuthorityFilterStage">
+                    <property name="designatedRegistrationAuthorities">
+                        <list>
+                            <ref bean="us_incommon_registrar"/>
+                        </list>
+                    </property>
+                    <property name="requiringRegistrationInformation" value="true"/>
+                    <property name="whitelistingRegistrationAuthorities" value="false"/>
+                </bean>
+
+                <!-- Remove all but the entities we want to import. -->
+                <bean id="applyEntityWhitelist" parent="EntityFilterStage"
+                    p:id="applyEntityWhitelist"
+                    p:whitelistingEntities="true"
+                    p:designatedEntities-ref="incommon_edugain_import_whitelist"/>
+
+                <!-- Filter the entity attributes imported from eduGAIN. -->
+                <bean parent="EntityAttributeFilteringStage" p:id="entityAttributes">
+                   <property name="rules">
+                       <list>
+                           <!-- Permit REFEDS R&S category membership -->
+                           <bean parent="EntityCategoryMatcher"
+                                c:category="http://refeds.org/category/research-and-scholarship"/>
+
+                           <!-- Permit REFEDS R&S category support -->
+                           <bean parent="EntityCategorySupportMatcher"
+                               c:category="http://refeds.org/category/research-and-scholarship"/>
+
+                       </list>
+                   </property>
+                </bean>
+
+                <ref bean="standardImportActions"/>
+            </list>
+        </property>
+    </bean>
+
+</beans>
diff --git a/mdx/incommon/import.xml b/mdx/incommon/import.xml
index 21d66799..029e53dd 100644
--- a/mdx/incommon/import.xml
+++ b/mdx/incommon/import.xml
@@ -21,7 +21,7 @@
         Import channel-specific beans.
     -->
     <import resource="classpath:incommon/beans.xml"/>
-    <import resource="classpath:incommon/import-whitelist.xml"/>
+    <import resource="classpath:incommon/edugain-policy.xml"/>
 
     <!--
         Import eduGAIN channel beans.
@@ -37,55 +37,19 @@
         </property>
     </bean>
 
-    <!--
-        removeInCommonEntities
-
-        Filter out entities which declare themselves as registered
-        by our federation.  We don't want those coming back in
-        from another registrar or metadata exchange as they may be
-        old versions of entities we have deregistered, or spoofed.
-    -->
-    <bean id="removeInCommonEntities" parent="EntityRegistrationAuthorityFilterStage"
-        p:id="removeInCommonEntities">
-        <property name="designatedRegistrationAuthorities">
-            <list>
-                <ref bean="us_incommon_registrar"/>
-            </list>
-        </property>
-        <property name="requiringRegistrationInformation" value="true"/>
-        <property name="whitelistingRegistrationAuthorities" value="false"/>
-    </bean>
-
     <bean id="incommon_edugain_importPipeline" parent="SimplePipeline"
         p:id="incommon_edugain_importPipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
-                <ref bean="removeInCommonEntities"/>
-
-                <!-- Remove all but the entities we want to import. -->
-                <bean id="applyEntityWhitelist" parent="EntityFilterStage"
-                    p:id="applyEntityWhitelist"
-                    p:whitelistingEntities="true"
-                    p:designatedEntities-ref="incommon_edugain_import_whitelist"/>
-
-                <!-- Filter the entity attributes imported from eduGAIN. -->
-                <bean parent="EntityAttributeFilteringStage" p:id="entityAttributes">
-                   <property name="rules">
-                       <list>
-                           <!-- Permit REFEDS R&S category membership -->
-                           <bean parent="EntityCategoryMatcher"
-                                c:category="http://refeds.org/category/research-and-scholarship"/>
-
-                           <!-- Permit REFEDS R&S category support -->
-                           <bean parent="EntityCategorySupportMatcher"
-                               c:category="http://refeds.org/category/research-and-scholarship"/>
-
-                       </list>
-                   </property>
-                </bean>
 
-                <ref bean="standardImportActions"/>
+
+                <!-- Populate identifiers for future actions. -->
+                <ref bean="populateItemIds"/>
+                <ref bean="populateRegistrationAuthorities"/>
+
+                <!-- Apply policy. -->
+                <ref bean="edugainPolicy"/>
 
                 <!--
                     Silently remove entities which are marked as