[java-idp-testbed] branch master updated: JSPT-79 - Review date and time handling for Java 8

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-idp-testbed.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-testbed.git;a=commit;h=4f04d5c1ec49a70587f4edc73e57aa776925c73b

The following commit(s) were added to refs/heads/master by this push:
       new  4f04d5c   JSPT-79 - Review date and time handling for Java 8
4f04d5c is described below

commit 4f04d5c1ec49a70587f4edc73e57aa776925c73b
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Mar 1 13:10:45 2019 -0500

    JSPT-79 - Review date and time handling for Java 8
    
    https://issues.shibboleth.net/jira/browse/JSPT-79
---
 src/main/java/sp/SAML1Controller.java |  6 +++---
 src/main/java/sp/SAML2Controller.java | 16 ++++++----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/main/java/sp/SAML1Controller.java b/src/main/java/sp/SAML1Controller.java
index 5d532fb..e8150dd 100644
--- a/src/main/java/sp/SAML1Controller.java
+++ b/src/main/java/sp/SAML1Controller.java
@@ -22,6 +22,7 @@ import java.security.KeyStore;
 import java.security.PrivateKey;
 import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
+import java.time.Instant;
 import java.util.Map;
 
 import javax.annotation.Nonnull;
@@ -42,7 +43,6 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.cryptacular.util.CertUtil;
 import org.cryptacular.util.KeyPairUtil;
-import org.joda.time.DateTime;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.core.xml.io.MarshallingException;
@@ -223,7 +223,7 @@ public class SAML1Controller extends BaseSAMLController {
         final Subject subject = buildSubject(principalName);
 
         final Request attributeQuery = buildAttributeQueryRequest(subject);
-        attributeQuery.setIssueInstant(new DateTime());
+        attributeQuery.setIssueInstant(Instant.now());
         attributeQuery.setID(new SecureRandomIdentifierGenerationStrategy().generateIdentifier());
         attributeQuery.getAttributeQuery().setResource(getSpEntityId(servletRequest));
 
@@ -281,7 +281,7 @@ public class SAML1Controller extends BaseSAMLController {
                         Request.DEFAULT_ELEMENT_NAME);
         final Request request = requestBuilder.buildObject();
         request.setID(new SecureRandomIdentifierGenerationStrategy().generateIdentifier());
-        request.setIssueInstant(new DateTime(0));
+        request.setIssueInstant(Instant.now());
         request.setQuery(query);
         request.setVersion(SAMLVersion.VERSION_11);
 
diff --git a/src/main/java/sp/SAML2Controller.java b/src/main/java/sp/SAML2Controller.java
index a438d2e..59e9a65 100644
--- a/src/main/java/sp/SAML2Controller.java
+++ b/src/main/java/sp/SAML2Controller.java
@@ -6,6 +6,7 @@ import java.security.KeyStore;
 import java.security.PrivateKey;
 import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
+import java.time.Instant;
 import java.util.Map;
 
 import javax.annotation.Nonnull;
@@ -29,7 +30,6 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.cryptacular.util.CertUtil;
 import org.cryptacular.util.KeyPairUtil;
-import org.joda.time.DateTime;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.core.xml.io.MarshallingException;
@@ -485,7 +485,7 @@ public class SAML2Controller extends BaseSAMLController {
 		        AuthnRequest.DEFAULT_ELEMENT_NAME).buildObject(AuthnRequest.DEFAULT_ELEMENT_NAME);
 		
 		authnRequest.setID(idGenerator.generateIdentifier());
-		authnRequest.setIssueInstant(new DateTime());
+		authnRequest.setIssueInstant(Instant.now());
 		authnRequest.setAssertionConsumerServiceURL(getAcsUrl(servletRequest));
 		authnRequest.setProtocolBinding(SAMLConstants.SAML2_POST_BINDING_URI);
 		
@@ -547,7 +547,7 @@ public class SAML2Controller extends BaseSAMLController {
                 LogoutRequest.DEFAULT_ELEMENT_NAME).buildObject(LogoutRequest.DEFAULT_ELEMENT_NAME);
         
         logoutRequest.setID(idGenerator.generateIdentifier());
-        logoutRequest.setIssueInstant(new DateTime());
+        logoutRequest.setIssueInstant(Instant.now());
         
         final Issuer issuer = (Issuer) builderFactory.getBuilder(
                 Issuer.DEFAULT_ELEMENT_NAME).buildObject(Issuer.DEFAULT_ELEMENT_NAME);
@@ -569,7 +569,7 @@ public class SAML2Controller extends BaseSAMLController {
                 LogoutResponse.DEFAULT_ELEMENT_NAME).buildObject(LogoutResponse.DEFAULT_ELEMENT_NAME);
         
         logoutResponse.setID(idGenerator.generateIdentifier());
-        logoutResponse.setIssueInstant(new DateTime());
+        logoutResponse.setIssueInstant(Instant.now());
         
         final Issuer issuer = (Issuer) builderFactory.getBuilder(Issuer.DEFAULT_ELEMENT_NAME).buildObject(Issuer.DEFAULT_ELEMENT_NAME);
         issuer.setValue(getSpEntityId(servletRequest));
@@ -883,7 +883,7 @@ public class SAML2Controller extends BaseSAMLController {
         final Subject subject = buildSubject(principalName);
 
         final AttributeQuery attributeQuery = buildAttributeQueryRequest(subject);
-        attributeQuery.setIssueInstant(new DateTime());
+        attributeQuery.setIssueInstant(Instant.now());
         attributeQuery.setID(new SecureRandomIdentifierGenerationStrategy().generateIdentifier());
         attributeQuery.setIssuer(buildIssuer(getSpEntityId(servletRequest)));
 
@@ -954,16 +954,12 @@ public class SAML2Controller extends BaseSAMLController {
      * @return the built query
      */
     @Nonnull public static AttributeQuery buildAttributeQueryRequest(final @Nullable Subject subject) {
-        final SAMLObjectBuilder<Issuer> issuerBuilder = (SAMLObjectBuilder<Issuer>)
-                XMLObjectProviderRegistrySupport.getBuilderFactory().<Issuer>getBuilderOrThrow(
-                        Issuer.DEFAULT_ELEMENT_NAME);
-
         final SAMLObjectBuilder<AttributeQuery> queryBuilder = (SAMLObjectBuilder<AttributeQuery>)
                 XMLObjectProviderRegistrySupport.getBuilderFactory().<AttributeQuery>getBuilderOrThrow(
                         AttributeQuery.DEFAULT_ELEMENT_NAME);
 
         final AttributeQuery query = queryBuilder.buildObject();
-        query.setIssueInstant(new DateTime(0));
+        query.setIssueInstant(Instant.now());
         query.setVersion(SAMLVersion.VERSION_20);
 
         if (subject != null) {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.