Changed HTTP status when no ACL is found

Author: megoth

lib/acl-checker.js

@@ -132,21 +132,45 @@ class ACLChecker {
     // let directory = null
     // Create a cascade of reject handlers (one for each possible ACL)
     const possibleACLs = this.getPossibleACLs()
-    const nearestACL = possibleACLs.reduce((prevACL, acl) => {
-      return prevACL.catch(() => new Promise((resolve, reject) => {
-        this.fetch(acl, (err, graph) => {
-          if (err && err.code !== 'ENOENT') {
-            isContainer = true
-            reject(err)
-          } else {
-            const relative = resource.replace(acl.replace(/[^/]+$/, ''), './')
-            debug(`Using ACL ${acl} for ${relative}`)
-            resolve({ acl, graph, isContainer })
-          }
-        })
-      }))
-    }, Promise.reject())
-    return nearestACL.catch(e => { throw new Error(`No ACL resource found, searched in \n- ${possibleACLs.join('\n- ')}`) })
+    const acls = [...possibleACLs]
+    let returnAcl = null
+    while (possibleACLs.length > 0 && !returnAcl) {
+      const acl = possibleACLs.shift()
+      try {
+        const graph = await this.fetch(acl)
+        const relative = resource.replace(acl.replace(/[^/]+$/, ''), './')
+        debug(`Using ACL ${acl} for ${relative}`)
+        returnAcl = { acl, graph, isContainer }
+      } catch (err) {
+        if (err && (err.code === 'ENOENT' || err.status === 404)) {
+          isContainer = true
+          continue
+        } else if (err) {
+          console.error('ERROR IN getNearestACL', err.code, err)
+          debug(err)
+          throw err
+        }
+      }
+    }
+    if (!returnAcl) {
+      throw new HTTPError(500, `No ACL found for ${resource}, searched in \n- ${acls.join('\n- ')}`)
+    }
+    return returnAcl
+    // const nearestACL = possibleACLs.reduce((prevACL, acl) => {
+    //   return prevACL.catch(() => new Promise((resolve, reject) => {
+    //     this.fetch(acl, (err, graph) => {
+    //       if (err && err.code !== 'ENOENT') {
+    //         isContainer = true
+    //         reject(err)
+    //       } else {
+    //         const relative = resource.replace(acl.replace(/[^/]+$/, ''), './')
+    //         debug(`Using ACL ${acl} for ${relative}`)
+    //         resolve({ acl, graph, isContainer })
+    //       }
+    //     })
+    //   }))
+    // }, Promise.reject())
+    // return nearestACL.catch(e => { throw new Error(`No ACL resource found, searched in \n- ${possibleACLs.join('\n- ')}`) })
   }
 
 // Gets all possible ACL paths that apply to the resource