cleaning an DELETE

Author: bourgeoa

lib/acl-checker.js

@@ -95,42 +95,47 @@ class ACLChecker {
       // FIXME: https://github.com/solid/acl-check/issues/23
       // console.error(e.message)
     }
-    let accessDenied = aclCheck.accessDenied(aclGraph, resource, directory, aclFile, agent, modes, agentOrigin, trustedOrigins, originTrustedModes)
+    function resourceAccessDenied (modes) {
+      accessDenied = aclCheck.accessDenied(aclGraph, resource, directory, aclFile, agent, modes, agentOrigin, trustedOrigins, originTrustedModes)
+    }
 
-    function accessDeniedForAccessTo (mode) {
-      const accessDeniedAccessTo = aclCheck.accessDenied(aclGraph, directory, null, aclFile, agent, [ACL(mode)], agentOrigin, trustedOrigins, originTrustedModes)
+    function accessDeniedForAccessTo (modes) {
+      const accessDeniedAccessTo = aclCheck.accessDenied(aclGraph, directory, null, aclFile, agent, modes, agentOrigin, trustedOrigins, originTrustedModes)
       const accessResult = !accessDenied && !accessDeniedAccessTo
       accessDenied = accessResult ? false : accessDenied || accessDeniedAccessTo
       // debugCache('accessDenied result ' + accessDenied)
     }
-    function accessdeniedFromParent (modes) {
+    async function accessdeniedFromParent (modes) {
       const parentAclDirectory = ACLChecker.getDirectory(acl.parentAcl)
       const parentDirectory = parentResource === parentAclDirectory ? null : rdf.sym(parentAclDirectory)
-      const deniedParent = Promise.all(modes
-        .map(mode => aclCheck.accessDenied(acl.parentGraph, parentResource, parentDirectory, rdf.sym(acl.parentAcl), agent, [ACL(mode)], agentOrigin, trustedOrigins, originTrustedModes)))
-      const accessDeniedParent = deniedParent.reduce((memo, deniedParent) => memo && !deniedParent, true)
+      // if (acl.parentAcl.endWith('/.acl')) parentDirectory = rdf.sym(parentAclDirectory)
+      const accessDeniedParent = aclCheck.accessDenied(acl.parentGraph, parentResource, parentDirectory, rdf.sym(acl.parentAcl), agent, modes, agentOrigin, trustedOrigins, originTrustedModes)
       const accessResult = !accessDenied && !accessDeniedParent
       accessDenied = accessResult ? false : accessDenied || accessDeniedParent
       // debugCache('accessDenied result ' + accessDenied)
     }
+
+    let accessDenied
+    resourceAccessDenied(modes)
     // For create and update HTTP methods
     if ((method === 'PUT' || method === 'PATCH' || method === 'COPY')) {
       // if resource and acl have same parent container,
       // and resource does not exist, then accessTo Append from parent is required
       if (directory && directory.value === dirname(aclFile.value) + '/' && !resourceExists) {
-        accessDeniedForAccessTo('Append')
+        accessDeniedForAccessTo([ACL('Append')])
       }
     }
 
     // For delete HTTP method
     if ((method === 'DELETE')) {
       // if resource and acl have same parent container,
       // then accessTo Write from parent is required
-      if (!directory && aclFile.value.endsWith('/.acl')) accessdeniedFromParent(['Read', 'Write']) // directory = rdf.sym(dirname(aclFile.value) + '/')
-      if ((directory && directory.value === dirname(aclFile.value) + '/')) {
-        accessDeniedForAccessTo('Write')
+      if (directory && this.resource.endsWith('/')) resourceAccessDenied([ACL('Read'), ACL('Write')])
+      else if (!directory && aclFile.value.endsWith('/.acl')) await accessdeniedFromParent([ACL('Read'), ACL('Write')]) // directory = rdf.sym(dirname(aclFile.value) + '/')
+      else if ((directory && directory.value === dirname(aclFile.value) + '/')) {
+        accessDeniedForAccessTo([ACL('Write')])
       } else {
-        accessdeniedFromParent(['Write'])
+        await accessdeniedFromParent([ACL('Read'), ACL('Write')])
       }
     }
 
@@ -178,7 +183,8 @@ class ACLChecker {
         graph = await this.requests[acl]
       } catch (err) {
         if (err && (err.code === 'ENOENT' || err.status === 404)) {
-          isContainer = true
+          // only set isContainer before docAcl // alain
+          if (!docAcl) isContainer = true
           continue
         }
         debug(err)
@@ -194,6 +200,7 @@ class ACLChecker {
           parentGraph = graph // alain
           returnParentAcl = true
         } */
+        // parentAcl is only needed for DELETE // alain
         if (method !== 'DELETE') returnParentAcl = true
       } else {
         parentAcl = acl