Failing LDP tests

Author: kjetilk

lib/ldp.js

@@ -10,6 +10,7 @@ const utils = require('./utils')
 const error = require('./http-error')
 const stringToStream = require('./utils').stringToStream
 const serialize = require('./utils').serialize
+const overQuota = require('./utils').overQuota
 const extend = require('extend')
 const rimraf = require('rimraf')
 const ldpContainer = require('./ldp-container')
@@ -266,24 +267,33 @@ class LDP {
       return callback(error(409,
         'PUT not supported on containers, use POST instead'))
     }
-    // First, create the enclosing directory, if necessary
-    const dirName = path.dirname(filePath)
-    mkdirp(dirName, (err) => {
-      if (err) {
-        debug.handlers('PUT -- Error creating directory: ' + err)
-        return callback(error(err,
-          'Failed to create the path to the new resource'))
+
+    // First check if we are above quota
+    overQuota(root, this.serverUri).then((isOverQuota) => {
+      if (isOverQuota) {
+        return callback(error(413,
+          'User has exceeded their storage quota'))
       }
-      // Directory created, now write the file
-      const file = stream.pipe(fs.createWriteStream(filePath))
-      file.on('error', function () {
-        callback(error(500, 'Error writing data'))
-      })
-      file.on('finish', function () {
-        debug.handlers('PUT -- Wrote data to: ' + filePath)
-        callback(null)
+
+      // Second, create the enclosing directory, if necessary
+      const dirName = path.dirname(filePath)
+      mkdirp(dirName, (err) => {
+        if (err) {
+          debug.handlers('PUT -- Error creating directory: ' + err)
+          return callback(error(err,
+            'Failed to create the path to the new resource'))
+        }
+        // Directory created, now write the file
+        const file = stream.pipe(fs.createWriteStream(filePath))
+        file.on('error', function () {
+          callback(error(500, 'Error writing data'))
+        })
+        file.on('finish', function () {
+          debug.handlers('PUT -- Wrote data to: ' + filePath)
+          callback(null)
+        })
       })
-    })
+    }).catch(() => { throw error(500, 'Error finding user quota') })
   }
 
   exists (hostname, path, callback) {

lib/utils.js

@@ -299,6 +299,7 @@ async function overQuota (root, serverUri) {
   }
   // TODO: cache this value?
   var size = await actualSize(root)
+  console.log(size, quota)
   return (size > quota)
 }
 

package.json

@@ -101,7 +101,8 @@
     "snyk": "^1.88.2",
     "standard": "^8.6.0",
     "supertest": "^3.0.0",
-    "whatwg-url": "^6.1.0"
+    "whatwg-url": "^6.1.0",
+    "randombytes": "^2.0.1"
   },
   "main": "index.js",
   "scripts": {

test/integration/ldp-test.js

@@ -4,6 +4,7 @@ var ns = require('solid-namespace')($rdf)
 var LDP = require('../../lib/ldp')
 var path = require('path')
 var stringToStream = require('../../lib/utils').stringToStream
+var randomBytes = require('randombytes')
 
 // Helper functions for the FS
 var rm = require('./../utils').rm
@@ -15,6 +16,7 @@ var fs = require('fs')
 describe('LDP', function () {
   var ldp = new LDP({
     root: path.join(__dirname, '..'),
+    serverUri: 'https://localhost',
     webid: false
   })
 
@@ -133,6 +135,23 @@ describe('LDP', function () {
         done()
       })
     })
+
+    it('Write a larger file', function (done) {
+      var randstream = stringToStream(randomBytes(2100))
+      ldp.put('localhost', '/resources/testQuota.txt', randstream, function (err) {
+        console.log(err)
+        assert.notOk(err)
+        done()
+      })
+    })
+    it('should fail if a over quota', function (done) {
+      var hellostream = stringToStream('hello world')
+      ldp.put('localhost', '/resources/testOverQuota.txt', hellostream, function (err) {
+        console.log(err)
+        assert.equal(err.status, 413)
+        done()
+      })
+    })
   })
 
   describe('delete', function () {

test/settings/serverSide.ttl

@@ -0,0 +1,13 @@
+@prefix dct: <http://purl.org/dc/terms/>.
+@prefix pim: <http://www.w3.org/ns/pim/space#>.
+@prefix solid: <http://www.w3.org/ns/solid/terms#>.
+@prefix unit: <http://www.w3.invalid/ns#>.
+
+<>
+  a pim:ConfigurationFile;
+
+  dct:description "Administrative settings for the server that are only readable to the user." .
+
+</>
+    solid:storageQuota "1230"^^unit:kilobyte .
+