From 2de4dcfb77ac57488f125890a9ac26d31fe59782 Mon Sep 17 00:00:00 2001
From: Alex Stuart <alex.stuart@jisc.ac.uk>
Date: Wed, 30 Sep 2020 16:51:19 +0100
Subject: [PATCH] Add ant target to generate list of IdPs asserting User
 Accountability

See ukf/ukf-meta#258 for details
---
 .gitignore                                    |  1 +
 build.xml                                     | 16 ++++
 tests/manual/ukf-meta-258/README.md           |  4 +-
 tests/manual/ukf-meta-258/accented.out        |  5 ++
 tests/manual/ukf-meta-258/accented.xml        | 88 +++++++++++++++++++
 .../{scope-test.xml => input.xml}             |  0
 .../{scope-test.out => scopes.out}            |  0
 tests/manual/ukf-meta-258/uai.out             |  5 ++
 utilities/ua-idp.xsl                          | 28 ++++++
 9 files changed, 146 insertions(+), 1 deletion(-)
 create mode 100644 tests/manual/ukf-meta-258/accented.out
 create mode 100644 tests/manual/ukf-meta-258/accented.xml
 rename tests/manual/ukf-meta-258/{scope-test.xml => input.xml} (100%)
 rename tests/manual/ukf-meta-258/{scope-test.out => scopes.out} (100%)
 create mode 100644 tests/manual/ukf-meta-258/uai.out
 create mode 100644 utilities/ua-idp.xsl

diff --git a/.gitignore b/.gitignore
index 5ae1b52e..c408efa1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ Thumbs.db
 /build/locations.txt
 /build/orgnamescope.html
 /build/randssps.html
+/build/uai.html
 
 # /charting/
 /charting/cache
diff --git a/build.xml b/build.xml
index e5333aec..fe439859 100644
--- a/build.xml
+++ b/build.xml
@@ -2388,6 +2388,7 @@
                     <scp failonerror="true" remoteTodir="${www.url.members}" keyfile="~/.ssh/id_rsa" knownhosts="~/.ssh/known_hosts">
                         <fileset dir="${build.dir}">
                             <include name="orgnamescope.html"/>
+                            <include name="uai.html"/>
                         </fileset>
                     </scp>
                     <scp failonerror="true" remoteTodir="${www.url.stats}" keyfile="~/.ssh/id_rsa" knownhosts="~/.ssh/known_hosts">
@@ -2830,6 +2831,21 @@
         </exec>
     </target>
 
+    <!--
+        generate.html.uai
+
+        Generates a HTML table of IdPs asserting User Accountability
+    -->
+    <target name="generate.html.uai">
+        <echo>Running generate.html.uai XSLT</echo>
+        <exec executable="xsltproc" failonerror="true">
+            <arg value="--output" />
+            <arg value="${build.dir}/uai.html" />
+            <arg value="${utilities.dir}/ua-idp.xsl" />
+            <arg value="${aggregates.dir}/ukfederation-metadata.xml" />
+        </exec>
+    </target>
+
     <!--
         echoproperties
 
diff --git a/tests/manual/ukf-meta-258/README.md b/tests/manual/ukf-meta-258/README.md
index e7c4b4e2..ae988979 100644
--- a/tests/manual/ukf-meta-258/README.md
+++ b/tests/manual/ukf-meta-258/README.md
@@ -2,6 +2,8 @@
 
 ## Tests
 
-xsltproc ../../../utilities/orgnamescope.xsl scope-test.xml  | diff - scope-test.out 
+xsltproc ../../../utilities/orgnamescope.xsl input.xml  | diff - scopes.out 
+xsltproc ../../../utilities/ua-idp.xsl input.xml | diff - uai.out
+xsltproc ../../../utilities/ua-idp.xsl accented.xml | diff - accented.out
 
 
diff --git a/tests/manual/ukf-meta-258/accented.out b/tests/manual/ukf-meta-258/accented.out
new file mode 100644
index 00000000..a803deed
--- /dev/null
+++ b/tests/manual/ukf-meta-258/accented.out
@@ -0,0 +1,5 @@
+<h3>Federation Identity Providers Asserting User Accountability</h3><p>The following IdPs assert user accountability (in accordance with section six of the <a href="https://www.ukfederation.org.uk/doc/rules-of-membership">UK federation's rules of membership</a>):</p><br><ul>
+<li>Båntshire University</li>
+<li>Rummidgé University</li>
+<li>Unseen Üniversity</li>
+</ul>
diff --git a/tests/manual/ukf-meta-258/accented.xml b/tests/manual/ukf-meta-258/accented.xml
new file mode 100644
index 00000000..f475c89e
--- /dev/null
+++ b/tests/manual/ukf-meta-258/accented.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
+	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+	xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
+	xmlns:uklabel="http://ukfederation.org.uk/2006/11/label">
+<EntityDescriptor entityID='https://idp.rummidge.ac.uk/idp'>
+	<Extensions>
+		<uklabel:AccountableUsers />
+		<uklabel:UKFederationMember />
+		<mdrpi:RegistrationInfo registrationAuthority='http://ukfederation.org.uk' />
+	</Extensions>
+        <IDPSSODescriptor>
+		<Extensions>
+			<shibmd:Scope>rummidge.ac.uk</shibmd:Scope>
+		</Extensions>
+        </IDPSSODescriptor>
+	<Organization>
+		<OrganizationName xml:lang='en'>Rummidge University</OrganizationName>
+		<OrganizationDisplayName xml:lang='en'>Rummidgé University</OrganizationDisplayName>
+	</Organization>
+</EntityDescriptor>
+<EntityDescriptor entityID='urn:mace:ac.uk:sdss.ac.uk:provider:identity:unseen.ac.uk'>
+        <Extensions>
+                <uklabel:AccountableUsers />
+                <uklabel:UKFederationMember />
+		<mdrpi:RegistrationInfo registrationAuthority='http://ukfederation.org.uk' />
+                <mdattr:EntityAttributes>
+                        <saml:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+                                <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+                        </saml:Attribute>
+                </mdattr:EntityAttributes>
+        </Extensions>
+        <IDPSSODescriptor>
+		<Extensions>
+			<shibmd:Scope>ankh.unseen.ac.uk</shibmd:Scope>
+			<shibmd:Scope>morpock.unseen.ac.uk</shibmd:Scope>
+			<shibmd:Scope>naphill.unseen.ac.uk</shibmd:Scope>
+			<shibmd:Scope>library.unseen.ac.uk</shibmd:Scope>
+			<shibmd:Scope>high.energy.magic.unseen.ac.uk</shibmd:Scope>
+			<shibmd:Scope>unseen.ac.uk</shibmd:Scope>
+		</Extensions>
+        </IDPSSODescriptor>
+        <Organization>
+                <OrganizationName xml:lang='en'>Unseen University</OrganizationName>
+                <OrganizationDisplayName xml:lang='en'>Unseen Üniversity</OrganizationDisplayName>
+        </Organization>
+</EntityDescriptor>
+<EntityDescriptor entityID='https://bantshire.ac.uk/idp'>
+        <Extensions>
+                <uklabel:AccountableUsers />
+                <uklabel:UKFederationMember />
+		<mdrpi:RegistrationInfo registrationAuthority='http://ukfederation.org.uk' />
+        </Extensions>
+        <IDPSSODescriptor>
+		<Extensions>
+			<shibmd:Scope>bantshire.ac.uk</shibmd:Scope>
+		</Extensions>
+        </IDPSSODescriptor>
+        <Organization>
+                <OrganizationName xml:lang='en'>Bantshire University</OrganizationName>
+                <OrganizationDisplayName xml:lang='en'>Båntshire University</OrganizationDisplayName>
+        </Organization>
+</EntityDescriptor>
+<EntityDescriptor entityID='https://idp.monsters.edu/idp'>
+        <Extensions>
+                <uklabel:AccountableUsers />
+        </Extensions>
+        <IDPSSODescriptor />
+        <Organization>
+                <OrganizationName xml:lang='en'>Monsters University</OrganizationName>
+                <OrganizationDisplayName xml:lang='en'>Monsters University</OrganizationDisplayName>
+        </Organization>
+</EntityDescriptor>
+<EntityDescriptor entityID='urn:mace:ac.uk:sdss.ac.uk:provider:service:unseen.ac.uk'>
+        <Extensions>
+                <uklabel:AccountableUsers />
+                <uklabel:UKFederationMember />
+		<mdrpi:RegistrationInfo registrationAuthority='http://ukfederation.org.uk' />
+        </Extensions>
+	<SPSSODescriptor />
+        <Organization>
+                <OrganizationName xml:lang='en'>Unseen University</OrganizationName>
+                <OrganizationDisplayName xml:lang='en'>Unseen University SP</OrganizationDisplayName>
+        </Organization>
+</EntityDescriptor>
+</EntitiesDescriptor>
diff --git a/tests/manual/ukf-meta-258/scope-test.xml b/tests/manual/ukf-meta-258/input.xml
similarity index 100%
rename from tests/manual/ukf-meta-258/scope-test.xml
rename to tests/manual/ukf-meta-258/input.xml
diff --git a/tests/manual/ukf-meta-258/scope-test.out b/tests/manual/ukf-meta-258/scopes.out
similarity index 100%
rename from tests/manual/ukf-meta-258/scope-test.out
rename to tests/manual/ukf-meta-258/scopes.out
diff --git a/tests/manual/ukf-meta-258/uai.out b/tests/manual/ukf-meta-258/uai.out
new file mode 100644
index 00000000..fc216b67
--- /dev/null
+++ b/tests/manual/ukf-meta-258/uai.out
@@ -0,0 +1,5 @@
+<h3>Federation Identity Providers Asserting User Accountability</h3><p>The following IdPs assert user accountability (in accordance with section six of the <a href="https://www.ukfederation.org.uk/doc/rules-of-membership">UK federation's rules of membership</a>):</p><br><ul>
+<li>Bantshire University</li>
+<li>Rummidge University</li>
+<li>Unseen University</li>
+</ul>
diff --git a/utilities/ua-idp.xsl b/utilities/ua-idp.xsl
new file mode 100644
index 00000000..ad6499f8
--- /dev/null
+++ b/utilities/ua-idp.xsl
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:uklabel="http://ukfederation.org.uk/2006/11/label"
+    exclude-result-prefixes="xsl md xsi uklabel"
+    version="1.0">
+
+    <xsl:output method="html" omit-xml-declaration="yes" encoding="UTF-8"/>
+    
+    <xsl:template match="md:EntitiesDescriptor">
+        
+<h3>Federation Identity Providers Asserting User Accountability</h3>
+
+<p>The following IdPs assert user accountability (in accordance with section six of the <a href="https://www.ukfederation.org.uk/doc/rules-of-membership">UK federation's rules of membership</a>):</p>
+<br />
+<ul>
+
+    <xsl:for-each select="//md:EntityDescriptor[md:IDPSSODescriptor][md:Extensions/uklabel:AccountableUsers][md:Extensions/uklabel:UKFederationMember]">
+        <xsl:sort select="md:Organization/md:OrganizationDisplayName"/>
+        <li><xsl:value-of select="md:Organization/md:OrganizationDisplayName"/></li>
+    </xsl:for-each>
+
+</ul>
+    </xsl:template>
+</xsl:stylesheet>
+