Move the collection of pushed scopes into the members API bean.

InCommon · Jun 14, 2011 · a629b6e · a629b6e
1 parent dd875a7
commit a629b6e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 42 deletions.
diff --git 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
@@ -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
@@ -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 → tools/xalan/lib/ukf-members-1.1.0.jar b/tools/xalan/lib/ukf-members-1.0.0.jar → tools/xalan/lib/ukf-members-1.1.0.jar