@aws-sdk/cloudfront-signer 3.813.0 → 3.858.0

package/dist-cjs/index.js

@@ -68,9 +68,10 @@ function getSignedUrl({
     }
     baseUrl = resources[0].replace("*://", "https://");
   }
-  const newURL = new URL(baseUrl);
-  newURL.search = Array.from(newURL.searchParams.entries()).concat(Object.entries(cloudfrontSignBuilder.createCloudfrontAttribute())).filter(([, value]) => value !== void 0).map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`).join("&");
-  return getResource(newURL);
+  const startFlag = baseUrl.includes("?") ? "&" : "?";
+  const params = Object.entries(cloudfrontSignBuilder.createCloudfrontAttribute()).filter(([, value]) => value !== void 0).map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`).join("&");
+  const urlString = baseUrl + startFlag + params;
+  return getResource(urlString);
 }
 __name(getSignedUrl, "getSignedUrl");
 function getSignedCookies({
@@ -117,15 +118,18 @@ function getPolicyResources(policy) {
   return (parsedPolicy?.Statement ?? []).map((s) => s.Resource);
 }
 __name(getPolicyResources, "getPolicyResources");
-function getResource(url) {
-  switch (url.protocol) {
+function getResource(urlString) {
+  const protocol = urlString.slice(0, urlString.indexOf("//"));
+  switch (protocol) {
     case "http:":
     case "https:":
     case "ws:":
     case "wss:":
-      return url.toString();
+      return urlString;
     case "rtmp:":
-      return url.pathname.replace(/^\//, "") + url.search + url.hash;
+      const url = new URL(urlString);
+      const origin = `${protocol}//${url.hostname}`;
+      return urlString.substring(origin.length).replace(/(?::\d+)?\//, "");
     default:
       throw new Error("Invalid URI scheme. Scheme must be one of http, https, or rtmp");
   }
@@ -269,7 +273,7 @@ var CloudfrontSignBuilder = class {
     if (!url || !dateLessThan) {
       return false;
     }
-    const resource = getResource(new URL(url));
+    const resource = getResource(url);
     const parsedDates = this.parseDateWindow(dateLessThan, dateGreaterThan);
     this.dateLessThan = parsedDates.dateLessThan;
     this.customPolicy = Boolean(parsedDates.dateGreaterThan) || Boolean(ipAddress);

package/dist-es/sign.js

@@ -30,13 +30,13 @@ export function getSignedUrl({ dateLessThan, dateGreaterThan, url, keyPairId, pr
         }
         baseUrl = resources[0].replace("*://", "https://");
     }
-    const newURL = new URL(baseUrl);
-    newURL.search = Array.from(newURL.searchParams.entries())
-        .concat(Object.entries(cloudfrontSignBuilder.createCloudfrontAttribute()))
+    const startFlag = baseUrl.includes("?") ? "&" : "?";
+    const params = Object.entries(cloudfrontSignBuilder.createCloudfrontAttribute())
         .filter(([, value]) => value !== undefined)
         .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
         .join("&");
-    return getResource(newURL);
+    const urlString = baseUrl + startFlag + params;
+    return getResource(urlString);
 }
 export function getSignedCookies({ ipAddress, url, privateKey, keyPairId, dateLessThan, dateGreaterThan, policy, passphrase, }) {
     const cloudfrontSignBuilder = new CloudfrontSignBuilder({
@@ -72,15 +72,18 @@ function getPolicyResources(policy) {
     const parsedPolicy = typeof policy === "string" ? JSON.parse(policy) : policy;
     return (parsedPolicy?.Statement ?? []).map((s) => s.Resource);
 }
-function getResource(url) {
-    switch (url.protocol) {
+function getResource(urlString) {
+    const protocol = urlString.slice(0, urlString.indexOf("//"));
+    switch (protocol) {
         case "http:":
         case "https:":
         case "ws:":
         case "wss:":
-            return url.toString();
+            return urlString;
         case "rtmp:":
-            return url.pathname.replace(/^\//, "") + url.search + url.hash;
+            const url = new URL(urlString);
+            const origin = `${protocol}//${url.hostname}`;
+            return urlString.substring(origin.length).replace(/(?::\d+)?\//, "");
         default:
             throw new Error("Invalid URI scheme. Scheme must be one of http, https, or rtmp");
     }
@@ -217,7 +220,7 @@ class CloudfrontSignBuilder {
         if (!url || !dateLessThan) {
             return false;
         }
-        const resource = getResource(new URL(url));
+        const resource = getResource(url);
         const parsedDates = this.parseDateWindow(dateLessThan, dateGreaterThan);
         this.dateLessThan = parsedDates.dateLessThan;
         this.customPolicy = Boolean(parsedDates.dateGreaterThan) || Boolean(ipAddress);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/cloudfront-signer",
-  "version": "3.813.0",
+  "version": "3.858.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline cloudfront-signer",
@@ -22,7 +22,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@smithy/url-parser": "^4.0.2",
+    "@smithy/url-parser": "^4.0.4",
     "tslib": "^2.6.2"
   },
   "files": [