Syntactically and structurally validate patches.

Author: RubenVerborgh

lib/handlers/patch.js

@@ -43,7 +43,7 @@ function patchHandler (req, res, next) {
   // Find the appropriate patcher for the given content type
   const patchGraph = PATCHERS[patch.contentType]
   if (!patchGraph) {
-    return next(error(415, 'Unknown patch content type: ' + patch.contentType))
+    return next(error(415, 'Unsupported patch content type: ' + patch.contentType))
   }
 
   // Read the RDF graph to be patched from the file

lib/handlers/patch/n3-patcher.js

@@ -28,20 +28,26 @@ function parsePatchDocument (targetURI, patchURI, patchText, patchKB) {
     $rdf.parse(patchText, patchGraph, patchURI, 'text/n3')
     resolve(patchGraph)
   })
+  .catch(err => { throw error(400, `Invalid patch document: ${err}`) })
+
   // Query the N3 document for insertions and deletions
   .then(patchGraph => queryForFirstResult(patchGraph, `${PREFIXES}
     SELECT ?insert ?delete WHERE {
       ?patch p:patches <${targetURI}>.
       OPTIONAL { ?patch p:insert ?insert. }
       OPTIONAL { ?patch p:delete ?delete. }
     }`)
+    .catch(err => { throw error(400, `No patch for ${targetURI} found.`, err) })
   )
+
   // Return the insertions and deletions as an rdflib patch document
   .then(result => {
-    return {
-      insert: result['?insert'],
-      delete: result['?delete']
+    const inserts = result['?insert']
+    const deletes = result['?delete']
+    if (!inserts && !deletes) {
+      throw error(400, 'Patch should at least contain inserts or deletes.')
     }
+    return {insert: inserts, delete: deletes}
   })
 }
 
@@ -63,6 +69,6 @@ function applyPatch (patchObject, target, targetKB) {
 function queryForFirstResult (store, sparql) {
   return new Promise((resolve, reject) => {
     const query = $rdf.SPARQLToQuery(sparql, false, store)
-    store.query(query, resolve)
+    store.query(query, resolve, null, () => reject(new Error('No results.')))
   })
 }

test/integration/patch.js

@@ -1,4 +1,4 @@
-// Integration tests for PATCH
+// Integration tests for PATCH with text/n3
 const assert = require('chai').assert
 const ldnode = require('../../index')
 const path = require('path')
@@ -43,6 +43,62 @@ describe('PATCH', () => {
         })
     )
   })
+
+  describe('with an unsupported request content type', () => {
+    it('returns a 415', () =>
+      request.patch(`/read-write.ttl`)
+        .set('Authorization', `Bearer ${userCredentials}`)
+        .set('Content-Type', 'text/other')
+        .send('other content type')
+        .expect(415)
+        .then(response => {
+          assert.include(response.text, 'Unsupported patch content type: text/other')
+        })
+    )
+  })
+
+  describe('with a patch document containing invalid syntax', () => {
+    it('returns a 400', () =>
+      request.patch(`/read-write.ttl`)
+        .set('Authorization', `Bearer ${userCredentials}`)
+        .set('Content-Type', 'text/n3')
+        .send('invalid')
+        .expect(400)
+        .then(response => {
+          assert.include(response.text, 'Invalid patch document')
+        })
+    )
+  })
+
+  describe('with a patch document without relevant patch element', () => {
+    it('returns a 400', () =>
+      request.patch(`/read-write.ttl`)
+        .set('Authorization', `Bearer ${userCredentials}`)
+        .set('Content-Type', 'text/n3')
+        .send(n3Patch(`
+          <> a p:Patch.`
+        ))
+        .expect(400)
+        .then(response => {
+          assert.include(response.text, 'No patch for https://tim.localhost:7777/read-write.ttl found')
+        })
+    )
+  })
+
+  describe('with a patch document without insert and without deletes', () => {
+    it('returns a 400', () =>
+      request.patch(`/read-write.ttl`)
+        .set('Authorization', `Bearer ${userCredentials}`)
+        .set('Content-Type', 'text/n3')
+        .send(n3Patch(`
+          <> p:patches <https://tim.localhost:7777/read-write.ttl>.`
+        ))
+        .expect(400)
+        .then(response => {
+          assert.include(response.text, 'Patch should at least contain inserts or deletes')
+        })
+    )
+  })
 })
 
 function n3Patch (contents) {

test/resources/patch/tim.localhost/read-write.ttl

@@ -0,0 +1 @@
+<a> <b> <c>.

test/resources/patch/tim.localhost/read-write.ttl.acl

@@ -0,0 +1,6 @@
+@prefix acl: <http://www.w3.org/ns/auth/acl#>.
+
+<#Owner> a acl:Authorization;
+  acl:accessTo <./read-write.ttl>;
+  acl:agent <https://tim.localhost:7777/profile/card#me>;
+  acl:mode acl:Read, acl:Write.