coolaj86/acme-dns-01-cli.js
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

actually check txt record

Browse Source
This commit is contained in:
AJ ONeal 2016-10-12 15:04:25 -06:00
parent b49f4a1b65
commit 714027f88b
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
index.js
View File

@ -100,7 +100,7 @@ Challenge.set = function (args, domain, challenge, keyAuthorization, done) {
console.log("Test DNS Record:"); console.log("Test DNS Record:");
console.log("dig TXT +noall +answer @ns1.redirect-www.org '" + challengeDomain + "' # " + challenge); console.log("dig TXT +noall +answer @ns1.redirect-www.org '" + challengeDomain + "' # " + challenge);
} }
done(null); done(null, keyAuthDigest);
}, function (err) { }, function (err) {
console.error(err); console.error(err);
done(err); done(err);
@ -125,6 +125,11 @@ Challenge.remove = function (defaults, domain, challenge, done) {
return me._memstore.get(domain, function (err, data) { return me._memstore.get(domain, function (err, data) {
if (err) { done(err); return; } if (err) { done(err); return; }
if (!data) {
console.warn("[warning] could not remove '" + domain + "': already removed");
done(null);
return;
}
var challengeDomain = (defaults.test || '') + defaults.acmeChallengeDns + domain; var challengeDomain = (defaults.test || '') + defaults.acmeChallengeDns + domain;
@ -153,7 +158,7 @@ Challenge.remove = function (defaults, domain, challenge, done) {
// same as get, but external // same as get, but external
Challenge.loopback = function (defaults, domain, challenge, done) { Challenge.loopback = function (defaults, domain, challenge, done) {
var challengeDomain = (defaults.test || '') + defaults.acmeChallengeDns + domain; var challengeDomain = (defaults.test || '') + defaults.acmeChallengeDns + domain;
dns.resolveTxtAsync(challengeDomain).then(function () { done(null); }, done); dns.resolveTxtAsync(challengeDomain).then(function (x) { done(null, x); }, done);
}; };
Challenge.test = function (args, domain, challenge, keyAuthorization, done) { Challenge.test = function (args, domain, challenge, keyAuthorization, done) {
@ -162,18 +167,26 @@ Challenge.test = function (args, domain, challenge, keyAuthorization, done) {
args.test = args.test || '_test.'; args.test = args.test || '_test.';
defaults.test = args.test; defaults.test = args.test;
me.set(args, domain, challenge, keyAuthorization || challenge, function (err) { me.set(args, domain, challenge, keyAuthorization || challenge, function (err, k) {
if (err) { done(err); return; } if (err) { done(err); return; }
me.loopback(defaults, domain, challenge, function (err) { me.loopback(defaults, domain, challenge, function (err, arr) {
if (err) { done(err); return; } if (err) { done(err); return; }
if (!arr.some(function (a) {
return a.some(function (keyAuthDigest) {
return keyAuthDigest === k;
});
})) {
err = new Error("txt record '" + challenge + "' doesn't match '" + k + "'");
}
me.remove(defaults, domain, challenge, function (err) { me.remove(defaults, domain, challenge, function (err) {
if (err) { done(err); return; } if (err) { done(err); return; }
// TODO needs to use native-dns so that specific nameservers can be used // TODO needs to use native-dns so that specific nameservers can be used
// (otherwise the cache will still have the old answer) // (otherwise the cache will still have the old answer)
done(); done(err || null);
/* /*
me.loopback(defaults, domain, challenge, function (err) { me.loopback(defaults, domain, challenge, function (err) {
if (err) { done(err); return; } if (err) { done(err); return; }