Author: anil.saldhana(a)jboss.com
Date: 2009-06-03 18:23:07 -0400 (Wed, 03 Jun 2009)
New Revision: 571
Modified:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/AssertionUtil.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/XMLTimeUtil.java
identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/util/XMLTimeUtilUnitTestCase.java
Log:
xml util logging and test
Modified:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/AssertionUtil.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/AssertionUtil.java 2009-06-03
17:30:11 UTC (rev 570)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/AssertionUtil.java 2009-06-03
22:23:07 UTC (rev 571)
@@ -23,6 +23,7 @@
import javax.xml.datatype.XMLGregorianCalendar;
+import org.apache.log4j.Logger;
import org.jboss.identity.federation.core.exceptions.ConfigurationException;
import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
import
org.jboss.identity.federation.core.saml.v2.exceptions.IssueInstantMissingException;
@@ -39,6 +40,8 @@
*/
public class AssertionUtil
{
+ private static Logger log = Logger.getLogger(AssertionUtil.class);
+
/**
* Create an assertion
* @param id
@@ -87,8 +90,12 @@
ConditionsType conditionsType = assertion.getConditions();
if(conditionsType != null)
{
- return !XMLTimeUtil.isValid(XMLTimeUtil.getIssueInstant(),
- conditionsType.getNotBefore(), conditionsType.getNotOnOrAfter());
+ XMLGregorianCalendar now = XMLTimeUtil.getIssueInstant();
+ XMLGregorianCalendar notBefore = conditionsType.getNotBefore();
+ XMLGregorianCalendar notOnOrAfter = conditionsType.getNotOnOrAfter();
+ log.trace("Now="+now.toXMLFormat() + "
::notBefore="+notBefore.toXMLFormat()
+ + "::notOnOrAfter="+notOnOrAfter);
+ return !XMLTimeUtil.isValid(now, notBefore, notOnOrAfter);
}
//TODO: if conditions do not exist, assume the assertion to be everlasting?
return false;
Modified:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/XMLTimeUtil.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/XMLTimeUtil.java 2009-06-03
17:30:11 UTC (rev 570)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/XMLTimeUtil.java 2009-06-03
22:23:07 UTC (rev 571)
@@ -122,7 +122,7 @@
public static long inMilis(int valueInMins)
{
return valueInMins * 60 * 1000;
- }
+ }
/**
* Validate that the current time falls between the two boundaries
Modified:
identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/util/XMLTimeUtilUnitTestCase.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/util/XMLTimeUtilUnitTestCase.java 2009-06-03
17:30:11 UTC (rev 570)
+++
identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/util/XMLTimeUtilUnitTestCase.java 2009-06-03
22:23:07 UTC (rev 571)
@@ -25,6 +25,7 @@
import java.util.GregorianCalendar;
import javax.xml.datatype.DatatypeConstants;
+import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
import org.jboss.identity.federation.core.saml.v2.util.XMLTimeUtil;
@@ -38,6 +39,15 @@
*/
public class XMLTimeUtilUnitTestCase extends TestCase
{
+ public void testCompareViaParsing() throws Exception
+ {
+ DatatypeFactory dt = DatatypeFactory.newInstance();
+ XMLGregorianCalendar now =
dt.newXMLGregorianCalendar("2009-06-03T17:42:09.322-04:00");
+ XMLGregorianCalendar notBefore =
dt.newXMLGregorianCalendar("2009-06-03T17:42:05.901-04:00");
+ XMLGregorianCalendar notOnOrAfter =
dt.newXMLGregorianCalendar("2009-06-03T17:47:05.901-04:00");
+ assertTrue(XMLTimeUtil.isValid(now, notBefore, notOnOrAfter));
+ }
+
public void testAdd() throws Exception
{
XMLGregorianCalendar now = XMLTimeUtil.getIssueInstant();