diff --git a/src/dns/cloudflare.js b/src/dns/cloudflare.js index 877f8ed83..bfdba65f8 100644 --- a/src/dns/cloudflare.js +++ b/src/dns/cloudflare.js @@ -243,7 +243,7 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) { if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here - dns.resolveNs(zoneName, function (error, nameservers) { + dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) { if (error && error.code === 'ENOTFOUND') return callback(new DomainError(DomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain')); if (error || !nameservers) return callback(new DomainError(DomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers')); diff --git a/src/dns/digitalocean.js b/src/dns/digitalocean.js index 63540487d..02faad88f 100644 --- a/src/dns/digitalocean.js +++ b/src/dns/digitalocean.js @@ -210,7 +210,7 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) { if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here - dns.resolveNs(zoneName, function (error, nameservers) { + dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) { if (error && error.code === 'ENOTFOUND') return callback(new DomainError(DomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain')); if (error || !nameservers) return callback(new DomainError(DomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers')); diff --git a/src/dns/gcdns.js b/src/dns/gcdns.js index 1fefa2569..f63681558 100644 --- a/src/dns/gcdns.js +++ b/src/dns/gcdns.js @@ -172,7 +172,7 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) { var credentials = getDnsCredentials(dnsConfig); if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here - dns.resolveNs(zoneName, function (error, resolvedNS) { + dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) { if (error && error.code === 'ENOTFOUND') return callback(new DomainError(DomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain')); if (error || !resolvedNS) return callback(new DomainError(DomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers')); diff --git a/src/dns/manual.js b/src/dns/manual.js index 9dfe43ecb..524505ec5 100644 --- a/src/dns/manual.js +++ b/src/dns/manual.js @@ -56,7 +56,7 @@ function verifyDnsConfig(dnsConfig, domain, zoneName, ip, callback) { assert.strictEqual(typeof callback, 'function'); // Very basic check if the nameservers can be fetched - dns.resolveNs(zoneName, function (error, nameservers) { + dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) { if (error || !nameservers) return callback(new DomainError(DomainError.BAD_FIELD, 'Unable to get nameservers')); callback(null, { wildcard: !!dnsConfig.wildcard }); diff --git a/src/dns/route53.js b/src/dns/route53.js index eb999265e..7dfd4e852 100644 --- a/src/dns/route53.js +++ b/src/dns/route53.js @@ -233,7 +233,7 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) { if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here - dns.resolveNs(zoneName, function (error, nameservers) { + dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) { if (error && error.code === 'ENOTFOUND') return callback(new DomainError(DomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain')); if (error || !nameservers) return callback(new DomainError(DomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers')); diff --git a/src/dns/waitfordns.js b/src/dns/waitfordns.js index bb1a296cb..f9fba81be 100644 --- a/src/dns/waitfordns.js +++ b/src/dns/waitfordns.js @@ -65,7 +65,7 @@ function waitForDns(domain, zoneName, value, options, callback) { async.retry(options, function (retryCallback) { debug('waitForDNS: %s (zone: %s) attempt %s.', domain, zoneName, attempt++); - dns.resolveNs(zoneName, function (error, nameservers) { + dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) { if (error || !nameservers) return retryCallback(error || new DomainError(DomainError.EXTERNAL_ERROR, 'Unable to get nameservers')); async.every(nameservers, isChangeSynced.bind(null, domain, value), function (error, synced) { diff --git a/src/native-dns.js b/src/native-dns.js index 7e0b978b7..91a1aea50 100644 --- a/src/native-dns.js +++ b/src/native-dns.js @@ -1,7 +1,6 @@ 'use strict'; exports = module.exports = { - resolveNs: resolveNs, resolve4: resolve4, resolve: resolve }; @@ -36,10 +35,6 @@ function resolve(hostname, rrtype, options, callback) { }); } -function resolveNs(hostname, callback) { - resolve(hostname, 'NS', { timeout: 5000 }, callback); -} - function resolve4(hostname, callback) { resolve(hostname, 'A', { timeout: 5000 }, callback); }