fix(cloudfront-signer): adding testcases to accept number in milliseconds

Author: smilkuri

packages/cloudfront-signer/README.md

@@ -17,7 +17,7 @@ const s3ObjectKey = "private-content/private.jpeg";
 const url = `${cloudfrontDistributionDomain}/${s3ObjectKey}`;
 const privateKey = "CONTENTS-OF-PRIVATE-KEY";
 const keyPairId = "PUBLIC-KEY-ID-OF-CLOUDFRONT-KEY-PAIR";
-const dateLessThan = "2022-01-01"; // any Date constructor compatible
+const dateLessThan = "2022-01-01"; //  accepts string (Date constructor compatible), number (milliseconds since epoch)
 
 const signedUrl = getSignedUrl({
   url,

packages/cloudfront-signer/src/sign.spec.ts

@@ -7,18 +7,9 @@ import { getSignedCookies, getSignedUrl } from "./index";
 const url = "https://d111111abcdef8.cloudfront.net/private-content/private.jpeg";
 const keyPairId = "APKAEIBAERJR2EXAMPLE";
 const dateLessThan = "2020-01-01";
-const epochDateLessThan = Math.round(
-  (typeof dateLessThan === "string" && /^\d+$/.test(dateLessThan)
-    ? Number(dateLessThan)
-    : new Date(dateLessThan).getTime()) / 1000
-);
+const epochDateLessThan = Math.round(new Date(dateLessThan).getTime() / 1000);
 const dateGreaterThan = "2019-12-01";
-const epochDateGreaterThan = Math.round(
-  (typeof dateGreaterThan === "string" && /^\d+$/.test(dateGreaterThan)
-    ? Number(dateGreaterThan)
-    : new Date(dateGreaterThan).getTime()) / 1000
-);
-
+const epochDateGreaterThan = Math.round(new Date(dateGreaterThan).getTime() / 1000);
 const ipAddress = "10.0.0.0";
 const privateKey = Buffer.from(`
 -----BEGIN RSA PRIVATE KEY-----
@@ -613,3 +604,49 @@ describe("getSignedCookies", () => {
     expect(verifySignature(denormalizeBase64(result["CloudFront-Signature"]), policy)).toBeTruthy();
   });
 });
+
+describe("getSignedUrl- when signing a URL with a date range", () => {
+  const dateString = "2024-05-17";
+  const dateNumber = 1125674245900;
+  it("allows string input compatible with Date constructor", () => {
+    const epochDateLessThan = Math.round(new Date(dateString).getTime() / 1000);
+    const resultUrl = getSignedUrl({
+      url,
+      keyPairId,
+      dateLessThan: dateString,
+      privateKey,
+      passphrase,
+    });
+    const resultCookies = getSignedCookies({
+      url,
+      keyPairId,
+      dateLessThan: dateString,
+      privateKey,
+      passphrase,
+    });
+
+    expect(resultUrl).toContain(`Expires=${epochDateLessThan}`);
+    expect(resultCookies["CloudFront-Expires"]).toBe(epochDateLessThan);
+  });
+
+  it("allows number input in milliseconds compatible with Date constructor", () => {
+    const epochDateLessThan = Math.round(new Date(dateNumber).getTime() / 1000);
+    const resultUrl = getSignedUrl({
+      url,
+      keyPairId,
+      dateLessThan: dateNumber,
+      privateKey,
+      passphrase,
+    });
+    const resultCookies = getSignedCookies({
+      url,
+      keyPairId,
+      dateLessThan: dateNumber,
+      privateKey,
+      passphrase,
+    });
+
+    expect(resultUrl).toContain(`Expires=${epochDateLessThan}`);
+    expect(resultCookies["CloudFront-Expires"]).toBe(epochDateLessThan);
+  });
+});

packages/cloudfront-signer/src/sign.ts

@@ -359,16 +359,11 @@ class CloudfrontSignBuilder {
     return Math.round(date.getTime() / 1000);
   }
 
-  private parseDate(date?: string): number | undefined {
+  private parseDate(date?: string | number | Date): number | undefined {
     if (!date) {
       return undefined;
     }
-    let parsedDate: Date;
-    if (/^\d+$/.test(date)) {
-      parsedDate = new Date(Number(date));
-    } else {
-      parsedDate = new Date(date);
-    }
+    const parsedDate = new Date(date);
     return isNaN(parsedDate.getTime()) ? undefined : this.epochTime(parsedDate);
   }