fix: handle subdomains for ipfs.dns (#1933)

ipfs · Mar 20, 2019 · 29072a5 · 29072a5
1 parent 6692d9c
commit 29072a5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/core/runtime/dns-nodejs.js b/src/core/runtime/dns-nodejs.js
@@ -7,8 +7,8 @@ const errcode = require('err-code')
 module.exports = (domain, opts, callback) => {
   resolveDnslink(domain)
     .catch(err => {
-      // If the code is not ENOTFOUND or ERR_DNSLINK_NOT_FOUND then throw the error
-      if (err.code !== 'ENOTFOUND' && err.code !== 'ERR_DNSLINK_NOT_FOUND') throw err
+      // If the code is not ENOTFOUND or ERR_DNSLINK_NOT_FOUND or ENODATA then throw the error
+      if (err.code !== 'ENOTFOUND' && err.code !== 'ERR_DNSLINK_NOT_FOUND' && err.code !== 'ENODATA') throw err
 
       if (domain.startsWith('_dnslink.')) {
         // The supplied domain contains a _dnslink component

diff --git a/test/cli/dns.js b/test/cli/dns.js
@@ -27,4 +27,20 @@ describe('dns', () => runOnAndOff((thing) => {
       expect(res.substr(0, 6)).to.eql('/ipns/')
     })
   })
+
+  it('resolve subdomain docs.ipfs.io dns', function () {
+    this.timeout(60 * 1000)
+
+    return ipfs('dns docs.ipfs.io').then(res => {
+      expect(res.substr(0, 6)).to.eql('/ipfs/')
+    })
+  })
+
+  it('resolve subdomain _dnslink.docs.ipfs.io dns', function () {
+    this.timeout(60 * 1000)
+
+    return ipfs('dns _dnslink.docs.ipfs.io').then(res => {
+      expect(res.substr(0, 6)).to.eql('/ipfs/')
+    })
+  })
 }))