@aws-sdk/cloudfront-signer 3.1036.0 → 3.1048.0

package/dist-cjs/index.js

@@ -39,17 +39,7 @@ function getSignedUrl({ dateLessThan, dateGreaterThan, url, keyPairId, privateKe
         .filter(([, value]) => value !== undefined)
         .map(([key, value]) => `${protocols.extendedEncodeURIComponent(key)}=${protocols.extendedEncodeURIComponent(value)}`)
         .join("&");
-    function encodeBaseUrlQuery(url) {
-        if (url.includes("?")) {
-            const [hostAndPath, query] = url.split("?");
-            const params = [...new URLSearchParams(query).entries()]
-                .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
-                .join("&");
-            return `${hostAndPath}?${params}`;
-        }
-        return url;
-    }
-    const urlString = encodeBaseUrlQuery(baseUrl) + startFlag + params;
+    const urlString = encodeUrlPath(baseUrl) + startFlag + params;
     return getResource(urlString);
 }
 function getSignedCookies({ ipAddress, url, privateKey, keyPairId, dateLessThan, dateGreaterThan, policy, passphrase, }) {
@@ -82,6 +72,37 @@ function getSignedCookies({ ipAddress, url, privateKey, keyPairId, dateLessThan,
     }
     return cookies;
 }
+function encodeUrlPath(url) {
+    const protocolEnd = url.indexOf("//");
+    if (protocolEnd === -1) {
+        return url;
+    }
+    const authorityStart = protocolEnd + 2;
+    const pathStart = url.indexOf("/", authorityStart);
+    if (pathStart === -1) {
+        return url;
+    }
+    const origin = url.slice(0, pathStart);
+    const rest = url.slice(pathStart);
+    const queryIndex = rest.indexOf("?");
+    const rawPath = queryIndex === -1 ? rest : rest.slice(0, queryIndex);
+    const rawQuery = queryIndex === -1 ? "" : rest.slice(queryIndex);
+    const encodedPath = rawPath.replace(/[^/]+/g, (segment) => {
+        try {
+            return encodeURIComponent(decodeURIComponent(segment));
+        }
+        catch {
+            return encodeURIComponent(segment);
+        }
+    });
+    let encodedQuery = "";
+    if (rawQuery) {
+        for (const [key, value] of new URLSearchParams(rawQuery.slice(1)).entries()) {
+            encodedQuery += `${encodedQuery ? "&" : "?"}${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
+        }
+    }
+    return origin + encodedPath + encodedQuery;
+}
 function getPolicyResources(policy) {
     const parsedPolicy = typeof policy === "string" ? JSON.parse(policy) : policy;
     return (parsedPolicy?.Statement ?? []).map((s) => s.Resource);

package/dist-es/sign.js

@@ -36,17 +36,7 @@ export function getSignedUrl({ dateLessThan, dateGreaterThan, url, keyPairId, pr
         .filter(([, value]) => value !== undefined)
         .map(([key, value]) => `${extendedEncodeURIComponent(key)}=${extendedEncodeURIComponent(value)}`)
         .join("&");
-    function encodeBaseUrlQuery(url) {
-        if (url.includes("?")) {
-            const [hostAndPath, query] = url.split("?");
-            const params = [...new URLSearchParams(query).entries()]
-                .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
-                .join("&");
-            return `${hostAndPath}?${params}`;
-        }
-        return url;
-    }
-    const urlString = encodeBaseUrlQuery(baseUrl) + startFlag + params;
+    const urlString = encodeUrlPath(baseUrl) + startFlag + params;
     return getResource(urlString);
 }
 export function getSignedCookies({ ipAddress, url, privateKey, keyPairId, dateLessThan, dateGreaterThan, policy, passphrase, }) {
@@ -79,6 +69,37 @@ export function getSignedCookies({ ipAddress, url, privateKey, keyPairId, dateLe
     }
     return cookies;
 }
+function encodeUrlPath(url) {
+    const protocolEnd = url.indexOf("//");
+    if (protocolEnd === -1) {
+        return url;
+    }
+    const authorityStart = protocolEnd + 2;
+    const pathStart = url.indexOf("/", authorityStart);
+    if (pathStart === -1) {
+        return url;
+    }
+    const origin = url.slice(0, pathStart);
+    const rest = url.slice(pathStart);
+    const queryIndex = rest.indexOf("?");
+    const rawPath = queryIndex === -1 ? rest : rest.slice(0, queryIndex);
+    const rawQuery = queryIndex === -1 ? "" : rest.slice(queryIndex);
+    const encodedPath = rawPath.replace(/[^/]+/g, (segment) => {
+        try {
+            return encodeURIComponent(decodeURIComponent(segment));
+        }
+        catch {
+            return encodeURIComponent(segment);
+        }
+    });
+    let encodedQuery = "";
+    if (rawQuery) {
+        for (const [key, value] of new URLSearchParams(rawQuery.slice(1)).entries()) {
+            encodedQuery += `${encodedQuery ? "&" : "?"}${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
+        }
+    }
+    return origin + encodedPath + encodedQuery;
+}
 function getPolicyResources(policy) {
     const parsedPolicy = typeof policy === "string" ? JSON.parse(policy) : policy;
     return (parsedPolicy?.Statement ?? []).map((s) => s.Resource);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/cloudfront-signer",
-  "version": "3.1036.0",
+  "version": "3.1048.0",
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
     "build:cjs": "node ../../scripts/compilation/inline cloudfront-signer",
@@ -23,8 +23,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@smithy/core": "^3.23.17",
-    "@smithy/url-parser": "^4.2.14",
+    "@smithy/core": "^3.24.2",
     "tslib": "^2.6.2"
   },
   "files": [