From eec33d2f62acfa78d913c191b7862c52c0ab5ee4 Mon Sep 17 00:00:00 2001 From: Javier Perez-Griffo Date: Mon, 29 Apr 2013 18:25:59 +0200 Subject: [PATCH 1/5] Inclusion of type SPF records --- README.md | 2 ++ dns.js | 2 ++ lib/client.js | 9 +++++++++ test/client.js | 11 +++++++++++ 4 files changed, 24 insertions(+) diff --git a/README.md b/README.md index fa526c8..03ae306 100644 --- a/README.md +++ b/README.md @@ -251,6 +251,8 @@ Available Types: - `exchange` -- string * `TXT` - `data` -- string + * `SPF` + - `data` -- string * `SRV` - `priority` -- number - `weight` -- number diff --git a/dns.js b/dns.js index 8b207c4..f91b963 100644 --- a/dns.js +++ b/dns.js @@ -33,6 +33,7 @@ exports.resolve4 = client.resolve4; exports.resolve6 = client.resolve6; exports.resolveMx = client.resolveMx; exports.resolveTxt = client.resolveTxt; +exports.resolveSpf = client.resolveSpf; exports.resolveSrv = client.resolveSrv; exports.resolveNs = client.resolveNs; exports.resolveCname = client.resolveCname; @@ -61,6 +62,7 @@ var definedTypes = [ 'PTR', 'NAPTR', 'TXT', + 'SPF', 'MX', 'SRV', 'SOA', diff --git a/lib/client.js b/lib/client.js index edabf63..2319380 100644 --- a/lib/client.js +++ b/lib/client.js @@ -34,6 +34,7 @@ var A = consts.NAME_TO_QTYPE.A, AAAA = consts.NAME_TO_QTYPE.AAAA, MX = consts.NAME_TO_QTYPE.MX, TXT = consts.NAME_TO_QTYPE.TXT, + SPV = consts.NAME_TO_QTYPE.SPF, NS = consts.NAME_TO_QTYPE.NS, CNAME = consts.NAME_TO_QTYPE.CNAME, SRV = consts.NAME_TO_QTYPE.SRV, @@ -440,6 +441,7 @@ var resolve = function(domain, rrtype, ip, callback) { }); break; case TXT: + case SPF: case NS: case CNAME: case PTR: @@ -499,6 +501,13 @@ var resolveTxt = function(domain, callback) { }; exports.resolveTxt = resolveTxt; +var resolveSpf = function(domain, callback) { + return resolve(domain, 'SPF', function(err, results) { + callback(err, results); + }); +}; +exports.resolveSpf = resolveSpf; + var resolveSrv = function(domain, callback) { return resolve(domain, 'SRV', function(err, results) { callback(err, results); diff --git a/test/client.js b/test/client.js index 625a949..7dc1eca 100644 --- a/test/client.js +++ b/test/client.js @@ -258,6 +258,17 @@ exports.resolveTxt = function (test) { checkWrap(test, req); }; +exports.resolveSpf = function (test) { + var req = dns.resolveSpf('google.com', function(err, records) { + test.ifError(err); + test.equal(records.length, 1); + test.equal(records[0].indexOf('v=spf1'), 0); + test.done(); + }); + + checkWrap(test, req); +}; + exports.lookup_ipv4_explicit = function (test) { var req = dns.lookup('www.google.com', 4, function(err, ip, family) { From b9e5288297a53d31d3bd38eefb3cb73aa51c167d Mon Sep 17 00:00:00 2001 From: Javier Perez-Griffo Date: Fri, 31 May 2013 15:15:23 +0200 Subject: [PATCH 2/5] Problems with native-dns-packet upgrade to 0.0.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2253d7d..6f5a45e 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "dependencies": { "ipaddr.js": ">= 0.1.1", "native-dns-cache": ">= 0.0.1", - "native-dns-packet": ">= 0.0.1" + "native-dns-packet": "~0.0.2" }, "devDependencies": { "optimist": "", From 4f9db814c8c0310b3b5d627db6931479a54bd657 Mon Sep 17 00:00:00 2001 From: Javier Perez-Griffo Date: Fri, 31 May 2013 15:17:41 +0200 Subject: [PATCH 3/5] Problems with native-dns-packet upgrade to 0.0.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f5a45e..c61a38c 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "dependencies": { "ipaddr.js": ">= 0.1.1", "native-dns-cache": ">= 0.0.1", - "native-dns-packet": "~0.0.2" + "native-dns-packet": "~0.0.1" }, "devDependencies": { "optimist": "", From 96b34b647608d2d11d1df0dcfed887e3834d4bed Mon Sep 17 00:00:00 2001 From: Javier Perez-Griffo Date: Fri, 31 May 2013 15:19:55 +0200 Subject: [PATCH 4/5] Trying to lock down native-dns-packet to version 0.0.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c61a38c..95468b4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "native-dns", - "version": "0.5.0", + "version": "0.5.1", "author": "Timothy J Fontaine (http://atxconsulting.com)", "description": "Replacement for the core DNS module, includes server implementation", "keywords": [ @@ -25,7 +25,7 @@ }, "dependencies": { "ipaddr.js": ">= 0.1.1", - "native-dns-cache": ">= 0.0.1", + "native-dns-cache": "~0.0.1", "native-dns-packet": "~0.0.1" }, "devDependencies": { From d9746bbaec7f7206e0b5e79ef208c602b99f8954 Mon Sep 17 00:00:00 2001 From: Javier Perez-Griffo Date: Fri, 31 May 2013 15:21:34 +0200 Subject: [PATCH 5/5] Trying to lock down native-dns-packet to version 0.0.1 --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 95468b4..4883c15 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "native-dns", - "version": "0.5.1", + "version": "0.5.2", "author": "Timothy J Fontaine (http://atxconsulting.com)", "description": "Replacement for the core DNS module, includes server implementation", "keywords": [ @@ -25,8 +25,8 @@ }, "dependencies": { "ipaddr.js": ">= 0.1.1", - "native-dns-cache": "~0.0.1", - "native-dns-packet": "~0.0.1" + "native-dns-cache": "0.0.1", + "native-dns-packet": "0.0.1" }, "devDependencies": { "optimist": "",