Replace + characters *before* we decode for S3

S3 treats `+` characters as spaces, which we try to catch, but we should do it before we decode so that %2B in the url survives intact
mhart · Aug 12, 2020 · a02cdb3 · a02cdb3
1 parent c5d80b1
commit a02cdb3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/dist/aws4fetch.cjs.js b/dist/aws4fetch.cjs.js
@@ -120,7 +120,7 @@ class AwsV4Signer {
     }
     if (this.service === 's3') {
       try {
-        this.encodedPath = decodeURIComponent(this.url.pathname).replace(/\+/g, ' ');
+        this.encodedPath = decodeURIComponent(this.url.pathname.replace(/\+/g, ' '));
       } catch (e) {
         this.encodedPath = this.url.pathname;
       }

diff --git a/dist/aws4fetch.esm.js b/dist/aws4fetch.esm.js
@@ -116,7 +116,7 @@ class AwsV4Signer {
     }
     if (this.service === 's3') {
       try {
-        this.encodedPath = decodeURIComponent(this.url.pathname).replace(/\+/g, ' ');
+        this.encodedPath = decodeURIComponent(this.url.pathname.replace(/\+/g, ' '));
       } catch (e) {
         this.encodedPath = this.url.pathname;
       }

diff --git a/dist/aws4fetch.umd.js b/dist/aws4fetch.umd.js
@@ -122,7 +122,7 @@
       }
       if (this.service === 's3') {
         try {
-          this.encodedPath = decodeURIComponent(this.url.pathname).replace(/\+/g, ' ');
+          this.encodedPath = decodeURIComponent(this.url.pathname.replace(/\+/g, ' '));
         } catch (e) {
           this.encodedPath = this.url.pathname;
         }

diff --git a/src/main.js b/src/main.js
@@ -202,7 +202,7 @@ export class AwsV4Signer {
     if (this.service === 's3') {
       try {
         /** @type {string} */
-        this.encodedPath = decodeURIComponent(this.url.pathname).replace(/\+/g, ' ')
+        this.encodedPath = decodeURIComponent(this.url.pathname.replace(/\+/g, ' '))
       } catch (e) {
         this.encodedPath = this.url.pathname
       }

diff --git a/test/integration.js b/test/integration.js
@@ -17,6 +17,8 @@ https.globalAgent.maxSockets = 10
     '/!\'()*@%21%27%28%29%2A',
     '/%2a',
     '/%2f%2f',
+    '/%2b%2b',
+    '/++',
     '/ü%41',
     '/ü%41?a=%41ü',
     '/€ü%41?€ü=%41€ü',