From 8a1a6dfb8c7a460f8b98e6dba73678b0f8d5318a Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 24 Oct 2019 10:17:28 +0100
Subject: [PATCH] Permit appropriate regular expression scopes from eduGAIN

Remove check_shib_regscope from standardImportActions.
Add it back in after all calls to standardImportActions that do not include the new scope checking policy for eduGAIN.
This allows regular expression scopes meeting policy to be imported from eduGAIN while retaining the previous behaviour everywhere else.
See ukf/ukf-meta#182.
---
 mdx/at_aconet/verbs.xml   | 3 +++
 mdx/common-beans.xml      | 1 -
 mdx/int_cobweb/verbs.xml  | 2 ++
 mdx/test/verbs.xml        | 1 +
 mdx/uk/verbs.xml          | 1 +
 mdx/us_incommon/verbs.xml | 2 ++
 6 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml
index 64da4a80..f3db7439 100644
--- a/mdx/at_aconet/verbs.xml
+++ b/mdx/at_aconet/verbs.xml
@@ -36,6 +36,7 @@
             <list>
                 <ref bean="at_aconet_productionEntities"/>
                 <ref bean="standardImportActions"/>
+                <ref bean="check_shib_regscope"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -56,6 +57,7 @@
             <list>
                 <ref bean="at_aconet_edugainEntities"/>
                 <ref bean="standardImportActions"/>
+                <ref bean="check_shib_regscope"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -76,6 +78,7 @@
             <list>
                 <ref bean="at_aconet_edugainEntities"/>
                 <ref bean="standardImportActions"/>
+                <ref bean="check_shib_regscope"/>
 
                 <bean id="checkCertificates" parent="mda.X509ValidationStage">
                     <property name="validators">
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 68b6e078..16387525 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -1130,7 +1130,6 @@
                 <ref bean="checkSchemas"/>
                 <ref bean="CHECK_std"/>
                 <ref bean="check_dup_display"/>
-                <ref bean="check_shib_regscope"/>
                 <ref bean="check_namespaces"/>
 
                 <bean id="checkCertificates" parent="mda.X509ValidationStage">
diff --git a/mdx/int_cobweb/verbs.xml b/mdx/int_cobweb/verbs.xml
index 0a626f57..5cb06d8b 100644
--- a/mdx/int_cobweb/verbs.xml
+++ b/mdx/int_cobweb/verbs.xml
@@ -36,6 +36,7 @@
             <list>
                 <ref bean="int_cobweb_productionEntities"/>
                 <ref bean="standardImportActions"/>
+                <ref bean="check_shib_regscope"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -47,6 +48,7 @@
             <list>
                 <ref bean="int_cobweb_productionEntities"/>
                 <ref bean="standardImportActions"/>
+                <ref bean="check_shib_regscope"/>
                 <ref bean="errorTerminatingFilter"/>
             </list>
         </property>
diff --git a/mdx/test/verbs.xml b/mdx/test/verbs.xml
index 3214ed55..ac6efdcf 100644
--- a/mdx/test/verbs.xml
+++ b/mdx/test/verbs.xml
@@ -36,6 +36,7 @@
             <list>
                 <ref bean="test_entities"/>
                 <ref bean="standardImportActions"/>
+                <ref bean="check_shib_regscope"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index 7624cada..22eb99a0 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -410,6 +410,7 @@
             <list>
                 <ref bean="uk_exportedEntities"/>
                 <ref bean="standardImportActions"/>
+                <ref bean="check_shib_regscope"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
diff --git a/mdx/us_incommon/verbs.xml b/mdx/us_incommon/verbs.xml
index aff47f46..9eb81544 100644
--- a/mdx/us_incommon/verbs.xml
+++ b/mdx/us_incommon/verbs.xml
@@ -39,6 +39,7 @@
             <list>
                 <ref bean="us_incommon_productionEntities"/>
                 <ref bean="standardImportActions"/>
+                <ref bean="check_shib_regscope"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -59,6 +60,7 @@
             <list>
                 <ref bean="us_incommon_exportedEntities"/>
                 <ref bean="standardImportActions"/>
+                <ref bean="check_shib_regscope"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>