@aws-sdk/cloudfront-signer 3.1116.0 → 3.1138.0

package/dist-cjs/index.js

@@ -104,12 +104,32 @@ function encodeUrlPath(url) {
     });
     let encodedQuery = "";
     if (rawQuery) {
-        for (const [key, value] of new URLSearchParams(rawQuery.slice(1)).entries()) {
-            encodedQuery += `${encodedQuery ? "&" : "?"}${encodeURIComponent(key).replace(/'/g, "%27")}=${encodeURIComponent(value).replace(/'/g, "%27")}`;
-        }
+        const pairs = rawQuery
+            .slice(1)
+            .split("&")
+            .filter((p) => p.length > 0)
+            .map((pair) => {
+            const eqIdx = pair.indexOf("=");
+            const rawKey = eqIdx === -1 ? pair : pair.slice(0, eqIdx);
+            const rawValue = eqIdx === -1 ? "" : pair.slice(eqIdx + 1);
+            return `${encodeQueryComponent(rawKey)}=${encodeQueryComponent(rawValue)}`;
+        });
+        encodedQuery = pairs.length > 0 ? `?${pairs.join("&")}` : "";
     }
     return origin + encodedPath + encodedQuery;
 }
+function encodeQueryComponent(component) {
+    const wellFormedComponent = component.replace(/[\uD800-\uDFFF]/gu, "\uFFFD");
+    return wellFormedComponent
+        .split(/(%[0-9A-Fa-f]{2}|\+)/g)
+        .map((part, i) => {
+        if (i % 2 === 1) {
+            return part === "+" ? "+" : part.toUpperCase();
+        }
+        return encodeURIComponent(part).replace(/'/g, "%27");
+    })
+        .join("");
+}
 function getPolicyResources(policy) {
     const parsedPolicy = typeof policy === "string" ? JSON.parse(policy) : policy;
     return (parsedPolicy?.Statement ?? []).map((s) => s.Resource);

package/dist-es/sign.js

@@ -103,12 +103,32 @@ function encodeUrlPath(url) {
     });
     let encodedQuery = "";
     if (rawQuery) {
-        for (const [key, value] of new URLSearchParams(rawQuery.slice(1)).entries()) {
-            encodedQuery += `${encodedQuery ? "&" : "?"}${encodeURIComponent(key).replace(/'/g, "%27")}=${encodeURIComponent(value).replace(/'/g, "%27")}`;
-        }
+        const pairs = rawQuery
+            .slice(1)
+            .split("&")
+            .filter((p) => p.length > 0)
+            .map((pair) => {
+            const eqIdx = pair.indexOf("=");
+            const rawKey = eqIdx === -1 ? pair : pair.slice(0, eqIdx);
+            const rawValue = eqIdx === -1 ? "" : pair.slice(eqIdx + 1);
+            return `${encodeQueryComponent(rawKey)}=${encodeQueryComponent(rawValue)}`;
+        });
+        encodedQuery = pairs.length > 0 ? `?${pairs.join("&")}` : "";
     }
     return origin + encodedPath + encodedQuery;
 }
+function encodeQueryComponent(component) {
+    const wellFormedComponent = component.replace(/[\uD800-\uDFFF]/gu, "\uFFFD");
+    return wellFormedComponent
+        .split(/(%[0-9A-Fa-f]{2}|\+)/g)
+        .map((part, i) => {
+        if (i % 2 === 1) {
+            return part === "+" ? "+" : part.toUpperCase();
+        }
+        return encodeURIComponent(part).replace(/'/g, "%27");
+    })
+        .join("");
+}
 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.1116.0",
+  "version": "3.1138.0",
   "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/packages/cloudfront-signer",
   "license": "Apache-2.0",
   "author": {
@@ -43,7 +43,7 @@
     "test:e2e:watch": "yarn g:vitest watch -c vitest.config.e2e.mts"
   },
   "dependencies": {
-    "@smithy/core": "^3.33.3",
+    "@smithy/core": "^3.35.0",
     "tslib": "^2.6.2"
   },
   "devDependencies": {