cleaning

Author: bourgeoa

lib/acl-checker.js

@@ -5,7 +5,7 @@ const { dirname } = require('path')
 const rdf = require('rdflib')
 const debug = require('./debug').ACL
 // const debugCache = require('./debug').cache
-const debugAccounts = require('./debug').accounts
+// const debugAccounts = require('./debug').accounts
 const HTTPError = require('./http-error')
 const aclCheck = require('@solid/acl-check')
 const { URL } = require('url')
@@ -128,14 +128,18 @@ class ACLChecker {
 
     // For delete HTTP method
     if ((method === 'DELETE')) {
-      // if resource and acl have same parent container,
-      // then accessTo Write from parent is required
+      // deleting a Container
+      // without Read, the response code will reveal whether a Container is empty or not
       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) + '/')
+      // if resource and acl have same parent container,
+      // then Read Write from parent is required
+      else if (!directory && aclFile.value.endsWith(`/${this.suffix}`)) await accessdeniedFromParent([ACL('Read'), ACL('Write')]) // directory = rdf.sym(dirname(aclFile.value) + '/')
+
+      // deleting a Document
       else if ((directory && directory.value === dirname(aclFile.value) + '/')) {
         accessDeniedForAccessTo([ACL('Write')])
       } else {
-        await accessdeniedFromParent([ACL('Read'), ACL('Write')])
+        await accessdeniedFromParent([ACL('Write')])
       }
     }
 
@@ -175,7 +179,7 @@ class ACLChecker {
     let docAcl = null
     let docGraph = null
     // while (possibleACLs.length > 0 && !returnParentAcl) {
-    while (possibleACLs.length > 0 && !returnParentAcl) { // alain returnParentAcl
+    while (possibleACLs.length > 0 && !returnParentAcl) {
       const acl = possibleACLs.shift()
       let graph
       try {
@@ -195,11 +199,6 @@ class ACLChecker {
       if (!docAcl) {
         docAcl = acl
         docGraph = graph
-        /* if ((possibleACLs.length === 0)) { // || docAcl.endsWith('/.acl')) {
-          parentAcl = acl // alain
-          parentGraph = graph // alain
-          returnParentAcl = true
-        } */
         // parentAcl is only needed for DELETE // alain
         if (method !== 'DELETE') returnParentAcl = true
       } else {
@@ -213,31 +212,27 @@ class ACLChecker {
     if (!returnAcl) {
       throw new HTTPError(500, `No ACL found for ${resource}, searched in \n- ${acls.join('\n- ')}`)
     }
-    if (!parentAcl) { // alain is it needed
-      returnAcl.parentAcl = returnAcl.docAcl
-      returnAcl.parentGraph = returnAcl.docGraph
-    }
-    const groupNodes = returnAcl.docGraph.statementsMatching(null, ACL('agentGroup'), null)
-    const groupUrls = groupNodes.map(node => node.object.value.split('#')[0])
+    // fetch group
+    let groupNodes = returnAcl.docGraph.statementsMatching(null, ACL('agentGroup'), null)
+    let groupUrls = groupNodes.map(node => node.object.value.split('#')[0])
     await Promise.all(groupUrls.map(async groupUrl => {
       try {
         const docGraph = await this.fetch(groupUrl, returnAcl.docGraph)
         this.requests[groupUrl] = this.requests[groupUrl] || docGraph
-        // debugAccounts(this.requests[groupUrl].statementsMatching())
       } catch (e) {} // failed to fetch groupUrl
     }))
-    /* groupNodes = returnAcl.parentGraph.statementsMatching(null, ACL('agentGroup'), null)
-    groupUrls = groupNodes.map(node => node.object.value.split('#')[0])
-    await Promise.all(groupUrls.map(async groupUrl => {
-      try {
-        const docGraph = await this.fetch(groupUrl, returnAcl.parentGraph)
-        this.requests[groupUrl] = this.requests[groupUrl] || docGraph
-      } catch (e) {} // failed to fetch groupUrl
-    })) */
-    /* returnAcl.parentAcl = returnAcl.docAcl
-    returnAcl.parentGraph = returnAcl.docGraph
-    */
-    debugAccounts('ALAIN returnACl ' + '\ndocAcl ' + returnAcl.docAcl + '\nparentAcl ' + returnAcl.parentAcl)
+    if (parentAcl) {
+      groupNodes = returnAcl.parentGraph.statementsMatching(null, ACL('agentGroup'), null)
+      groupUrls = groupNodes.map(node => node.object.value.split('#')[0])
+      await Promise.all(groupUrls.map(async groupUrl => {
+        try {
+          const docGraph = await this.fetch(groupUrl, returnAcl.parentGraph)
+          this.requests[groupUrl] = this.requests[groupUrl] || docGraph
+        } catch (e) {} // failed to fetch groupUrl
+      }))
+    }
+
+    // debugAccounts('ALAIN returnACl ' + '\ndocAcl ' + returnAcl.docAcl + '\nparentAcl ' + returnAcl.parentAcl)
     return returnAcl
   }