[java-identity-provider COMMIT] in /trunk/idp-installer/src: main/java/net/shibboleth/idp/installer/metadata/Metadata...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Mar  3 09:14:32 2017
New Revision: 8640

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8640&view=rev
Log:
IDP-1118 set validUntil to "Now"

https://issues.shibboleth.net/jira/browse/IDP-1118

Modified:
    trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java
    trunk/idp-installer/src/test/java/net/shibboleth/idp/installer/TestMetadataGenerator.java

Modified: trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java?rev=8640&r1=8639&r2=8640&view=diff
==============================================================================
--- trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java	(original)
+++ trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java	Fri Mar  3 09:14:32 2017
@@ -35,6 +35,7 @@
 import net.shibboleth.idp.saml.xmlobject.Scope;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
 import net.shibboleth.utilities.java.support.xml.XMLConstants;
 
 import org.opensaml.core.xml.LangBearing;
@@ -339,7 +340,7 @@
         writeNameSpace(XMLConstants.XML_PREFIX, XMLConstants.XML_NS);
         writeNameSpace(SAMLConstants.SAML20MDUI_PREFIX, SAMLConstants.SAML20MDUI_NS);
 
-        writer.write(" validUntil=\"2001-01-02T13:14:15Z\"");
+        writer.write(" validUntil=\"" + DOMTypeSupport.longToDateTime(System.currentTimeMillis()) + "\"");
         
         writer.write(" entityID=\"");
         writer.write(getEntityID());

Modified: trunk/idp-installer/src/test/java/net/shibboleth/idp/installer/TestMetadataGenerator.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/test/java/net/shibboleth/idp/installer/TestMetadataGenerator.java?rev=8640&r1=8639&r2=8640&view=diff
==============================================================================
--- trunk/idp-installer/src/test/java/net/shibboleth/idp/installer/TestMetadataGenerator.java	(original)
+++ trunk/idp-installer/src/test/java/net/shibboleth/idp/installer/TestMetadataGenerator.java	Fri Mar  3 09:14:32 2017
@@ -28,6 +28,7 @@
 import net.shibboleth.idp.installer.ant.MetadataGeneratorTask;
 import net.shibboleth.utilities.java.support.xml.XMLParserException;
 
+import org.joda.time.DateTime;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.XMLObjectBaseTestCase;
 import org.opensaml.saml.common.xml.SAMLConstants;
@@ -62,6 +63,12 @@
             task.execute();
 
             final EntityDescriptor entity = (EntityDescriptor) unmarshallElement(out.getAbsolutePath());
+            
+            final DateTime validUntil = entity.getValidUntil();
+            Assert.assertTrue(validUntil.isBefore(1000 + System.currentTimeMillis()));
+            Assert.assertTrue(validUntil.isAfter(System.currentTimeMillis()-1000));
+            
+            
             final IDPSSODescriptor idpsso = entity.getIDPSSODescriptor(SAMLConstants.SAML20P_NS);
             Assert.assertNotNull(idpsso);
             Assert.assertSame(entity.getIDPSSODescriptor(SAMLConstants.SAML11P_NS), idpsso);
@@ -130,14 +137,14 @@
 
     /** Version to look at the filesystem of {@inheritDoc} */
     @Override
-    protected Document parseXMLDocument(String xmlFilename) throws XMLParserException {
+    protected Document parseXMLDocument(final String xmlFilename) throws XMLParserException {
         InputStream is;
         try {
             is = new BufferedInputStream(new FileInputStream(new File(xmlFilename)));
-        } catch (FileNotFoundException e) {
+        } catch (final FileNotFoundException e) {
            throw new XMLParserException(e);
         }
-        Document doc = parserPool.parse(is);
+        final Document doc = parserPool.parse(is);
         return doc;
         }
 }