Fix multi-POST test failing with directory as target

Author: rubensworks

lib/handlers/post.js

@@ -29,7 +29,7 @@ async function handler (req, res, next) {
   // Check if container exists
   let stats
   try {
-    const ret = await ldp.exists(req.hostname, containerPath)
+    const ret = await ldp.exists(req.hostname, containerPath, false)
     if (ret) {
       stats = ret.stream
     }

lib/ldp.js

@@ -251,10 +251,9 @@ class LDP {
     })
   }
 
-  async exists (hostname, path) {
-    const options = { hostname, path, includeBody: false }
-    await this.get(options)
-    return true
+  async exists (hostname, path, searchIndex = true) {
+    const options = { hostname, path, includeBody: false, searchIndex }
+    return await this.get(options, searchIndex)
   }
 
   /**
@@ -322,10 +321,10 @@ class LDP {
     })
   }
 
-  async get (options) {
+  async get (options, searchIndex = true) {
     let filename, contentType, stats
     try {
-      ({ path: filename, contentType } = await this.resourceMapper.mapUrlToFile({ url: options }))
+      ({ path: filename, contentType } = await this.resourceMapper.mapUrlToFile({ url: options, searchIndex }))
       stats = await this.stat(filename)
     } catch (err) {
       throw error(404, 'Can\'t find file requested: ' + options)

lib/resource-mapper.js

@@ -39,10 +39,10 @@ class ResourceMapper {
 
   // Maps the request for a given resource and representation format to a server file
   // When the URL ends with a '/', then files with the prefix 'index.' will be matched,
-  // such as 'index.html' and 'index.ttl'.
-  async mapUrlToFile ({ url, contentType, createIfNotExists }) {
+  // such as 'index.html' and 'index.ttl', unless searchIndex is false.
+  async mapUrlToFile ({ url, contentType, createIfNotExists, searchIndex = true }) {
     let fullPath = this._getFullPath(url)
-    let isIndex = fullPath.endsWith('/')
+    let isIndex = searchIndex && fullPath.endsWith('/')
     let path
 
     // Append index filename if the URL ends with a '/'
@@ -54,7 +54,7 @@ class ResourceMapper {
     if (createIfNotExists) {
       path = fullPath
       // If the extension is not correct for the content type, append the correct extension
-      if (this._getContentTypeByExtension(path) !== contentType) {
+      if (searchIndex && this._getContentTypeByExtension(path) !== contentType) {
         // Append a '$', unless we map for the index
         // Because the index must _always_ have a proper extension when it is being created
         if (!isIndex) {
@@ -70,9 +70,9 @@ class ResourceMapper {
       const files = await this._readdir(folder)
 
       // Find a file with the same name (minus the dollar extension)
-      let match = files.find(f => this._removeDollarExtension(f) === filename ||
-        (isIndex && f.startsWith(this._indexFilename + '.')))
-      if (!match) {
+      let match = !searchIndex ? '' : (files.find(f => this._removeDollarExtension(f) === filename ||
+        (isIndex && f.startsWith(this._indexFilename + '.'))))
+      if (match === undefined) {
         // Error if no match was found,
         // unless the URL ends with a '/',
         // in that case we fallback to the folder itself.

test/unit/resource-mapper-test.js

@@ -263,6 +263,20 @@ describe('ResourceMapper', () => {
         contentType: 'text/html'
       })
 
+    itMapsUrl(mapper, 'a URL ending with a slash to a folder when index.html is available but index is skipped',
+      {
+        url: 'http://localhost/space/',
+        searchIndex: false
+      },
+      [
+        `${rootPath}space/index.html`,
+        `${rootPath}space/index$.ttl`
+      ],
+      {
+        path: `${rootPath}space/`,
+        contentType: 'application/octet-stream'
+      })
+
     itMapsUrl(mapper, 'a URL ending with a slash to a folder when no index is available',
       {
         url: 'http://localhost/space/'
@@ -283,6 +297,18 @@ describe('ResourceMapper', () => {
         contentType: 'text/html'
       })
 
+    itMapsUrl(mapper, 'a URL ending with a slash to a folder when index is skipped',
+      {
+        url: 'http://localhost/space/',
+        contentType: 'application/octet-stream',
+        createIfNotExists: true,
+        searchIndex: false
+      },
+      {
+        path: `${rootPath}space/`,
+        contentType: 'application/octet-stream'
+      })
+
     itMapsUrl(mapper, 'a URL ending with a slash to an index file for text/turtle when index.ttl not is available',
       {
         url: 'http://localhost/space/',