Removes acl files from list of files to match when mapping url to file

Should fix #1104

Author: megoth

lib/resource-mapper.js

@@ -68,11 +68,9 @@ class ResourceMapper {
       // Read all files in the corresponding folder
       const filename = fullPath.substr(fullPath.lastIndexOf('/') + 1)
       const folder = fullPath.substr(0, fullPath.length - filename.length)
-      const files = await this._readdir(folder)
 
       // Find a file with the same name (minus the dollar extension)
-      let match = !searchIndex ? '' : (files.find(f => this._removeDollarExtension(f) === filename ||
-        (isIndex && f.startsWith(this._indexFilename + '.'))))
+      let match = searchIndex ? await this._getMatchingFile(folder, filename, isIndex) : ''
       if (match === undefined) {
         // Error if no match was found,
         // unless the URL ends with a '/',
@@ -90,6 +88,14 @@ class ResourceMapper {
     return { path, contentType: contentType || this._defaultContentType }
   }
 
+  async _getMatchingFile (folder, filename, isIndex) {
+    const files = await this._readdir(folder)
+
+    // Find a file with the same name (minus the dollar extension)
+    return (files.find(f => this._removeDollarExtension(f) === filename ||
+      (isIndex && f.startsWith(this._indexFilename + '.') && !f.endsWith('.acl'))))
+  }
+
   async getRepresentationUrlForResource (resourceUrl) {
     let fullPath = this.getFullPath(resourceUrl)
     let isIndex = fullPath.endsWith('/')