Merge pull request #516 from sigstore/fix-valid-for

Update ValidFor for endpoint inclusion

Author: loosebazooka

sigstore-java/src/main/java/dev/sigstore/trustroot/ValidFor.java

@@ -27,14 +27,15 @@ public abstract class ValidFor {
 
   public abstract Optional<Instant> getEnd();
 
+  /** Check if an instant of time is contained within the validity range including the endpoints. */
   public boolean contains(Instant instant) {
-    if (!getStart().isBefore(instant)) {
+    if (instant.isBefore(getStart())) {
       return false;
     }
-    if (getEnd().isEmpty() || getEnd().get().isAfter(instant)) {
+    if (getEnd().isEmpty()) {
       return true;
     }
-    return false;
+    return !instant.isAfter(getEnd().get());
   }
 
   public static ValidFor from(TimeRange proto) {

sigstore-java/src/test/java/dev/sigstore/trustroot/ValidForTest.java

@@ -31,11 +31,11 @@ public void contains_withStartAndEnd() {
     Assertions.assertTrue(range.contains(Instant.now()));
 
     Assertions.assertTrue(range.contains(start.plus(10, ChronoUnit.SECONDS)));
-    Assertions.assertFalse(range.contains(start));
+    Assertions.assertTrue(range.contains(start));
     Assertions.assertFalse(range.contains(start.minus(10, ChronoUnit.SECONDS)));
 
     Assertions.assertTrue(range.contains(end.minus(10, ChronoUnit.SECONDS)));
-    Assertions.assertFalse(range.contains(end));
+    Assertions.assertTrue(range.contains(end));
     Assertions.assertFalse(range.contains(end.plus(10, ChronoUnit.SECONDS)));
   }
 
@@ -47,7 +47,7 @@ public void contains_withNoEnd() {
     Assertions.assertTrue(range.contains(Instant.now().plus(10, ChronoUnit.SECONDS)));
 
     Assertions.assertTrue(range.contains(start.plus(10, ChronoUnit.SECONDS)));
-    Assertions.assertFalse(range.contains(start));
+    Assertions.assertTrue(range.contains(start));
     Assertions.assertFalse(range.contains(start.minus(10, ChronoUnit.SECONDS)));
   }
 }