fix: Fix false positives in isLink and update test (#51)

* Fix false positives in isLink and update test * isLink - test both blank and non-blank non-CID cases
ipld · Jan 7, 2018 · 73b21c7 · 73b21c7
1 parent ea7eea2
commit 73b21c7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/resolver.js b/src/resolver.js
@@ -1,6 +1,7 @@
 'use strict'
 
 const waterfall = require('async/waterfall')
+const CID = require('cids')
 
 const util = require('./util')
 
@@ -117,9 +118,17 @@ exports.isLink = (block, path, callback) => {
     }
 
     if (typeof result.value === 'object' && result.value['/']) {
-      callback(null, result.value)
-    } else {
-      callback(null, false)
+      let valid
+      try {
+        valid = CID.isCID(new CID(result.value['/']))
+      } catch (err) {
+        valid = false
+      }
+      if (valid) {
+        return callback(null, result.value)
+      }
     }
+
+    callback(null, false)
   })
 }
diff --git a/test/resolver.spec.js b/test/resolver.spec.js
@@ -228,10 +228,16 @@ describe('IPLD Format resolver (local)', () => {
   })
 
   it('resolver.isLink for non valid CID', (done) => {
+    // blank value case
     resolver.isLink(dataLinksNodeBlock, 'Links/0/Name', (err, link) => {
       expect(err).to.not.exist()
       expect(link).to.equal(false)
-      done()
+      // non-blank value case
+      resolver.isLink(dataLinksNodeBlock, 'Links/0/Tsize', (err, link) => {
+        expect(err).to.not.exist()
+        expect(link).to.equal(false)
+        done()
+      })
     })
   })
 })