From 5954d8322cca660af7fdaed5c038396055de282c Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 18 Aug 2011 16:03:13 +0000
Subject: [PATCH] ie_edugate export metadata is now confirmed as automated, so
 make its validUntil expiring a hard error again

---
 mdx/ie_edugate/beans.xml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/mdx/ie_edugate/beans.xml b/mdx/ie_edugate/beans.xml
index 07c1052a..68c12302 100644
--- a/mdx/ie_edugate/beans.xml
+++ b/mdx/ie_edugate/beans.xml
@@ -49,7 +49,8 @@
         ie_edugate_validUntil
         
         Check that an aggregate has a validUntil instant specified, and that it has not
-        yet expired.  Sets a bound of 30 days on the validity interval.
+        yet expired.  Sets a bound of 14 days on the validity interval; 9 days is the
+        expected value.
     -->
     <bean id="ie_edugate_validUntil" class="net.shibboleth.metadata.dom.saml.ValidateValidUntilStage"
         init-method="initialize" lazy-init="true">
@@ -61,7 +62,7 @@
         <!--
             Validity interval must not exceed 30 days.
         -->
-        <property name="maxValidityInterval" value="#{ 1000L * 60 * 60 * 24 * 30 }"/>
+        <property name="maxValidityInterval" value="#{ 1000L * 60 * 60 * 24 * 14 }"/>
     </bean>
     
     <!--
@@ -79,18 +80,10 @@
                         missing or expired validUntil attribute
                         invalid signature
                 -->
-                <!-- <ref bean="ie_edugate_validUntil"/> -->
+                <ref bean="ie_edugate_validUntil"/>
                 <ref bean="ie_edugate_checkSignature"/>
                 <ref bean="errorTerminatingFilter"/>
                 
-                <!--
-                    For now, regard expired validUntil as an error which
-                    is serious enough to cause this metadata to be discarded
-                    but not enough to cause our signing process to terminate.
-                -->
-                <ref bean="ie_edugate_validUntil"/>
-                <ref bean="errorAnnouncingFilter"/>
-                
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>