From e8583f0f1be4a3d481d56a0af94b17409f8a4500 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 7 Nov 2019 16:10:11 +0000
Subject: [PATCH] Stop using Mail.dodgyAddress from sdss-xalan-md project

Replace Xalan-based EmailAddress validation with a new EmailAddressStringValidator and StringElementValidationStage stage from ukf-mda.
See ukf/ukf-meta#139.
---
 mdx/uk/beans.xml       | 14 ++++++++++++++
 mdx/uk/check_ukreg.xsl | 14 --------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index f6b5d685..87d4420f 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -239,6 +239,19 @@
     <bean id="check_uk_keydesc_key" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:uk/check_uk_keydesc_key.xsl"/>
 
+    <!--
+        check_uk_email
+
+        Check that md:EmailAddress elements match our format, as
+        described by the EmailAddressStringValidator. In particular,
+        this requires the "mailto:" scheme."
+    -->
+    <bean id="check_uk_email" parent="ukf.StringElementValidationStage"
+        p:elementName-ref="md-EmailAddress">
+        <property name="validators">
+            <bean id="format" parent="ukf.EmailAddressStringValidator"/>
+        </property>
+    </bean>
 
     <!--
         check_uk_extensions
@@ -365,6 +378,7 @@
                 <bean id="check_ukfedlabel" parent="mda.XSLValidationStage"
                     p:XSLResource="classpath:uk/check_ukfedlabel.xsl"/>
                 <ref bean="check_ukreg"/>
+                <ref bean="check_uk_email"/>
                 <ref bean="check_owner"/>
                 <ref bean="check_uk_keydesc_key"/>
                 <ref bean="check_uk_mdattr"/>
diff --git a/mdx/uk/check_ukreg.xsl b/mdx/uk/check_ukreg.xsl
index b29eea90..e647e374 100644
--- a/mdx/uk/check_ukreg.xsl
+++ b/mdx/uk/check_ukreg.xsl
@@ -13,10 +13,6 @@
     xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
     xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-
-    xmlns:mdxMail="xalan://uk.ac.sdss.xalan.md.Mail"
-    extension-element-prefixes="mdxMail"
-
     xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
 
     <!--
@@ -25,16 +21,6 @@
     <xsl:import href="../_rules/check_framework.xsl"/>
 
 
-    <!--
-        Check for badly formatted e-mail addresses.
-    -->
-    <xsl:template match="md:EmailAddress[mdxMail:dodgyAddress(.)]">
-        <xsl:call-template name="error">
-            <xsl:with-param name="m">badly formatted e-mail address: '<xsl:value-of select='.'/>'</xsl:with-param>
-        </xsl:call-template>
-    </xsl:template>
-
-
     <!--
         Check for https:// locations that use an explicit but redundant port specifier.
     -->