Merge pull request nodeSolidServer#147 from nicola/solid-acl

Andrei · Andrei · commit 3d809ec9fa82 · 2015-12-22T13:38:51.000+02:00
New ACL
diff --git a/lib/acl.js b/lib/acl.js
diff --git a/lib/ldp-middleware.js b/lib/ldp-middleware.js
@@ -37,11 +37,12 @@ function LdpMiddleware (corsSettings) {
     router.use('/*', login.loginHandler);
 
     //ACL handlers
-    router.get("/*", acl.allowReadHandler);
-    router.post("/*", acl.allowAppendThenWriteHandler);
-    router.patch("/*", acl.allowAppendThenWriteHandler);
-    router.put("/*", acl.allowAppendThenWriteHandler);
-    router.delete("/*", acl.allowWriteHandler);
+    router.get("/*", acl.allow('Read'));
+    router.head("/*", acl.allow('Read'));
+    router.post("/*", acl.allow('Append'));
+    router.patch("/*", acl.allow('Append'));
+    router.put("/*", acl.allow('Append'));
+    router.delete("/*", acl.allow('Write'));
 
     // Convert json-ld and nquads to turtle
     router.use('/*', parse.parseHandler);
diff --git a/lib/ldp.js b/lib/ldp.js
@@ -328,15 +328,15 @@ LDP.prototype.put = function (filePath, contents, callback) {
   mkdirp(path.dirname(filePath), function (err) {
       if (err) {
           debug.handlers("PUT -- Error creating directory: " + err);
-          return callback(new HTTPError({
+          return callback(new HttpError({
             status: err.code === 'ENOENT' ? 404 : 500,
             message: err.message
           }));
       }
       return fs.writeFile(filePath, contents, function() {
         if (err) {
           debug.handlers("PUT -- Error writing file: " + err);
-          return callback(new HTTPError({
+          return callback(new HttpError({
             status: err.code === 'ENOENT' ? 404 : 500,
             message: err.message
           }));
diff --git a/package.json b/package.json
@@ -42,10 +42,11 @@
     "node-uuid": "^1.4.3",
     "nomnom": "^1.8.1",
     "raw-body": "^2.1.2",
-    "rdflib": "^0.2.9",
+    "rdflib": "^0.2.10",
     "redis": "^0.12.1",
     "request": "^2.58.0",
     "response-time": "^2.3.1",
+    "solid-acl": "^1.0.1",
     "solid-ws": "^0.2.0",
     "string": "^3.3.0",
     "webid": "^0.3.1"
diff --git a/test/acl.js b/test/acl.js
diff --git a/test/resources/acl/append-acl/abc.ttl b/test/resources/acl/append-acl/abc.ttl
@@ -0,0 +1 @@
+<g> <h> <i> .
diff --git a/test/resources/acl/append-acl/abc.ttl.acl b/test/resources/acl/append-acl/abc.ttl.acl
@@ -0,0 +1,8 @@
+<#Owner>
+ <http://www.w3.org/ns/auth/acl#accessTo> <./abc.ttl>;
+ <http://www.w3.org/ns/auth/acl#agent> <https://user1.databox.me/profile/card#me>;
+ <http://www.w3.org/ns/auth/acl#mode> <http://www.w3.org/ns/auth/acl#Read>, <http://www.w3.org/ns/auth/acl#Write>, <http://www.w3.org/ns/auth/acl#Control> .
+<#AppendOnly>
+ <http://www.w3.org/ns/auth/acl#accessTo> <./abc.ttl>;
+ <http://www.w3.org/ns/auth/acl#agentClass> <http://xmlns.com/foaf/0.1/Agent>;
+ <http://www.w3.org/ns/auth/acl#mode> <http://www.w3.org/ns/auth/acl#Append> .
diff --git a/test/resources/acl/append-acl/abc2.ttl b/test/resources/acl/append-acl/abc2.ttl
@@ -0,0 +1 @@
+<d> <e> <f> .
diff --git a/test/resources/acl/append-acl/abc2.ttl.acl b/test/resources/acl/append-acl/abc2.ttl.acl
@@ -0,0 +1,8 @@
+<#Owner>
+ <http://www.w3.org/ns/auth/acl#accessTo> <./abc2.ttl>;
+ <http://www.w3.org/ns/auth/acl#agent> <https://user1.databox.me/profile/card#me>;
+ <http://www.w3.org/ns/auth/acl#mode> <http://www.w3.org/ns/auth/acl#Read>, <http://www.w3.org/ns/auth/acl#Write>, <http://www.w3.org/ns/auth/acl#Control> .
+<#Restricted>
+ <http://www.w3.org/ns/auth/acl#accessTo> <./abc2.ttl>;
+ <http://www.w3.org/ns/auth/acl#agent> <https://user2.databox.me/profile/card#me>;
+ <http://www.w3.org/ns/auth/acl#mode> <http://www.w3.org/ns/auth/acl#Read>, <http://www.w3.org/ns/auth/acl#Write>.
diff --git a/test/resources/acl/empty-acl/.acl b/test/resources/acl/empty-acl/.acl
diff --git a/test/resources/acl/no-acl/test-file.html b/test/resources/acl/no-acl/test-file.html
@@ -0,0 +1 @@
+test-file.html
diff --git a/test/resources/acl/origin/.acl b/test/resources/acl/origin/.acl
@@ -0,0 +1,4 @@
+<#0>
+  <http://www.w3.org/ns/auth/acl#defaultForNew> <./> ;
+  <http://www.w3.org/ns/auth/acl#agent> <https://user1.databox.me/profile/card#me> ;
+  <http://www.w3.org/ns/auth/acl#mode> <http://www.w3.org/ns/auth/acl#Write>, <http://www.w3.org/ns/auth/acl#Control>.
diff --git a/test/resources/acl/read-acl/.acl b/test/resources/acl/read-acl/.acl
@@ -0,0 +1,10 @@
+<#Owner>
+ a <http://www.w3.org/ns/auth/acl#Authorization> ;
+ <http://www.w3.org/ns/auth/acl#accessTo> <./>;
+ <http://www.w3.org/ns/auth/acl#agent> <https://user1.databox.me/profile/card#me>;
+ <http://www.w3.org/ns/auth/acl#mode> <http://www.w3.org/ns/auth/acl#Read>, <http://www.w3.org/ns/auth/acl#Write>, <http://www.w3.org/ns/auth/acl#Control> .
+<#Public>
+ a <http://www.w3.org/ns/auth/acl#Authorization> ;
+ <http://www.w3.org/ns/auth/acl#accessTo> <./>;
+ <http://www.w3.org/ns/auth/acl#agentClass> <http://xmlns.com/foaf/0.1/Agent>;
+ <http://www.w3.org/ns/auth/acl#mode> <http://www.w3.org/ns/auth/acl#Read> .
diff --git a/test/resources/acl/write-acl/.acl b/test/resources/acl/write-acl/.acl
@@ -0,0 +1,4 @@
+<#0>
+  <http://www.w3.org/ns/auth/acl#defaultForNew> <./> ;
+  <http://www.w3.org/ns/auth/acl#agent> <https://user1.databox.me/profile/card#me> ;
+  <http://www.w3.org/ns/auth/acl#mode> <http://www.w3.org/ns/auth/acl#Write>, <http://www.w3.org/ns/auth/acl#Control>.
diff --git a/test/resources/acl/write-acl/empty-acl/.acl b/test/resources/acl/write-acl/empty-acl/.acl
