fix issues #1120 #1256 from NSS5.1.6 ressource-mapper

lib/handlers/get.js

@@ -45,7 +45,7 @@ async function handler (req, res, next) {
 
   let ret
   try {
-    ret = await ldp.get(options)
+    ret = await ldp.get(options, req.accepts('html'))
   } catch (err) {
     // use globHandler if magic is detected
     if (err.status === 404 && glob.hasMagic(path)) {

lib/ldp.js

@@ -437,7 +437,7 @@ class LDP {
     requestUrl = requestUrl.replace(/\/*$/, '/')
 
     const { path: containerFilePath } = await this.resourceMapper.mapUrlToFile({ url: requestUrl })
-    let fileName = slug + extension
+    let fileName = slug.endsWith(extension) || slug.endsWith(this.suffixAcl) || slug.endsWith(this.suffixMeta) ? slug : slug + extension
     if (await promisify(fs.exists)(utilPath.join(containerFilePath, fileName))) {
       fileName = `${uuid.v1()}-${fileName}`
     }

lib/resource-mapper.js

@@ -7,7 +7,7 @@ const HTTPError = require('./http-error')
 
 /*
  * A ResourceMapper maintains the mapping between HTTP URLs and server filenames,
- * following the principles of the “sweet spot” discussed in
+ * following the principles of the "sweet spot" discussed in
  * https://www.w3.org/DesignIssues/HTTPFilenameMapping.html
  *
  * This class implements this mapping in a single place
@@ -91,22 +91,24 @@ class ResourceMapper {
     if (filePath.indexOf('/..') >= 0) {
       throw new Error('Disallowed /.. segment in URL')
     }
-    let isIndex = searchIndex && filePath.endsWith('/')
+    let isFolder = filePath.endsWith('/')
 
-    // Create the path for a new file
+    // Create the path for a new ressource
     let path
     if (createIfNotExists) {
       path = filePath
       // Append index filename if needed
-      if (isIndex) {
+      if (searchIndex && isFolder) {
         if (contentType !== this._indexContentType) {
           throw new Error(`Index file needs to have ${this._indexContentType} as content type`)
         }
         path += this._indexFilename
       }
       // If the extension is not correct for the content type, append the correct extension
-      if (searchIndex && this._getContentTypeByExtension(path) !== contentType) {
-        path += `$${contentType in extensions ? `.${extensions[contentType][0]}` : '.unknown'}`
+      if (!isFolder) {
+        if (this._getContentTypeByExtension(path) !== contentType) {
+          path += `$${contentType in extensions ? `.${extensions[contentType][0]}` : '.unknown'}`
+        }
       }
     // Determine the path of an existing file
     } else {
@@ -116,23 +118,15 @@ class ResourceMapper {
 
       // Find a file with the same name (minus the dollar extension)
       let match = ''
-      if (searchIndex) {
-        const files = await this._readdir(folder)
-        // Search for files with the same name (disregarding a dollar extension)
-        if (!isIndex) {
-          match = files.find(f => this._removeDollarExtension(f) === filename)
-        // Check if the index file exists
-        } else if (files.includes(this._indexFilename)) {
-          match = this._indexFilename
-        }
-      }
-      // Error if no match was found (unless URL ends with '/', then fall back to the folder)
-      if (match === undefined) {
-        if (isIndex) {
-          match = ''
-        } else {
-          throw new HTTPError(404, `Resource not found: ${pathname}`)
-        }
+      const files = await this._readdir(folder)
+      // Search for files with the same name (disregarding a dollar extension)
+      if (!isFolder) {
+        match = files.find(f => this._removeDollarExtension(f) === filename)
+        if (match === undefined) { throw new HTTPError(404, `Resource not found: ${pathname}`) }
+
+      // Check if the index file exists
+      } else if (searchIndex && files.includes(this._indexFilename)) {
+        match = this._indexFilename
       }
       path = `${folder}${match}`
       contentType = this._getContentTypeByExtension(match)