Move getNearestACL into separate method.

Author: RubenVerborgh

lib/acl-checker.js

@@ -24,29 +24,9 @@ class ACLChecker {
       mode = 'Control'
     }
 
-    // Find nearest ACL
-    let accessType = 'accessTo'
-    let nearestACL = Promise.reject()
-    for (const acl of ACLChecker.possibleACLs(resource, this.suffix)) {
-      nearestACL = nearestACL.catch(() => new Promise((resolve, reject) => {
-        debug('Check if acl exist: ' + acl)
-        this.fetch(acl, function (err, graph) {
-          if (err || !graph || !graph.length) {
-            if (err) debug(`Error reading ${acl}: ${err}`)
-            accessType = 'defaultForNew'
-            reject(err)
-          } else {
-            resolve({ acl, graph })
-          }
-        })
-      }))
-    }
-    nearestACL = nearestACL.catch(() => {
-      throw new Error('No ACL resource found')
-    })
-
-    // Check the permissions within the ACL
-    return nearestACL.then(({ acl, graph }) =>
+    // Check the permissions within the nearest ACL
+    return this.getNearestACL(resource)
+    .then(({ acl, graph, accessType }) =>
       this.checkAccess(
         graph, // The ACL graph
         user, // The webId of the user
@@ -70,6 +50,51 @@ class ACLChecker {
     })
   }
 
+  // Gets the ACL that applies to the resource
+  getNearestACL (uri) {
+    let accessType = 'accessTo'
+    let nearestACL = Promise.reject()
+    for (const acl of this.getPossibleACLs(uri, this.suffix)) {
+      nearestACL = nearestACL.catch(() => new Promise((resolve, reject) => {
+        this.debug(`Check if ACL exists: ${acl}`)
+        this.fetch(acl, (err, graph) => {
+          if (err || !graph || !graph.length) {
+            if (err) this.debug(`Error reading ${acl}: ${err}`)
+            accessType = 'defaultForNew'
+            reject(err)
+          } else {
+            resolve({ acl, graph, accessType })
+          }
+        })
+      }))
+    }
+    return nearestACL.catch(e => { throw new Error('No ACL resource found') })
+  }
+
+  // Get all possible ACL paths that apply to the resource
+  getPossibleACLs (uri, suffix) {
+    var first = uri.endsWith(suffix) ? uri : uri + suffix
+    var urls = [first]
+    var parsedUri = url.parse(uri)
+    var baseUrl = (parsedUri.protocol ? parsedUri.protocol + '//' : '') +
+      (parsedUri.host || '')
+    if (baseUrl + '/' === uri) {
+      return urls
+    }
+
+    var times = parsedUri.pathname.split('/').length
+    // TODO: improve temporary solution to stop recursive path walking above root
+    if (parsedUri.pathname.endsWith('/')) {
+      times--
+    }
+
+    for (var i = 0; i < times - 1; i++) {
+      uri = path.dirname(uri)
+      urls.push(uri + (uri[uri.length - 1] === '/' ? suffix : '/' + suffix))
+    }
+    return urls
+  }
+
   /**
    * Tests whether a graph (parsed .acl resource) allows a given operation
    * for a given user. Calls the provided callback with `null` if the user
@@ -136,29 +161,6 @@ class ACLChecker {
       return false
     }
   }
-
-  static possibleACLs (uri, suffix) {
-    var first = uri.endsWith(suffix) ? uri : uri + suffix
-    var urls = [first]
-    var parsedUri = url.parse(uri)
-    var baseUrl = (parsedUri.protocol ? parsedUri.protocol + '//' : '') +
-      (parsedUri.host || '')
-    if (baseUrl + '/' === uri) {
-      return urls
-    }
-
-    var times = parsedUri.pathname.split('/').length
-    // TODO: improve temporary solution to stop recursive path walking above root
-    if (parsedUri.pathname.endsWith('/')) {
-      times--
-    }
-
-    for (var i = 0; i < times - 1; i++) {
-      uri = path.dirname(uri)
-      urls.push(uri + (uri[uri.length - 1] === '/' ? suffix : '/' + suffix))
-    }
-    return urls
-  }
 }
 
 module.exports = ACLChecker