.meta and remove mashlib hack (#1563)

* check .meta and remove mashlib patch

* cleaning

* remove mashlib patch

* add bach charlie card

Author: bourgeoa

lib/handlers/put.js

@@ -5,15 +5,16 @@ const debug = require('debug')('solid:put')
 const getContentType = require('../utils').getContentType
 const HTTPError = require('../http-error')
 const { stringToStream } = require('../utils')
-const LDP = require('../ldp')
 
 async function handler (req, res, next) {
   debug(req.originalUrl)
   res.header('MS-Author-Via', 'SPARQL')
 
   const contentType = req.get('content-type')
-  if (LDP.mimeTypeIsRdf(contentType) && isAclFile(req)) {
-    return bodyParser.text({ type: () => true })(req, res, () => putAcl(req, res, next))
+  if (isAuxiliary(req)) {
+    if (contentType === 'text/turtle') {
+      return bodyParser.text({ type: () => true })(req, res, () => putAuxiliary(req, res, next))
+    } else return next(new HTTPError(415, 'RDF file contains invalid syntax'))
   }
   return putStream(req, res, next)
 }
@@ -34,7 +35,9 @@ async function putStream (req, res, next, stream = req) {
   }
 }
 
-function putAcl (req, res, next) {
+// needed to avoid breaking access with bad acl
+// or breaking containement triples for meta
+function putAuxiliary (req, res, next) {
   const ldp = req.app.locals.ldp
   const contentType = req.get('content-type')
   const requestUri = ldp.resourceMapper.getRequestUrl(req)
@@ -46,7 +49,8 @@ function putAcl (req, res, next) {
   next(new HTTPError(400, 'RDF file contains invalid syntax'))
 }
 
-function isAclFile (req) {
+function isAuxiliary (req) {
   const originalUrlParts = req.originalUrl.split('.')
-  return originalUrlParts[originalUrlParts.length - 1] === 'acl'
+  const ext = originalUrlParts[originalUrlParts.length - 1]
+  return (ext === 'acl' || ext === 'meta')
 }

lib/ldp.js

@@ -45,11 +45,6 @@ class LDP {
   constructor (argv = {}) {
     extend(this, argv)
 
-    // Acl contentType
-    if (!this.aclContentType) {
-      this.aclContentType = 'text/turtle'
-    }
-
     // Suffixes
     if (!this.suffixAcl) {
       this.suffixAcl = suffixAcl
@@ -242,9 +237,6 @@ class LDP {
   async put (url, stream, contentType) {
     const container = (url.url || url).endsWith('/')
 
-    // mashlib patch
-    if ((url.url || url).endsWith('.dummy')) contentType = 'text/turtle'
-
     // PUT without content type is forbidden, unless PUTting container
     if (!contentType && !container) {
       throw error(400,
@@ -254,11 +246,6 @@ class LDP {
     // check if a folder or file with same name exists
     await this.checkItemName(url)
 
-    // not to break pod : url ACL must have text/turtle contentType
-    if ((url.url || url).endsWith(this.suffixAcl) && contentType !== this.aclContentType) {
-      throw error(415, 'PUT contentType for ACL must be text-turtle')
-    }
-
     // First check if we are above quota
     let isOverQuota
     // Someone had a reason to make url actually a req sometimes but not
@@ -273,7 +260,7 @@ class LDP {
       throw error(413, 'User has exceeded their storage quota')
     }
 
-    // Create folder using folder/.meta. This is Hack to find folder path
+    // Set url using folder/.meta. This is Hack to find folder path
     if (container) {
       if (typeof url !== 'string') {
         url.url = url.url + suffixMeta

test/integration/http-test.js

@@ -486,6 +486,24 @@ describe('HTTP APIs', function () {
         .set('content-type', 'text/plain')
         .expect(415, done)
     })
+    it('should reject create .acl resource, if body is not valid turtle', function (done) {
+      server.put('/put-resource-1.acl')
+        .send('bad turtle content')
+        .set('content-type', 'text/turtle')
+        .expect(400, done)
+    })
+    it('should reject create .meta resource, if contentType not text/turtle', function (done) {
+      server.put('/.meta')
+        .send(putRequestBody)
+        .set('content-type', 'text/plain')
+        .expect(415, done)
+    })
+    it('should reject create .meta resource, if body is not valid turtle', function (done) {
+      server.put('/.meta')
+        .send(JSON.stringify({}))
+        .set('content-type', 'text/turtle')
+        .expect(400, done)
+    })
     it('should create directories if they do not exist', function (done) {
       server.put('/foo/bar/baz.ttl')
         .send(putRequestBody)

test/integration/ldp-test.js

@@ -177,13 +177,6 @@ describe('LDP', function () {
         assert.equal(err.status, 400)
       })
     })
-
-    it('should fail if file.acl and content type not text/turtle', () => {
-      const stream = stringToStream('hello world')
-      return ldp.put('/resources/testPut.txt.acl', stream, 'text/plain').catch(err => {
-        assert.equal(err.status, 415)
-      })
-    })
   })
 
   describe('delete', function () {