delete file.acl when deleting file - atomic delete

Author: bourgeoa

lib/ldp.js

@@ -422,9 +422,21 @@ class LDP {
     }
   }
 
+  // delete resource with acl and meta links
   async deleteResource (path) {
+    const linkPath = this.resourceMapper._removeDollarExtension(path)
     try {
-      return await withLock(path, { mustExist: false }, () => promisify(fs.unlink)(path))
+      // first delete file, then links with write permission only (atomic delete)
+      await withLock(path, { mustExist: false }, () => promisify(fs.unlink)(path))
+
+      const aclPath = `${linkPath}${this.suffixAcl}`
+      if (await promisify(fs.exists)(aclPath)) {
+        await withLock(aclPath, { mustExist: false }, () => promisify(fs.unlink)(aclPath))
+      }
+      const metaPath = `${linkPath}${this.suffixMeta}`
+      if (await promisify(fs.exists)(metaPath)) {
+        await withLock(metaPath, { mustExist: false }, () => promisify(fs.unlink)(metaPath))
+      }
     } catch (err) {
       debug.container('DELETE -- unlink() error: ' + err)
       throw error(err, 'Failed to delete resource')

test/integration/http-test.js

@@ -506,9 +506,12 @@ describe('HTTP APIs', function () {
       // Ensure all these are finished before running tests
       return Promise.all([
         rm('/false-file-48484848'),
-//        createTestContainer('delete-test-empty-container'),
-        createTestResource('/delete-test-empty-container/test.txt.acl'),
+        createTestResource('/delete-test-empty-container/.meta.acl'),
         createTestResource('/put-resource-1.ttl'),
+        createTestResource('/put-resource-with-acl.ttl'),
+        createTestResource('/put-resource-with-acl.ttl.acl'),
+        createTestResource('/put-resource-with-acl.txt'),
+        createTestResource('/put-resource-with-acl.txt.acl'),
         createTestResource('/delete-test-non-empty/test.ttl')
       ])
     })
@@ -524,12 +527,32 @@ describe('HTTP APIs', function () {
         .expect(200, done)
     })
 
+    it('should delete previously PUT file with ACL', function (done) {
+      server.delete('/put-resource-with-acl.ttl')
+        .expect(200, done)
+    })
+
+    it('should return 404 on deleting .acl of previously deleted PUT file with ACL', function (done) {
+      server.delete('/put-resource-with-acl.ttl.acl')
+        .expect(404, done)
+    })
+
+    it('should delete previously PUT file with bad extension and with ACL', function (done) {
+      server.delete('/put-resource-with-acl.txt')
+        .expect(200, done)
+    })
+
+    it('should return 404 on deleting .acl of previously deleted PUT file with bad extension and with ACL', function (done) {
+      server.delete('/put-resource-with-acl.txt.acl')
+        .expect(404, done)
+    })
+
     it('should fail to delete non-empty containers', function (done) {
       server.delete('/delete-test-non-empty/')
         .expect(409, done)
     })
 
-    it('should delete a new and empty container - with file.acl', function (done) {
+    it('should delete a new and empty container - with .meta.acl', function (done) {
       server.delete('/delete-test-empty-container/')
         .end(() => {
           server.get('/delete-test-empty-container/')

test/integration/ldp-test.js

@@ -170,16 +170,22 @@ describe('LDP', function () {
       return assert.isRejected(ldp.delete('/resources/testPut.txt'))
     })
 
-    it.skip('should delete a file in an existing dir', async () => {
+    it.skip('should delete a file with ACL in an existing dir', async () => {
       // First create a dummy file
       var stream = stringToStream('hello world')
       await ldp.put('/resources/testPut.txt', stream, 'text/plain')
+      await ldp.put('/resources/testPut.txt.acl', stream, 'text/turtle')
       // Make sure it exists
       fs.stat(ldp.resourceMapper._rootPath + '/resources/testPut.txt', function (err) {
         if (err) {
           throw err
         }
       })
+      fs.stat(ldp.resourceMapper._rootPath + '/resources/testPut.txt.acl', function (err) {
+        if (err) {
+          throw err
+        }
+      })
 
       // Now delete the dummy file
       await ldp.delete('/resources/testPut.txt')
@@ -189,6 +195,11 @@ describe('LDP', function () {
           throw new Error('file still exists')
         }
       })
+      fs.stat(ldp.resourceMapper._rootPath + '/resources/testPut.txt.acl', function (err, s) {
+        if (!err) {
+          throw new Error('file still exists')
+        }
+      })
     })
 
     it.skip('should fail to delete a non-empty folder', async () => {