From cf0bbc9518bc7018eebaab50332dfa897bf2c2e9 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 28 May 2015 15:56:38 +0100
Subject: [PATCH] Replace import whitelist with Phase 1 selection criterion.

Identity providers marked as supporting REFEDS R&S, described as an
XPath expression.
---
 mdx/incommon/edugain-policy.xml   | 29 +++++++++++++++++++----------
 mdx/incommon/import-whitelist.xml | 30 ------------------------------
 2 files changed, 19 insertions(+), 40 deletions(-)
 delete mode 100644 mdx/incommon/import-whitelist.xml

diff --git a/mdx/incommon/edugain-policy.xml b/mdx/incommon/edugain-policy.xml
index f7233259..8a36f738 100644
--- a/mdx/incommon/edugain-policy.xml
+++ b/mdx/incommon/edugain-policy.xml
@@ -9,11 +9,6 @@
         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
 
@@ -47,11 +42,25 @@
                     <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"/>
+                <!--
+                    Remove all but those eduGAIN entities we intend to import in this
+                    phase of the roadmap.
+
+                    Phase 1: import only IdPs that support global R&S.
+                -->
+                <bean p:id="selectEntities" parent="XPathFilteringStage"
+                    p:XPathExpression="not(/md:EntityDescriptor
+                        [md:IDPSSODescriptor]
+                        [md:Extensions
+                            /mdattr:EntityAttributes
+                            /saml:Attribute
+                                [@NameFormat = 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri']
+                                [@Name = 'http://macedir.org/entity-category-support']
+                            /saml:AttributeValue
+                                [. = 'http://refeds.org/category/research-and-scholarship']
+                        ]
+                    )"
+                />
 
                 <!-- Filter the entity attributes imported from eduGAIN. -->
                 <bean parent="EntityAttributeFilteringStage" p:id="entityAttributes">
diff --git a/mdx/incommon/import-whitelist.xml b/mdx/incommon/import-whitelist.xml
deleted file mode 100644
index c26df672..00000000
--- a/mdx/incommon/import-whitelist.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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">
-
-    <!--
-        ***********************************************************
-        ***                                                     ***
-        ***   E D U G A I N   I M P O R T   W H I T E L I S T   ***
-        ***                                                     ***
-        ***********************************************************
-    -->
-
-    <!--
-        The entities named in this set will be imported from eduGAIN to InCommon.
-    -->
-    <util:set id="incommon_edugain_import_whitelist">
-
-        <!-- Example entities for initial development. -->
-        <value>https://idp.cardiff.ac.uk/shibboleth</value>
-
-    </util:set>
-
-</beans>