Current work on group listings

Author: kjetilk

lib/acl-checker.js

@@ -136,21 +136,42 @@ class ACLChecker {
     let returnAcl = null
     while (possibleACLs.length > 0 && !returnAcl) {
       const acl = possibleACLs.shift()
+      let graph
       try {
-        const graph = await this.fetch(acl)
-        const relative = resource.replace(acl.replace(/[^/]+$/, ''), './')
-        debug(`Using ACL ${acl} for ${relative}`)
-        returnAcl = { acl, graph, isContainer }
+        graph = await this.fetch(acl)
       } 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
         }
+        console.error('ERROR IN getNearestACL', err.code, err)
+        debug(err)
+        throw err
       }
+
+      const fetcher = new rdf.Fetcher(graph)
+      fetcher.load(graph.each(null, ACL('agentGroup'), null))
+/*
+      try {
+        await Promise.all(groups.map(async group => {
+/*          const response = await fetch(group)
+          const body = await response.text()
+          return new Promise((resolve, reject) => {
+            rdf.parse(body, graph, group, 'text/turtle', err => {
+              if (err) {
+                return reject(err)
+              }
+              resolve()
+            })
+          })
+        }))
+      } catch (error) {
+        console.log('DAAAAAAAAAAAAAAAAAAHUUUUUUUUUUUUT', error)
+      }
+*/
+      const relative = resource.replace(acl.replace(/[^/]+$/, ''), './')
+      debug(`Using ACL ${acl} for ${relative}`)
+      returnAcl = { acl, graph, isContainer }
     }
     if (!returnAcl) {
       throw new HTTPError(500, `No ACL found for ${resource}, searched in \n- ${acls.join('\n- ')}`)

lib/handlers/allow.js

@@ -38,12 +38,12 @@ function allow (mode) {
       origin: req.get('origin'),
       // host: req.get('host'),
       fetch: fetchFromLdp(ldp.resourceMapper, ldp),
-      // fetchGraph: (uri, options) => {
-      //   // first try loading from local fs
-      //   return ldp.getGraph(uri, options.contentType)
-      //     // failing that, fetch remote graph
-      //     .catch(() => ldp.fetchGraph(uri, options))
-      // },
+      fetchGraph: (uri, options) => {
+        // first try loading from local fs
+        return ldp.getGraph(uri, options.contentType)
+        // failing that, fetch remote graph
+          .catch(() => ldp.fetchGraph(uri, options))
+      },
       suffix: ldp.suffixAcl,
       strictOrigin: ldp.strictOrigin,
       trustedOrigins: ldp.trustedOrigins

test/integration/acl-oidc-test.js

@@ -560,7 +560,7 @@ describe('ACL with WebID+OIDC over HTTP', function () {
     })
   })
 
-  describe('Group', function () {
+  describe.only('Group', function () {
     // before(function () {
     //   rm('/accounts-acl/tim.localhost/group/test-folder/.acl')
     // })
@@ -581,7 +581,7 @@ describe('ACL with WebID+OIDC over HTTP', function () {
     //     done()
     //   })
     // })
-    it('user1 should be able to access test directory', function (done) {
+    it.only('user1 should be able to access test directory', function (done) {
       var options = createOptions('/group/test-folder/', 'user1')
 
       request.head(options, function (error, response, body) {
@@ -652,7 +652,7 @@ describe('ACL with WebID+OIDC over HTTP', function () {
           done()
         })
       })
-    it.skip('We should have a 404 for non-existent file',
+    it('We should have a 404 for non-existent file',
       function (done) {
         var options = createOptions('/group/test-folder/nothere.txt', 'user2')