[jboss-cvs] JBossAS SVN: r86555 - in projects/security/security-xacml/trunk: jboss-sunxacml/src/test/java/org/jboss/test/security/sunxacml/attr and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 31 18:19:10 EDT 2009
Author: anil.saldhana at jboss.com
Date: 2009-03-31 18:19:10 -0400 (Tue, 31 Mar 2009)
New Revision: 86555
Added:
projects/security/security-xacml/trunk/jboss-sunxacml/src/test/java/org/jboss/test/security/sunxacml/attr/TimeAttributeUnitTestCase.java
Modified:
projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/attr/TimeAttribute.java
projects/security/security-xacml/trunk/jboss-xacml/src/test/resources/test/config/himss09-interop-config.xml
Log:
SECURITY-405: TimeAttribute bug
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/attr/TimeAttribute.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/attr/TimeAttribute.java 2009-03-31 22:11:55 UTC (rev 86554)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/attr/TimeAttribute.java 2009-03-31 22:19:10 UTC (rev 86555)
@@ -215,10 +215,15 @@
// Check that the date is normalized to 1/1/70
if ((timeGMT >= DateAttribute.MILLIS_PER_DAY) || (timeGMT < 0)) {
+ long div = timeGMT / DateAttribute.MILLIS_PER_DAY;
timeGMT = timeGMT % DateAttribute.MILLIS_PER_DAY;
+
+ //SECURITY-405
+ if(div == 1)
+ timeGMT += DateAttribute.MILLIS_PER_DAY;
// if we had a negative value then we need to shift by a day
- if (timeGMT < 0)
+ if (timeGMT < 0)
timeGMT += DateAttribute.MILLIS_PER_DAY;
}
}
@@ -253,7 +258,7 @@
// DateTimeAttribute parsing code.
value = "1970-01-01T" + value;
-
+
DateTimeAttribute dateTime = DateTimeAttribute.getInstance(value);
// if there was no explicit TZ provided, then we want to make sure
Added: projects/security/security-xacml/trunk/jboss-sunxacml/src/test/java/org/jboss/test/security/sunxacml/attr/TimeAttributeUnitTestCase.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/test/java/org/jboss/test/security/sunxacml/attr/TimeAttributeUnitTestCase.java (rev 0)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/test/java/org/jboss/test/security/sunxacml/attr/TimeAttributeUnitTestCase.java 2009-03-31 22:19:10 UTC (rev 86555)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.security.sunxacml.attr;
+
+import java.util.Date;
+
+import junit.framework.TestCase;
+
+import org.jboss.security.xacml.sunxacml.attr.TimeAttribute;
+
+/**
+ * Unit tests for the Time Attribute
+ * @author Anil.Saldhana at redhat.com
+ * @since Mar 30, 2009
+ */
+public class TimeAttributeUnitTestCase extends TestCase
+{
+ public void testTime() throws Exception
+ {
+ TimeAttribute end = TimeAttribute.getInstance("23:59:00-08:00");
+ TimeAttribute now = TimeAttribute.getInstance("16:50:07.091000000-05:00");
+
+ Date nowDate = now.getValue();
+ Date endDate = end.getValue();
+
+ assertTrue("4:50 PM CDT is before 11:59 PDT", nowDate.before(endDate));
+
+ end = TimeAttribute.getInstance("01:59:00-08:00");
+ now = TimeAttribute.getInstance("03:59:00-06:00");
+
+ nowDate = now.getValue();
+ endDate = end.getValue();
+
+ assertFalse("03:59 central is not before 01:59 PDT", nowDate.before(endDate) );
+
+ end = TimeAttribute.getInstance("03:59:00-08:00");
+ now = TimeAttribute.getInstance("03:59:00-08:00");
+
+ nowDate = now.getValue();
+ endDate = end.getValue();
+
+ assertFalse("03:59 PDT is not before 03:59 PDT", nowDate.before(endDate) );
+ }
+}
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/test/resources/test/config/himss09-interop-config.xml
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/test/resources/test/config/himss09-interop-config.xml 2009-03-31 22:11:55 UTC (rev 86554)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/test/resources/test/config/himss09-interop-config.xml 2009-03-31 22:19:10 UTC (rev 86555)
@@ -1,11 +1,11 @@
<ns:jbosspdp xmlns:ns="urn:jboss:xacml:2.0">
<ns:Policies>
<ns:PolicySet>
- <ns:Location>test/policies/interop/himss09/himss-policy.xml</ns:Location>
+ <ns:Location>test/policies/interop/himss09/himss-policy-01.xml</ns:Location>
</ns:PolicySet>
</ns:Policies>
<ns:Locators>
- <ns:Locator Name="org.jboss.security.xacml.locators.JBossPolicyLocator">
+ <ns:Locator Name="org.jboss.security.xacml.locators.JBossPolicySetLocator">
</ns:Locator>
</ns:Locators>
</ns:jbosspdp>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list