From a629b6e54ff6c33620dfcdce77ff6651b6403d9b Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 14 Jun 2011 15:09:11 +0000
Subject: [PATCH] Move the collection of pushed scopes into the members API
 bean.

---
 build/master_ukfederation.xsl                 |  18 ++++----
 mdx/uk/collect.xml                            |  17 +-------
 mdx/uk/scopes.xsl                             |  39 +++++++++---------
 ...embers-1.0.0.jar => ukf-members-1.1.0.jar} | Bin 15712 -> 17256 bytes
 4 files changed, 32 insertions(+), 42 deletions(-)
 rename tools/xalan/lib/{ukf-members-1.0.0.jar => ukf-members-1.1.0.jar} (57%)

diff --git a/build/master_ukfederation.xsl b/build/master_ukfederation.xsl
index 5fcb41ca..65b65b87 100644
--- a/build/master_ukfederation.xsl
+++ b/build/master_ukfederation.xsl
@@ -20,21 +20,23 @@
 	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 
+	xmlns:ukfxMembers="xalan://uk.org.ukfederation.members.Members"
+	extension-element-prefixes="ukfxMembers"
+
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	exclude-result-prefixes="alg members">
+	exclude-result-prefixes="alg members ukfxMembers">
 
 	<!--Force UTF-8 encoding for the output.-->
 	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
 
     <!--
-        Pick up "members" document and extract outsourced scope lists from it.
+        Pick up "members" document and build an API bean from it.
     -->
     <xsl:variable name="memberDocument" select="document('../xml/members.xml')"/>
-    <xsl:variable name="outsourcedScopes"
-        select="$memberDocument//members:Member/members:Scopes[members:Entity]"/>
-
+	<xsl:variable name="members" select="ukfxMembers:new($memberDocument)"/>
+	
     <!--
 		Root EntitiesDescriptor element.
 		
@@ -58,7 +60,7 @@
             <xsl:apply-templates select="node()"/>
             <!-- copy scopes from member outsource records -->
             <xsl:variable name="entityID" select="ancestor::md:EntityDescriptor/@entityID"/>
-            <xsl:for-each select="$outsourcedScopes[members:Entity = $entityID]/members:Scope">
+            <xsl:for-each select="ukfxMembers:scopesForEntity($members, $entityID)/shibmeta:Scope">
                 <xsl:text>    </xsl:text>
                 <xsl:element name="shibmeta:Scope">
                     <xsl:attribute name="regexp">false</xsl:attribute>
@@ -87,7 +89,7 @@
 					<xsl:copy-of select="."/>
 				</xsl:for-each>
 			    <!-- copy scopes from member outsource records -->
-			    <xsl:for-each select="$outsourcedScopes[members:Entity = $entityID]/members:Scope">
+				<xsl:for-each select="ukfxMembers:scopesForEntity($members, $entityID)/shibmeta:Scope">
 			        <xsl:text>&#10;            </xsl:text>
 			    	<xsl:element name="shibmeta:Scope">
 			    		<xsl:attribute name="regexp">false</xsl:attribute>
@@ -120,7 +122,7 @@
 					<xsl:text>&#10;        </xsl:text>
 				</xsl:for-each>
                 <!-- copy scopes from member outsource records -->
-                <xsl:for-each select="$outsourcedScopes[members:Entity = $entityID]/members:Scope">
+				<xsl:for-each select="ukfxMembers:scopesForEntity($members, $entityID)/shibmeta:Scope">
                     <xsl:text>    </xsl:text>
                     <xsl:element name="shibmeta:Scope">
                         <xsl:attribute name="regexp">false</xsl:attribute>
diff --git a/mdx/uk/collect.xml b/mdx/uk/collect.xml
index a2df7633..97fc7ba1 100644
--- a/mdx/uk/collect.xml
+++ b/mdx/uk/collect.xml
@@ -81,7 +81,7 @@
         </property>
         <property name="transformParameters">
             <map>
-                <entry key="membersDocument" value-ref="membersDocument"/>
+                <entry key="members" value-ref="members"/>
             </map>
         </property>
     </bean>
@@ -96,6 +96,7 @@
                 <ref bean="fetchUkFragmentFiles"/>
                 <ref bean="filterDeletedEntities"/>
                 <ref bean="processFragment"/>
+                <ref bean="processScopes"/>
                 <ref bean="populateItemIds"/>
                 <ref bean="populateUKIds"/>
                 <ref bean="checkSchemas"/>
@@ -107,25 +108,11 @@
                 
                 <ref bean="assemble.uk"/>
 
-                <!--
-                    Process scopes on the entities.  Because the transform performs
-                    a fairly heavyweight extraction operation on the members document
-                    before applying the results, this is best done on the resulting
-                    aggregate so that the extraction happens only once.
-                    
-                    A better long-term alternative would be to build support for
-                    this on a per-entity or per-owner basis into the Members bean.
-                -->
-                <ref bean="processScopes"/>
-                
                 <!--
                     Add the federation trust roots.
                 -->
                 <ref bean="addUKTrustRoots"/>
                 
-                <!-- failure of any check on registered metadata is fatal -->
-                <ref bean="errorTerminatingFilter"/>
-
                 <ref bean="normaliseNamespaces"/>
             </list>
         </property>
diff --git a/mdx/uk/scopes.xsl b/mdx/uk/scopes.xsl
index 9e2ca292..1d303a0c 100644
--- a/mdx/uk/scopes.xsl
+++ b/mdx/uk/scopes.xsl
@@ -10,7 +10,10 @@
 <xsl:stylesheet version="1.0"
     xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
     xmlns:members="http://ukfederation.org.uk/2007/01/members"
-	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
+	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+
+	xmlns:ukfxMembers="xalan://uk.org.ukfederation.members.Members"
+	extension-element-prefixes="ukfxMembers"
 
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -20,12 +23,10 @@
 	<!--Force UTF-8 encoding for the output.-->
 	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
 
-    <!--
-        The "members" document is passed in as a parmeter; extract outsourced scope lists from it.
-    -->
-    <xsl:param name="membersDocument"/>
-    <xsl:variable name="outsourcedScopes"
-        select="$membersDocument//members:Member/members:Scopes[members:Entity]"/>
+	<!--
+		Parameters.
+	-->
+	<xsl:param name="members"/>
 
     <!--
         Extend the scope list contained within an IdP's entity-level Extensions element
@@ -37,9 +38,9 @@
             <xsl:apply-templates select="node()"/>
             <!-- copy scopes from member outsource records -->
             <xsl:variable name="entityID" select="ancestor::md:EntityDescriptor/@entityID"/>
-            <xsl:for-each select="$outsourcedScopes[members:Entity = $entityID]/members:Scope">
-                <xsl:text>    </xsl:text>
-                <xsl:element name="shibmeta:Scope">
+        	<xsl:for-each select="ukfxMembers:scopesForEntity($members, $entityID)/shibmd:Scope">
+        		<xsl:text>    </xsl:text>
+                <xsl:element name="shibmd:Scope">
                     <xsl:attribute name="regexp">false</xsl:attribute>
                     <xsl:value-of select="."/>
                 </xsl:element>
@@ -61,14 +62,14 @@
 			<xsl:text>&#10;        </xsl:text>
 			<xsl:element name="Extensions" namespace="urn:oasis:names:tc:SAML:2.0:metadata">
 				<!-- copy scopes from EntityDescriptor extensions -->
-			    <xsl:for-each select="ancestor::md:EntityDescriptor/md:Extensions/shibmeta:Scope">
+			    <xsl:for-each select="ancestor::md:EntityDescriptor/md:Extensions/shibmd:Scope">
 					<xsl:text>&#10;            </xsl:text>
 					<xsl:copy-of select="."/>
 				</xsl:for-each>
 			    <!-- copy scopes from member outsource records -->
-			    <xsl:for-each select="$outsourcedScopes[members:Entity = $entityID]/members:Scope">
-			        <xsl:text>&#10;            </xsl:text>
-			    	<xsl:element name="shibmeta:Scope">
+				<xsl:for-each select="ukfxMembers:scopesForEntity($members, $entityID)/shibmd:Scope">
+					<xsl:text>&#10;            </xsl:text>
+			    	<xsl:element name="shibmd:Scope">
 			    		<xsl:attribute name="regexp">false</xsl:attribute>
 			    		<xsl:value-of select="."/>
 			    	</xsl:element>
@@ -91,17 +92,17 @@
 		<xsl:copy>
             <xsl:variable name="entityID" select="ancestor::md:EntityDescriptor/@entityID"/>
 			<xsl:apply-templates select="node()"/>
-			<xsl:if test="not(shibmeta:Scope)">
+			<xsl:if test="not(shibmd:Scope)">
 				<!-- copy scopes from EntityDescriptor extensions -->
-				<xsl:for-each select="ancestor::md:EntityDescriptor/md:Extensions/shibmeta:Scope">
+				<xsl:for-each select="ancestor::md:EntityDescriptor/md:Extensions/shibmd:Scope">
 					<xsl:text>    </xsl:text>
 					<xsl:copy-of select="."/>
 					<xsl:text>&#10;        </xsl:text>
 				</xsl:for-each>
                 <!-- copy scopes from member outsource records -->
-                <xsl:for-each select="$outsourcedScopes[members:Entity = $entityID]/members:Scope">
-                    <xsl:text>    </xsl:text>
-                    <xsl:element name="shibmeta:Scope">
+				<xsl:for-each select="ukfxMembers:scopesForEntity($members, $entityID)/shibmd:Scope">
+					<xsl:text>    </xsl:text>
+                    <xsl:element name="shibmd:Scope">
                         <xsl:attribute name="regexp">false</xsl:attribute>
                         <xsl:value-of select="."/>
                     </xsl:element>
diff --git a/tools/xalan/lib/ukf-members-1.0.0.jar b/tools/xalan/lib/ukf-members-1.1.0.jar
similarity index 57%
rename from tools/xalan/lib/ukf-members-1.0.0.jar
rename to tools/xalan/lib/ukf-members-1.1.0.jar
index f84edca02bfa377a9f64eb1807192e220bff886c..2fd5a75fa13db2009ab56769212fa693775eb1f6 100644
GIT binary patch
delta 5124
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
DZ8b9(

delta 3774
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
QW1f?EGgE^=YNV3;A6Ys&1ONa4