Properly handle creation and removal of root .acl files in tests

Author: rubensworks

test/integration/acl-tls-test.js

@@ -88,20 +88,18 @@ describe('ACL with WebID+TLS', function () {
   }
 
   describe('no ACL', function () {
-    before(() => {
-      rm(path.join(rootPath, '.acl'))
-    })
-
-    it('should return 403 for any resource', function (done) {
+    it('should return 500 for any resource', function (done) {
+      rm('.acl')
       var options = createOptions('/acl-tls/no-acl/', 'user1')
       request(options, function (error, response, body) {
         assert.equal(error, null)
-        assert.equal(response.statusCode, 403)
+        assert.equal(response.statusCode, 500)
         done()
       })
     })
 
     it('should have `User` set in the Response Header', function (done) {
+      rm('.acl')
       var options = createOptions('/acl-tls/no-acl/', 'user1')
       request(options, function (error, response, body) {
         assert.equal(error, null)
@@ -111,6 +109,7 @@ describe('ACL with WebID+TLS', function () {
     })
 
     it.skip('should return a 401 and WWW-Authenticate header without credentials', (done) => {
+      rm('.acl')
       let options = {
         url: address + '/acl-tls/no-acl/',
         headers: { accept: 'text/turtle' }

test/integration/authentication-oidc-test.js

@@ -10,7 +10,7 @@ const localStorage = require('localstorage-memory')
 const URL = require('whatwg-url').URL
 global.URL = URL
 global.URLSearchParams = require('whatwg-url').URLSearchParams
-const { cleanDir } = require('../utils')
+const { cleanDir, cp } = require('../utils')
 
 const supertest = require('supertest')
 const chai = require('chai')
@@ -68,14 +68,16 @@ describe('Authentication API (OIDC)', () => {
     })
   }
 
-  before(() => {
-    return Promise.all([
+  before(async () => {
+    await Promise.all([
       startServer(alicePod, 7000),
       startServer(bobPod, 7001)
     ]).then(() => {
       alice = supertest(aliceServerUri)
       bob = supertest(bobServerUri)
     })
+    cp(path.join('accounts-scenario/alice', '.acl-override'), path.join('accounts-scenario/alice', '.acl'))
+    cp(path.join('accounts-scenario/bob', '.acl-override'), path.join('accounts-scenario/bob', '.acl'))
   })
 
   after(() => {

test/integration/errors-oidc-test.js

@@ -1,7 +1,7 @@
 const supertest = require('supertest')
 const ldnode = require('../../index')
 const path = require('path')
-const { cleanDir } = require('../utils')
+const { cleanDir, cp } = require('../utils')
 const expect = require('chai').expect
 
 describe('OIDC error handling', function () {
@@ -25,7 +25,10 @@ describe('OIDC error handling', function () {
   })
 
   before(function (done) {
-    ldpHttpsServer = ldp.listen(3457, done)
+    ldpHttpsServer = ldp.listen(3457, () => {
+      cp(path.join('accounts/errortests', '.acl-override'), path.join('accounts/errortests', '.acl'))
+      done()
+    })
   })
 
   after(function () {

test/resources/accounts-acl/config/templates/server/.acl

@@ -0,0 +1,10 @@
+# Root ACL resource for the root
+@prefix acl: <http://www.w3.org/ns/auth/acl#>.
+@prefix foaf: <http://xmlns.com/foaf/0.1/>.
+
+<#public>
+    a acl:Authorization;
+    acl:agentClass foaf:Agent;  # everyone
+    acl:accessTo </>;
+    acl:default </common/>;
+    acl:mode acl:Read.

test/resources/accounts-acl/localhost/.acl

@@ -0,0 +1,10 @@
+# Root ACL resource for the root
+@prefix acl: <http://www.w3.org/ns/auth/acl#>.
+@prefix foaf: <http://xmlns.com/foaf/0.1/>.
+
+<#public>
+    a acl:Authorization;
+    acl:agentClass foaf:Agent;  # everyone
+    acl:accessTo </>;
+    acl:default </common/>;
+    acl:mode acl:Read.

…t/resources/accounts-scenario/alice/.acl …es/accounts-scenario/alice/.acl-overridetest/resources/accounts-scenario/alice/.acl renamed to test/resources/accounts-scenario/alice/.acl-override test/resources/accounts-scenario/alice/.acl renamed to test/resources/accounts-scenario/alice/.acl-override

@@ -0,0 +1,10 @@
+# Root ACL resource for the root
+@prefix acl: <http://www.w3.org/ns/auth/acl#>.
+@prefix foaf: <http://xmlns.com/foaf/0.1/>.
+
+<#public>
+    a acl:Authorization;
+    acl:agentClass foaf:Agent;  # everyone
+    acl:accessTo <./>;
+    acl:default <./>;
+    acl:mode acl:Read.