[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile: saml1/Idp...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Jun 21 19:33:21 2013
New Revision: 4538

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4538&view=rev
Log:
Properly handle long to DateTime conversion in IdP-initiated decoders when time param wasn't present.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/IdpInitiatedSsoRequestMessageDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/IdpInitiatedSsoRequestMessageDecoder.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/IdpInitiatedSsoRequestMessageDecoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/IdpInitiatedSsoRequestMessageDecoder.java?rev=4538&r1=4537&r2=4538&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/IdpInitiatedSsoRequestMessageDecoder.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/IdpInitiatedSsoRequestMessageDecoder.java Fri Jun 21 19:33:21 2013
@@ -56,7 +56,11 @@
         messageContext.getSubcontext(SamlPeerEntityContext.class, true).setEntityId(ssoRequest.getEntityId());
         
         SamlMessageInfoContext msgInfoContext = messageContext.getSubcontext(SamlMessageInfoContext.class, true);
-        msgInfoContext.setMessageIssueInstant(new DateTime(ssoRequest.getTime(), ISOChronology.getInstanceUTC()));
+        if (ssoRequest.getTime() > 0) {
+            msgInfoContext.setMessageIssueInstant(new DateTime(ssoRequest.getTime(), ISOChronology.getInstanceUTC()));
+        } else {
+            msgInfoContext.setMessageIssueInstant(new DateTime(ISOChronology.getInstanceUTC()));
+        }
         msgInfoContext.setMessageId(getMessageID());
         
         populateBindingContext(messageContext);

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/IdpInitiatedSsoRequestMessageDecoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/IdpInitiatedSsoRequestMessageDecoder.java?rev=4538&r1=4537&r2=4538&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/IdpInitiatedSsoRequestMessageDecoder.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/IdpInitiatedSsoRequestMessageDecoder.java Fri Jun 21 19:33:21 2013
@@ -113,7 +113,11 @@
         // and dynamically resolved ACS URL if not in the request? The latter we might not do in the decoder.
         
         authnRequest.setAssertionConsumerServiceURL(ssoRequest.getAcsUrl());
-        authnRequest.setIssueInstant(new DateTime(ssoRequest.getTime(), ISOChronology.getInstanceUTC()));
+        if (ssoRequest.getTime() > 0) {
+            authnRequest.setIssueInstant(new DateTime(ssoRequest.getTime(), ISOChronology.getInstanceUTC()));
+        } else {
+            authnRequest.setIssueInstant(new DateTime(ISOChronology.getInstanceUTC()));
+        }
         authnRequest.setVersion(SAMLVersion.VERSION_20);
         authnRequest.setID(getMessageID());