From 5fa530456b91aba8d14a595d3db51f055f546910 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Sun, 22 Jan 2017 21:50:04 +0100 Subject: [PATCH] update validation --- .gitignore | 1 + .npmignore | 4 +++ dist/smartacme.classes.acmecert.d.ts | 4 +-- dist/smartacme.classes.acmecert.js | 48 +++++++++++++++------------ dist/smartacme.plugins.d.ts | 3 +- dist/smartacme.plugins.js | 4 ++- package.json | 7 ++-- qenv.yml | 3 ++ test/test.js | 22 +++++++++++-- test/test.ts | 26 +++++++++++++-- ts/smartacme.classes.acmecert.ts | 49 +++++++++++++++------------- ts/smartacme.plugins.ts | 2 ++ 12 files changed, 117 insertions(+), 56 deletions(-) create mode 100644 .npmignore create mode 100644 qenv.yml diff --git a/.gitignore b/.gitignore index 3f93687..2f812b0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules/ coverage/ public/ pages/ +.nogit/ diff --git a/.npmignore b/.npmignore new file mode 100644 index 0000000..3f93687 --- /dev/null +++ b/.npmignore @@ -0,0 +1,4 @@ +node_modules/ +coverage/ +public/ +pages/ diff --git a/dist/smartacme.classes.acmecert.d.ts b/dist/smartacme.classes.acmecert.d.ts index b26aca8..47199e6 100644 --- a/dist/smartacme.classes.acmecert.d.ts +++ b/dist/smartacme.classes.acmecert.d.ts @@ -59,11 +59,11 @@ export declare class AcmeCert { /** * checks if DNS records are set, will go through a max of 30 cycles */ - checkDns(cycleArg?: number): Promise; + checkDns(cycleArg?: number): any; /** * validates a challenge, only call after you have set the challenge at the expected location */ - requestValidation(): q.Promise<{}>; + requestValidation(): Promise; /** * requests a certificate */ diff --git a/dist/smartacme.classes.acmecert.js b/dist/smartacme.classes.acmecert.js index dcac5ac..bcdd98b 100644 --- a/dist/smartacme.classes.acmecert.js +++ b/dist/smartacme.classes.acmecert.js @@ -84,42 +84,50 @@ class AcmeCert { try { myRecord = yield myDnsly.getRecord(helpers.prefixName(this.domainName), 'TXT'); console.log('DNS is set!'); + return myRecord[0][0]; } catch (err) { if (cycleArg < 30) { cycleArg++; - yield this.checkDns(cycleArg); + yield plugins.smartdelay.delayFor(2000); + return yield this.checkDns(cycleArg); } else { console.log('failed permanently...'); throw err; } } - return myRecord[0][0]; }); } /** * validates a challenge, only call after you have set the challenge at the expected location */ requestValidation() { - let done = q.defer(); - this.parentAcmeAccount.parentSmartAcme.rawacmeClient.poll(this.acceptedChallenge.uri, (err, res) => { - if (err) { - console.log(err); - done.reject(err); - } - console.log(`Validation response:`); - console.log(JSON.stringify(res.body)); - if (res.body.status === 'pending' || 'invalid') { - setTimeout(() => { - this.requestValidation().then(x => { done.resolve(x); }); - }, 2000); - } - else { - done.resolve(res.body); - } + return __awaiter(this, void 0, void 0, function* () { + console.log('give it 2 minutes to settle!'); + yield plugins.smartdelay.delayFor(10000); + let makeRequest = () => { + let done = q.defer(); + this.parentAcmeAccount.parentSmartAcme.rawacmeClient.poll(this.acceptedChallenge.uri, (err, res) => __awaiter(this, void 0, void 0, function* () { + if (err) { + console.log(err); + return; + } + console.log(`Validation response:`); + console.log(JSON.stringify(res.body)); + if (res.body.status === 'pending' || 'invalid') { + console.log('retry in 4 minutes!'); + yield plugins.smartdelay.delayFor(240000); + makeRequest().then((x) => { done.resolve(x); }); + } + else { + done.resolve(res.body); + } + })); + return done.promise; + }; + yield makeRequest(); }); - return done.promise; } /** * requests a certificate @@ -187,4 +195,4 @@ class AcmeCert { } } exports.AcmeCert = AcmeCert; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartacme.classes.acmecert.js","sourceRoot":"","sources":["../ts/smartacme.classes.acmecert.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartacme.classes.acmecert.js","sourceRoot":"","sources":["../ts/smartacme.classes.acmecert.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/smartacme.plugins.d.ts b/dist/smartacme.plugins.d.ts index 1e25dff..d19f4e3 100644 --- a/dist/smartacme.plugins.d.ts +++ b/dist/smartacme.plugins.d.ts @@ -3,6 +3,7 @@ declare let rsaKeygen: any; declare let rawacme: any; declare let nodeForge: any; import * as dnsly from 'dnsly'; +import * as smartdelay from 'smartdelay'; import * as smartfile from 'smartfile'; import * as smartstring from 'smartstring'; -export { dnsly, rsaKeygen, rawacme, nodeForge, smartfile, smartstring }; +export { dnsly, rsaKeygen, rawacme, nodeForge, smartdelay, smartfile, smartstring }; diff --git a/dist/smartacme.plugins.js b/dist/smartacme.plugins.js index 1d72bca..baa3b34 100644 --- a/dist/smartacme.plugins.js +++ b/dist/smartacme.plugins.js @@ -9,8 +9,10 @@ exports.nodeForge = nodeForge; // push.rocks modules here const dnsly = require("dnsly"); exports.dnsly = dnsly; +const smartdelay = require("smartdelay"); +exports.smartdelay = smartdelay; const smartfile = require("smartfile"); exports.smartfile = smartfile; const smartstring = require("smartstring"); exports.smartstring = smartstring; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGFjbWUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCLENBQUMsbUJBQW1CO0FBRzNDLElBQUksU0FBUyxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQSxDQUFDLGFBQWE7QUFXL0MsOEJBQVM7QUFWYixJQUFJLE9BQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUEsQ0FBQyx3QkFBd0I7QUFXckQsMEJBQU87QUFWWCxJQUFJLFNBQVMsR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUE7QUFXakMsOEJBQVM7QUFUYiwwQkFBMEI7QUFDMUIsK0JBQThCO0FBSzFCLHNCQUFLO0FBSlQsdUNBQXNDO0FBUWxDLDhCQUFTO0FBUGIsMkNBQTBDO0FBUXRDLGtDQUFXIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGFjbWUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCLENBQUMsbUJBQW1CO0FBRzNDLElBQUksU0FBUyxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQSxDQUFDLGFBQWE7QUFZL0MsOEJBQVM7QUFYYixJQUFJLE9BQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUEsQ0FBQyx3QkFBd0I7QUFZckQsMEJBQU87QUFYWCxJQUFJLFNBQVMsR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUE7QUFZakMsOEJBQVM7QUFWYiwwQkFBMEI7QUFDMUIsK0JBQThCO0FBTTFCLHNCQUFLO0FBTFQseUNBQXdDO0FBU3BDLGdDQUFVO0FBUmQsdUNBQXNDO0FBU2xDLDhCQUFTO0FBUmIsMkNBQTBDO0FBU3RDLGtDQUFXIn0= \ No newline at end of file diff --git a/package.json b/package.json index 1703b57..5b51b9f 100644 --- a/package.json +++ b/package.json @@ -30,14 +30,15 @@ "q": "^1.4.1", "rawacme": "^0.2.1", "rsa-keygen": "^1.0.6", - "smartfile": "^4.1.2", + "smartdelay": "^1.0.1", + "smartfile": "^4.1.4", "smartstring": "^2.0.22", "typings-global": "^1.0.14" }, "devDependencies": { "@types/should": "^8.1.30", - "cflare": "0.0.10", - "qenv": "^1.1.1", + "cflare": "0.0.11", + "qenv": "^1.1.3", "should": "^11.1.2", "typings-test": "^1.0.3" } diff --git a/qenv.yml b/qenv.yml new file mode 100644 index 0000000..f1e1cdd --- /dev/null +++ b/qenv.yml @@ -0,0 +1,3 @@ +vars: + - CF_EMAIL + - CF_KEY \ No newline at end of file diff --git a/test/test.js b/test/test.js index 23d11fa..6c6fc74 100644 --- a/test/test.js +++ b/test/test.js @@ -1,8 +1,16 @@ "use strict"; require("typings-test"); const should = require("should"); +const cflare = require("cflare"); +const qenv = require("qenv"); +let testQenv = new qenv.Qenv(process.cwd(), process.cwd() + '/.nogit'); // import the module to test const smartacme = require("../dist/index"); +let myCflareAccount = new cflare.CflareAccount(); +myCflareAccount.auth({ + email: process.env.CF_EMAIL, + key: process.env.CF_KEY +}); describe('smartacme', function () { let testSmartAcme; let testAcmeAccount; @@ -43,17 +51,25 @@ describe('smartacme', function () { done(); }); }); + it('should set the challenge', function (done) { + this.timeout(30000); + myCflareAccount.createRecord(testChallenge.domainNamePrefixed, 'TXT', testChallenge.dnsKeyHash).then(() => { + done(); + }); + }); it('should check for a DNS record', function (done) { + this.timeout(40000); testAcmeCert.checkDns().then(x => { console.log(x); done(); }); }); - it.skip('should poll for validation of a challenge', function (done) { - this.timeout(10000); + it('should poll for validation of a challenge', function (done) { + this.timeout(700000); testAcmeCert.requestValidation().then(x => { + console.log(x); done(); }); }); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFJaEMsNEJBQTRCO0FBQzVCLDJDQUEwQztBQUUxQyxRQUFRLENBQUMsV0FBVyxFQUFFO0lBQ2xCLElBQUksYUFBa0MsQ0FBQTtJQUN0QyxJQUFJLGVBQXNDLENBQUE7SUFDMUMsSUFBSSxZQUFnQyxDQUFBO0lBQ3BDLElBQUksYUFBb0QsQ0FBQTtJQUV4RCxFQUFFLENBQUMsZ0NBQWdDLEVBQUUsVUFBVSxJQUFJO1FBQy9DLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDbkIsYUFBYSxHQUFHLElBQUksU0FBUyxDQUFDLFNBQVMsRUFBRSxDQUFBO1FBQ3pDLGFBQWEsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUM7WUFDdEIsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFBO1lBQ3hELElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsTUFBTSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNsQyxDQUFDLENBQUMsQ0FBQTtJQUVGLEVBQUUsQ0FBQyw2QkFBNkIsRUFBRTtRQUM5QixNQUFNLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQ3RELENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLCtCQUErQixFQUFFLFVBQVUsSUFBSTtRQUM5QyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ25CLGFBQWEsQ0FBQyxpQkFBaUIsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3BDLGVBQWUsR0FBRyxDQUFDLENBQUE7WUFDbkIsSUFBSSxFQUFFLENBQUE7UUFDVixDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRztZQUNSLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7WUFDaEIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ2IsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtJQUVGLEVBQUUsQ0FBQywwQkFBMEIsRUFBRTtRQUMzQixlQUFlLENBQUMsY0FBYyxDQUFDLGVBQWUsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ2xELFlBQVksR0FBRyxDQUFDLENBQUE7WUFDaEIsTUFBTSxDQUFDLGVBQWUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1FBQzdELENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7SUFFRixFQUFFLENBQUMsdUNBQXVDLEVBQUUsVUFBVSxJQUFJO1FBQ3RELElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDbkIsWUFBWSxDQUFDLGdCQUFnQixFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsaUJBQWlCO1lBQ25ELE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUMsQ0FBQTtZQUM5QixhQUFhLEdBQUcsaUJBQWlCLENBQUE7WUFDakMsSUFBSSxFQUFFLENBQUE7UUFDVixDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLCtCQUErQixFQUFFLFVBQVMsSUFBSTtRQUM3QyxZQUFZLENBQUMsUUFBUSxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDMUIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQTtZQUNkLElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtJQUVGLEVBQUUsQ0FBQyxJQUFJLENBQUMsMkNBQTJDLEVBQUUsVUFBVSxJQUFJO1FBQy9ELElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDbkIsWUFBWSxDQUFDLGlCQUFpQixFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkMsSUFBSSxFQUFFLENBQUE7UUFDVixDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFDLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFDaEMsaUNBQWdDO0FBQ2hDLDZCQUE0QjtBQUU1QixJQUFJLFFBQVEsR0FBRyxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLE9BQU8sQ0FBQyxHQUFHLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQTtBQUV0RSw0QkFBNEI7QUFDNUIsMkNBQTBDO0FBRTFDLElBQUksZUFBZSxHQUFHLElBQUksTUFBTSxDQUFDLGFBQWEsRUFBRSxDQUFBO0FBQ2hELGVBQWUsQ0FBQyxJQUFJLENBQUM7SUFDakIsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUTtJQUMzQixHQUFHLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNO0NBQzFCLENBQUMsQ0FBQTtBQUVGLFFBQVEsQ0FBQyxXQUFXLEVBQUU7SUFDbEIsSUFBSSxhQUFrQyxDQUFBO0lBQ3RDLElBQUksZUFBc0MsQ0FBQTtJQUMxQyxJQUFJLFlBQWdDLENBQUE7SUFDcEMsSUFBSSxhQUFvRCxDQUFBO0lBRXhELEVBQUUsQ0FBQyxnQ0FBZ0MsRUFBRSxVQUFVLElBQUk7UUFDL0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNuQixhQUFhLEdBQUcsSUFBSSxTQUFTLENBQUMsU0FBUyxFQUFFLENBQUE7UUFDekMsYUFBYSxDQUFDLElBQUksRUFBRSxDQUFDLElBQUksQ0FBQztZQUN0QixNQUFNLENBQUMsYUFBYSxDQUFDLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLENBQUE7WUFDeEQsSUFBSSxFQUFFLENBQUE7UUFDVixDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxNQUFNLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ2xDLENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLDZCQUE2QixFQUFFO1FBQzlCLE1BQU0sQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDdEQsQ0FBQyxDQUFDLENBQUE7SUFFRixFQUFFLENBQUMsK0JBQStCLEVBQUUsVUFBVSxJQUFJO1FBQzlDLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDbkIsYUFBYSxDQUFDLGlCQUFpQixFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDcEMsZUFBZSxHQUFHLENBQUMsQ0FBQTtZQUNuQixJQUFJLEVBQUUsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHO1lBQ1IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtZQUNoQixJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDYixDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLDBCQUEwQixFQUFFO1FBQzNCLGVBQWUsQ0FBQyxjQUFjLENBQUMsZUFBZSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbEQsWUFBWSxHQUFHLENBQUMsQ0FBQTtZQUNoQixNQUFNLENBQUMsZUFBZSxDQUFDLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDN0QsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtJQUVGLEVBQUUsQ0FBQyx1Q0FBdUMsRUFBRSxVQUFVLElBQUk7UUFDdEQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNuQixZQUFZLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxpQkFBaUI7WUFDbkQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFBO1lBQzlCLGFBQWEsR0FBRyxpQkFBaUIsQ0FBQTtZQUNqQyxJQUFJLEVBQUUsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7SUFFRixFQUFFLENBQUMsMEJBQTBCLEVBQUUsVUFBUyxJQUFJO1FBQ3hDLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDbkIsZUFBZSxDQUFDLFlBQVksQ0FDeEIsYUFBYSxDQUFDLGtCQUFrQixFQUNoQyxLQUFLLEVBQUUsYUFBYSxDQUFDLFVBQVUsQ0FDbEMsQ0FBQyxJQUFJLENBQUM7WUFDSCxJQUFJLEVBQUUsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7SUFFRixFQUFFLENBQUMsK0JBQStCLEVBQUUsVUFBUyxJQUFJO1FBQzdDLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDbkIsWUFBWSxDQUFDLFFBQVEsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzFCLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDZCxJQUFJLEVBQUUsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7SUFFRixFQUFFLENBQUMsMkNBQTJDLEVBQUUsVUFBVSxJQUFJO1FBQzFELElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUE7UUFDcEIsWUFBWSxDQUFDLGlCQUFpQixFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQTtZQUNkLElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQyxDQUFBIn0= \ No newline at end of file diff --git a/test/test.ts b/test/test.ts index 36174fb..203b3b0 100644 --- a/test/test.ts +++ b/test/test.ts @@ -3,9 +3,17 @@ import * as should from 'should' import * as cflare from 'cflare' import * as qenv from 'qenv' +let testQenv = new qenv.Qenv(process.cwd(), process.cwd() + '/.nogit') + // import the module to test import * as smartacme from '../dist/index' +let myCflareAccount = new cflare.CflareAccount() +myCflareAccount.auth({ + email: process.env.CF_EMAIL, + key: process.env.CF_KEY +}) + describe('smartacme', function () { let testSmartAcme: smartacme.SmartAcme let testAcmeAccount: smartacme.AcmeAccount @@ -52,16 +60,28 @@ describe('smartacme', function () { }) }) - it.skip('should check for a DNS record', function(done) { + it('should set the challenge', function(done) { + this.timeout(30000) + myCflareAccount.createRecord( + testChallenge.domainNamePrefixed, + 'TXT', testChallenge.dnsKeyHash + ).then(() => { + done() + }) + }) + + it('should check for a DNS record', function(done) { + this.timeout(40000) testAcmeCert.checkDns().then(x => { console.log(x) done() }) }) - it.skip('should poll for validation of a challenge', function (done) { - this.timeout(10000) + it('should poll for validation of a challenge', function (done) { + this.timeout(700000) testAcmeCert.requestValidation().then(x => { + console.log(x) done() }) }) diff --git a/ts/smartacme.classes.acmecert.ts b/ts/smartacme.classes.acmecert.ts index f91e9ca..41069c1 100644 --- a/ts/smartacme.classes.acmecert.ts +++ b/ts/smartacme.classes.acmecert.ts @@ -139,42 +139,45 @@ export class AcmeCert { try { myRecord = await myDnsly.getRecord(helpers.prefixName(this.domainName), 'TXT') console.log('DNS is set!') + return myRecord[0][0] } catch (err) { if (cycleArg < 30) { cycleArg++ - await this.checkDns(cycleArg) + await plugins.smartdelay.delayFor(2000) + return await this.checkDns(cycleArg) } else { console.log('failed permanently...') throw err } } - return myRecord[0][0] } /** * validates a challenge, only call after you have set the challenge at the expected location */ - requestValidation() { - let done = q.defer() - this.parentAcmeAccount.parentSmartAcme.rawacmeClient.poll(this.acceptedChallenge.uri, (err, res) => { - if (err) { - console.log(err) - done.reject(err) - } - console.log(`Validation response:`) - console.log(JSON.stringify(res.body)) - if (res.body.status === 'pending' || 'invalid') { - setTimeout( - () => { - this.requestValidation().then(x => { done.resolve(x) }) - }, - 2000 - ) - } else { - done.resolve(res.body) - } - }) - return done.promise + async requestValidation() { + console.log('give it 2 minutes to settle!') + await plugins.smartdelay.delayFor(120000) + let makeRequest = () => { + let done = q.defer() + this.parentAcmeAccount.parentSmartAcme.rawacmeClient.poll(this.acceptedChallenge.uri, async (err, res) => { + if (err) { + console.log(err) + return + } + console.log(`Validation response:`) + console.log(JSON.stringify(res.body)) + if (res.body.status === 'pending' || 'invalid') { + console.log('retry in 4 minutes!') + await plugins.smartdelay.delayFor(240000) + makeRequest().then((x: any) => { done.resolve(x) }) + } else { + done.resolve(res.body) + } + }) + return done.promise + } + await makeRequest() } /** diff --git a/ts/smartacme.plugins.ts b/ts/smartacme.plugins.ts index a486075..d39522e 100644 --- a/ts/smartacme.plugins.ts +++ b/ts/smartacme.plugins.ts @@ -7,6 +7,7 @@ let nodeForge = require('node-forge') // push.rocks modules here import * as dnsly from 'dnsly' +import * as smartdelay from 'smartdelay' import * as smartfile from 'smartfile' import * as smartstring from 'smartstring' @@ -15,6 +16,7 @@ export { rsaKeygen, rawacme, nodeForge, + smartdelay, smartfile, smartstring }