From d041e4f139bb82cb6b7202edc76ff4d1b7bdea66 Mon Sep 17 00:00:00 2001
From: Alex Stuart <alex.stuart@jisc.ac.uk>
Date: Tue, 15 Oct 2019 23:15:31 +0100
Subject: [PATCH] Add ability to block a set of entities from the fallback
 aggregate.

See ukf/ukf-meta#195
---
 build.xml           | 2 ++
 mdx/uk/generate.xml | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/build.xml b/build.xml
index cb622466..a0307b20 100644
--- a/build.xml
+++ b/build.xml
@@ -249,6 +249,7 @@
         External specialised directories.
     -->
     <property name="aggregates.dir" value="${shared.ws.dir}/${git.repo.project.products}/aggregates"/>
+    <property name="blocklists.dir" value="${shared.ws.dir}/${git.repo.project.data}/blocklists"/>
     <property name="edugain.dir" value="${shared.ws.dir}/${git.repo.project.data}/edugain"/>
     <property name="entities.dir" value="${shared.ws.dir}/${git.repo.project.data}/entities"/>
     <property name="members.dir" value="${shared.ws.dir}/${git.repo.project.data}/members"/>
@@ -1569,6 +1570,7 @@
         by properties defined in the external properties files, e.g., build.properties.
     -->
     <property name="mda.java.endorsed.dirs" value="${tools.dir}/endorsed"/>
+    <property name="mda.blocklists.dir" value="${blocklists.dir}"/>
     <property name="mda.edugain.dir" value="${edugain.dir}"/>
     <property name="mda.entities.dir" value="${entities.dir}"/>
     <property name="mda.mdx.dir" value="${mdx.dir}"/>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index f701d70d..3f16d7d5 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -28,6 +28,10 @@
     -->
     <import resource="classpath:int_edugain/beans.xml"/>
 
+    <!--
+        Import beans for blocklists.
+    -->
+    <import resource="file:${blocklists.dir}/fallback-blocklist.xml"/>
 
     <!--
         *****************************
@@ -520,6 +524,10 @@
     <bean id="uk_fallbackPipeline" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
+                <bean id="removeFallbackBlocklist" parent="mda.EntityFilterStage"
+                    p:whitelistingEntities="false"
+                    p:designatedEntities-ref="fallbackEntityBlocklist"/>
+
                 <!--
                     Enforce IdP display name uniqueness before assembling aggregate
                 -->