fix: time validation to support RFC 3339

Author: Sascha Goldhofer

lib/validation/format.ts

@@ -17,7 +17,8 @@ const isValidIPV6 =
 const isValidHostname =
     /^(?=.{1,255}$)[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?(?:\.[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?)*\.?$/;
 const matchDate = /^(\d\d\d\d)-(\d\d)-(\d\d)$/;
-const matchTime = /^(\d\d):(\d\d):(\d\d)(\.\d+)?(z|[+-]\d\d(?::?\d\d)?)?$/i;
+// const matchTime = /^(\d\d):(\d\d):(\d\d)(\.\d+)?(z|[+-]\d\d(?::?\d\d)?)?$/i;
+const matchTime = /^(?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d(?::?\d\d)?)?$/i;
 const DAYS = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 
 const isValidJsonPointer = /^(?:\/(?:[^~/]|~0|~1)*)*$/;
@@ -175,27 +176,31 @@ const formatValidators: Record<
         return errors.formatRegExError({ value, pointer, schema });
     },
 
+    // hh:mm:ss.sTZD
+    // https://opis.io/json-schema/2.x/formats.html
+    // regex https://www.oreilly.com/library/view/regular-expressions-cookbook/9781449327453/ch04s07.html
     time: (draft, schema, value, pointer) => {
         if (typeof value !== "string" || value === "") {
             return undefined;
         }
         // https://github.com/cfworker/cfworker/blob/main/packages/json-schema/src/format.ts
         const matches = value.match(matchTime);
-        if (!matches) {
-            return errors.formatDateTimeError({ value, pointer, schema });
-        }
-        const hour = +matches[1];
-        const minute = +matches[2];
-        const second = +matches[3];
-        const timeZone = !!matches[5];
-        if (
-            ((hour <= 23 && minute <= 59 && second <= 59) ||
-                (hour == 23 && minute == 59 && second == 60)) &&
-            timeZone
-        ) {
-            return undefined;
-        }
-        return errors.formatTimeError({ value, pointer, schema });
+        return matches ? undefined : errors.formatDateTimeError({ value, pointer, schema });
+        // if (!matches) {
+        //     return errors.formatDateTimeError({ value, pointer, schema });
+        // }
+        // const hour = +matches[1];
+        // const minute = +matches[2];
+        // const second = +matches[3];
+        // const timeZone = !!matches[5];
+        // if (
+        //     ((hour <= 23 && minute <= 59 && second <= 59) ||
+        //         (hour == 23 && minute == 59 && second == 60)) &&
+        //     timeZone
+        // ) {
+        //     return undefined;
+        // }
+        // return errors.formatTimeError({ value, pointer, schema });
     },
 
     uri: (draft, schema, value, pointer) => {

test/unit/validate.format.test.ts

@@ -6,6 +6,64 @@ describe("validate format", () => {
     let draft: Draft04;
     before(() => (draft = new Draft04()));
 
+    describe("time", () => {
+        it("should validate HH:mm:ss", () => {
+            const errors = validate(draft, "15:31:12", {
+                type: "string",
+                format: "time"
+            });
+            assert.deepEqual(errors, []);
+        });
+
+        it("should validate HH:mm:ss.s", () => {
+            const errors = validate(draft, "15:31:12.99", {
+                type: "string",
+                format: "time"
+            });
+            assert.deepEqual(errors, []);
+        });
+
+        it("should validate HH:mm:ss-HH:mm", () => {
+            const errors = validate(draft, "15:31:12-02:30", {
+                type: "string",
+                format: "time"
+            });
+            assert.deepEqual(errors, []);
+        });
+
+        it("should validate HH:mm:ssZ", () => {
+            const errors = validate(draft, "15:31:12Z", {
+                type: "string",
+                format: "time"
+            });
+            assert.deepEqual(errors, []);
+        });
+
+        it("should not validate minutes above 59", () => {
+            const errors = validate(draft, "15:60:12", {
+                type: "string",
+                format: "time"
+            });
+            assert.equal(errors.length, 1);
+        });
+
+        it("should not validate seconds above 59", () => {
+            const errors = validate(draft, "15:31:60", {
+                type: "string",
+                format: "time"
+            });
+            assert.equal(errors.length, 1);
+        });
+
+        it("should not validate HH:mm", () => {
+            const errors = validate(draft, "15:31", {
+                type: "string",
+                format: "time"
+            });
+            assert.equal(errors.length, 1);
+        });
+    });
+
     describe("url", () => {
         it("should validate format url", () => {
             const errors = validate(draft, "https://developer.mozilla.org/en-US/", {