From 708df33563a4df3d696a3423c44bfb234bd6fc3e Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 10 May 2016 14:31:47 +0100
Subject: [PATCH] Add new technical policy rules.

---
 mdx/incommon/edugain-policy.xml | 28 ++++++++++++++++++++++++++++
 mdx/incommon/report.xml         |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/mdx/incommon/edugain-policy.xml b/mdx/incommon/edugain-policy.xml
index f3afc57c..fc69aeaa 100644
--- a/mdx/incommon/edugain-policy.xml
+++ b/mdx/incommon/edugain-policy.xml
@@ -132,6 +132,34 @@
                     entities are merged in with the ones from InCommon.
                 -->
 
+                <!--
+                    The following technical policy rules do not yet appear in the
+                    published wiki page.
+                -->
+
+                <!--
+                    Filter entities whose entityID does not start with one of the
+                    following prefixes: urn:mace:, http://, https://.
+                -->
+                <ref bean="check_entityid_prefix"/>
+
+                <!--
+                    Filter all imported IdP entities with an endpoint location that
+                    is not HTTPS-protected.
+                -->
+                <ref bean="check_idp_tls"/>
+
+                <!--
+                    Filter all imported mdui:Logo elements (not entities) with a URL
+                    that is not HTTPS-protected.
+                -->
+                <ref bean="stripMDUILogoHttp"/>
+
+                <!--
+                    Filter entities containing literal CR characters.
+                -->
+                <ref bean="check_cr"/>
+
                 <!--
                     Policy rules below this point are not called out explicitly in the
                     published policy wiki page.
diff --git a/mdx/incommon/report.xml b/mdx/incommon/report.xml
index 774071f6..8e1ceb6a 100644
--- a/mdx/incommon/report.xml
+++ b/mdx/incommon/report.xml
@@ -79,7 +79,7 @@
                 <!--
                     Announce any entities marked as having errors or warnings.
                 -->
-                <ref bean="errorAnnouncer"/>
+                <ref bean="warningAndErrorAnnouncer"/>
             </list>
         </property>
     </bean>