Improve input checking on "add".

ipfs-inactive · May 24, 2016 · 7835215 · 7835215
1 parent 29c2c83
commit 7835215
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/package.json b/package.json
@@ -13,6 +13,7 @@
     "flatmap": "0.0.3",
     "glob": "^7.0.3",
     "ipfs-merkle-dag": "^0.6.0",
+    "isstream": "^0.1.2",
     "multiaddr": "^2.0.0",
     "multipart-stream": "^2.0.1",
     "ndjson": "^1.4.3",

diff --git a/src/api/add.js b/src/api/add.js
@@ -1,5 +1,6 @@
 'use strict'
 
+const isStream = require('isstream')
 const Wreck = require('wreck')
 const addToDagNodesTransform = require('../add-to-dagnode-transform')
 
@@ -10,6 +11,14 @@ module.exports = (send) => {
       opts = {}
     }
 
+    var good = Buffer.isBuffer(files) ||
+               isStream.isReadable(files) ||
+               Array.isArray(files)
+
+    if (!good) {
+      return cb(new Error('"files" must be a buffer, readable stream, or array of objects'))
+    }
+
     var sendWithTransform = send.withTransform(addToDagNodesTransform)
 
     return sendWithTransform('add', null, opts, files, cb)