update regex and code cleaning and tests

Author: bourgeoa

lib/resource-mapper.js

@@ -147,23 +147,29 @@ class ResourceMapper {
     return { path, contentType: contentType || this._defaultContentType }
   }
 
-  // encode/decode path except slash/%encodedSlash/double%encodedSlash
-  _exceptSlash () { return /(\/|%2f|%2F|%252F|%252f)/g }
+  // encode/decode path except slash (/) / %encodedSlash (%2F|%2f) /ntimes%encodedSlash (%2525...2F|%2525...2f)
+  // see https://github.com/solid/node-solid-server/issues/1666
+  _exceptSlash () { return /(\/|%(?:25)*(?:2[Ff]))/g }
 
   _encodePath (pathname) {
-    const pathArray = pathname.split(this._exceptSlash())
-    pathArray.forEach((el, i) => {
+    return pathname.split(this._exceptSlash())
+      .map((el, i) => i % 2 === 0 ? encodeURIComponent(el) : el)
+      .join('')
+    /* pathArray.forEach((el, i) => {
       if (i % 2 === 0) pathArray[i] = encodeURIComponent(el)
-    })
-    return pathArray.join('')
+    }) */
+    // return pathArray.join('')
   }
 
   _decodePath (pathname) {
-    const pathArray = pathname.split(this._exceptSlash())
+    return pathname.split(this._exceptSlash())
+      .map((el, i) => i % 2 === 0 ? decodeURIComponent(el) : el)
+      .join('')
+    /* const pathArray = pathname.split(this._exceptSlash())
     pathArray.forEach((el, i) => {
       if (i % 2 === 0) pathArray[i] = decodeURIComponent(el)
     })
-    return pathArray.join('')
+    return pathArray.join('') */
   }
 
   // Parses a URL into hostname and pathname

test/unit/resource-mapper-test.js

@@ -224,14 +224,14 @@ describe('ResourceMapper', () => {
         contentType: 'text/html'
       })
 
-    itMapsUrl(mapper, 'a URL of a new file with encoded characters',
+    itMapsUrl(mapper, 'a URL of a new file with encoded characters and encoded /',
       {
-        url: 'http://localhost/space%2Ffoo%20bar%20bar.html',
+        url: 'http://localhost/%25252fspace%2Ffoo%20bar%20bar.html',
         contentType: 'text/html',
         createIfNotExists: true
       },
-      { // alain
-        path: `${rootPath}space%2Ffoo bar bar.html`,
+      {
+        path: `${rootPath}%25252fspace%2Ffoo bar bar.html`,
         contentType: 'text/html'
       })
 
@@ -333,15 +333,6 @@ describe('ResourceMapper', () => {
         contentType: 'application/octet-stream'
       })
 
-    itMapsUrl(mapper, 'a URL ending with an encoded slash to a folder when no index is available',
-      {
-        url: 'http://localhost/space/'
-      },
-      {
-        path: `${rootPath}space/`,
-        contentType: 'application/octet-stream'
-      })
-
     itMapsUrl(mapper, 'a URL of that has an accompanying acl file, but no actual file',
       {
         url: 'http://localhost/space/'
@@ -418,14 +409,6 @@ describe('ResourceMapper', () => {
       },
       new Error('Disallowed /.. segment in URL'))
 
-    /* itMapsUrl(mapper, 'a URL with an encoded /.. path segment',
-      {
-        url: 'http://localhost/space%2F..%2Fbar'
-      },
-      new Error('Disallowed /.. segment in URL'))
-      */
-    // File to URL mapping
-
     itMapsFile(mapper, 'an HTML file',
       { path: `${rootPath}space/foo.html` },
       {
@@ -511,9 +494,9 @@ describe('ResourceMapper', () => {
       })
 
     itMapsFile(mapper, 'a file with %encoded /',
-      { path: `${rootPath}%2Fspace/foo%2f.html` },
+      { path: `${rootPath}%2Fspace/%25252Ffoo%2f.html` },
       {
-        url: 'http://localhost/%2Fspace/foo%2f.html',
+        url: 'http://localhost/%2Fspace/%25252Ffoo%2f.html',
         contentType: 'text/html'
       })