Adding more tests for invalid dates

jetty · Apr 23, 2024 · 20660bc · 20660bc
1 parent 89f728c
commit 20660bc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpDateTime.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpDateTime.java
@@ -14,6 +14,7 @@
 package org.eclipse.jetty.http;
 
 import java.nio.charset.StandardCharsets;
+import java.time.DateTimeException;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
@@ -219,11 +220,18 @@ else if (token.length() == 4)
             throw new IllegalArgumentException("Invalid [second]: " + datetime);
 
         // RFC 6265 - Section 5.1.1 - Step 6
-        ZonedDateTime dateTime = ZonedDateTime.of(year,
-            month, day, hour, minute, second, 0, UTC);
+        try
+        {
+            ZonedDateTime dateTime = ZonedDateTime.of(year,
+                month, day, hour, minute, second, 0, UTC);
 
-        // RFC 6265 - Section 5.1.1 - Step 7
-        return dateTime;
+            // RFC 6265 - Section 5.1.1 - Step 7
+            return dateTime;
+        }
+        catch (DateTimeException e)
+        {
+            throw new IllegalArgumentException("Invalid date/time: " + datetime, e);
+        }
     }
 
     /**

diff --git a/jetty-core/jetty-http/src/test/java/org/eclipse/jetty/http/HttpDateTimeTest.java b/jetty-core/jetty-http/src/test/java/org/eclipse/jetty/http/HttpDateTimeTest.java
@@ -111,6 +111,7 @@ public static Stream<Arguments> dateTimeInvalid()
 
         // - invalid day
         args.add(Arguments.of("Tue, 00 Apr 2024 17:28:27 GMT", "Invalid [day]"));
+        args.add(Arguments.of("Tue, 31 Feb 2020 17:28:27 GMT", "Invalid date/time"));
         // - long form month
         args.add(Arguments.of("Wed, 22 August 1984 01:02:03 GMT", "Missing [month]"));
         // - no day