Skip to content

Commit f404a2a

Browse files
Handle date equality when checking for saml assertion validity
1 parent 5e36559 commit f404a2a

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

cas-client-core/src/main/java/org/jasig/cas/client/validation/AssertionImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ public boolean isValid() {
133133
}
134134

135135
final Date now = new Date();
136-
return this.validFromDate.before(now) && (this.validUntilDate == null || this.validUntilDate.after(now));
136+
return (this.validFromDate.before(now) || this.validFromDate.equals(now))
137+
&& (this.validUntilDate == null || this.validUntilDate.after(now) || this.validUntilDate.equals(now));
137138
}
138139
}

cas-client-core/src/test/java/org/jasig/cas/client/validation/AssertionImplTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
package org.jasig.cas.client.validation;
2020

21+
import java.util.Date;
2122
import java.util.HashMap;
2223
import java.util.Map;
2324
import junit.framework.TestCase;
@@ -50,7 +51,7 @@ public void testPrincipalConstructor() {
5051
}
5152

5253
public void testAssertionValidity() throws Exception {
53-
final Assertion assertion = new AssertionImpl(CONST_PRINCIPAL, CONST_ATTRIBUTES);
54+
final Assertion assertion = new AssertionImpl(CONST_PRINCIPAL, new Date(), new Date(), new Date(), CONST_ATTRIBUTES);
5455
assertTrue(assertion.isValid());
5556
}
5657

0 commit comments

Comments
 (0)