multihashes may be followed by sub-path strings (#495)

ipfs-inactive · Dec 25, 2016 · c9df6c3 · c9df6c3
1 parent bb1c292
commit c9df6c3
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/clean-multihash.js b/src/clean-multihash.js
@@ -4,11 +4,14 @@ const bs58 = require('bs58')
 const isIPFS = require('is-ipfs')
 
 module.exports = function (multihash) {
-  if (!isIPFS.multihash(multihash)) {
-    throw new Error('not valid multihash')
-  }
   if (Buffer.isBuffer(multihash)) {
-    return bs58.encode(multihash)
+    multihash = bs58.encode(multihash)
+  }
+  if (typeof multihash !== 'string') {
+    throw new Error('unexpected multihash type: ' + typeof multihash)
+  }
+  if (!isIPFS.multihash(multihash.split('/')[0])) {
+    throw new Error('not valid multihash')
   }
   return multihash
 }