From 20ea599f9d8c44c608b78950405b55ca421f471e Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Wed, 25 Jan 2017 02:45:48 +0100 Subject: [PATCH] now getting a valid response --- dist/smartacme.classes.acmecert.d.ts | 9 ++- dist/smartacme.classes.acmecert.js | 96 ++++++++++++----------- dist/smartacme.classes.smartacme.d.ts | 2 +- dist/smartacme.classes.smartacme.js | 2 +- test/test.js | 20 +++-- test/test.ts | 21 +++-- ts/smartacme.classes.acmecert.ts | 109 ++++++++++++++------------ ts/smartacme.classes.smartacme.ts | 2 +- 8 files changed, 141 insertions(+), 120 deletions(-) diff --git a/dist/smartacme.classes.acmecert.d.ts b/dist/smartacme.classes.acmecert.d.ts index 47199e6..1d12a7e 100644 --- a/dist/smartacme.classes.acmecert.d.ts +++ b/dist/smartacme.classes.acmecert.d.ts @@ -17,7 +17,7 @@ export interface ISmartAcmeChallenge { token: string; keyAuthorization: string; } -export interface ISmartAcmeChallengeAccepted extends ISmartAcmeChallenge { +export interface ISmartAcmeChallengeChosen extends ISmartAcmeChallenge { dnsKeyHash: string; domainName: string; domainNamePrefixed: string; @@ -41,7 +41,6 @@ export interface IAcmeCsrConstructorOptions { export declare class AcmeCert { domainName: string; attributes: any; - acceptedChallenge: ISmartAcmeChallengeAccepted; fullchain: string; parentAcmeAccount: AcmeAccount; csr: any; @@ -49,13 +48,15 @@ export declare class AcmeCert { validTo: Date; keypair: IRsaKeypair; keyPairFinal: IRsaKeypair; + chosenChallenge: ISmartAcmeChallengeChosen; + dnsKeyHash: string; constructor(optionsArg: IAcmeCsrConstructorOptions, parentAcmeAccount: AcmeAccount); /** * requests a challenge for a domain * @param domainNameArg - the domain name to request a challenge for * @param challengeType - the challenge type to request */ - requestChallenge(challengeTypeArg?: TChallengeType): q.Promise; + requestChallenge(challengeTypeArg?: TChallengeType): q.Promise; /** * checks if DNS records are set, will go through a max of 30 cycles */ @@ -75,5 +76,5 @@ export declare class AcmeCert { /** * accept a challenge - for private use only */ - private acceptChallenge(challengeArg); + acceptChallenge(): q.Promise<{}>; } diff --git a/dist/smartacme.classes.acmecert.js b/dist/smartacme.classes.acmecert.js index bcdd98b..e9b8185 100644 --- a/dist/smartacme.classes.acmecert.js +++ b/dist/smartacme.classes.acmecert.js @@ -64,13 +64,31 @@ class AcmeCert { console.log(err); done.reject(err); } - let dnsChallenge = res.body.challenges.filter(x => { + let preChosenChallenge = res.body.challenges.filter(x => { return x.type === challengeTypeArg; })[0]; - this.acceptChallenge(dnsChallenge) - .then((x) => { - done.resolve(x); - }); + /** + * the key is needed to accept the challenge + */ + let authKey = plugins.rawacme.keyAuthz(preChosenChallenge.token, this.parentAcmeAccount.parentSmartAcme.keyPair.publicKey); + /** + * needed in case selected challenge is of type dns-01 + */ + this.dnsKeyHash = plugins.rawacme.dnsKeyAuthzHash(authKey); // needed if dns challenge is chosen + /** + * the return challenge + */ + this.chosenChallenge = { + uri: preChosenChallenge.uri, + type: preChosenChallenge.type, + token: preChosenChallenge.token, + keyAuthorization: authKey, + status: preChosenChallenge.status, + dnsKeyHash: this.dnsKeyHash, + domainName: this.domainName, + domainNamePrefixed: helpers.prefixName(this.domainName) + }; + done.resolve(this.chosenChallenge); }); return done.promise; } @@ -79,14 +97,7 @@ class AcmeCert { */ checkDns(cycleArg = 1) { return __awaiter(this, void 0, void 0, function* () { - console.log(`checkDns failed ${cycleArg} times and has ${30 - cycleArg} cycles to go before it fails permanently!`); - let myRecord; - try { - myRecord = yield myDnsly.getRecord(helpers.prefixName(this.domainName), 'TXT'); - console.log('DNS is set!'); - return myRecord[0][0]; - } - catch (err) { + let redoCheck = (err) => __awaiter(this, void 0, void 0, function* () { if (cycleArg < 30) { cycleArg++; yield plugins.smartdelay.delayFor(2000); @@ -96,6 +107,24 @@ class AcmeCert { console.log('failed permanently...'); throw err; } + }); + console.log(`checkDns failed ${cycleArg} times and has ${30 - cycleArg} cycles to go before it fails permanently!`); + let myRecord; + try { + myRecord = yield myDnsly.getRecord(helpers.prefixName(this.domainName), 'TXT'); + myRecord = myRecord[0][0]; + if (myRecord === this.dnsKeyHash) { + console.log('and matches the required dnsKeyHash'); + } + else { + console.log('but does not match required dns keyHash!'); + return redoCheck(); + } + console.log('DNS is set!'); + return myRecord; + } + catch (err) { + return redoCheck(); } }); } @@ -104,11 +133,10 @@ class AcmeCert { */ requestValidation() { return __awaiter(this, void 0, void 0, function* () { - console.log('give it 2 minutes to settle!'); - yield plugins.smartdelay.delayFor(10000); + yield plugins.smartdelay.delayFor(20000); let makeRequest = () => { let done = q.defer(); - this.parentAcmeAccount.parentSmartAcme.rawacmeClient.poll(this.acceptedChallenge.uri, (err, res) => __awaiter(this, void 0, void 0, function* () { + this.parentAcmeAccount.parentSmartAcme.rawacmeClient.poll(this.chosenChallenge.uri, (err, res) => __awaiter(this, void 0, void 0, function* () { if (err) { console.log(err); return; @@ -116,8 +144,8 @@ class AcmeCert { 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); + console.log('retry in 6 minutes!'); + yield plugins.smartdelay.delayFor(3000); makeRequest().then((x) => { done.resolve(x); }); } else { @@ -157,42 +185,20 @@ class AcmeCert { /** * accept a challenge - for private use only */ - acceptChallenge(challengeArg) { + acceptChallenge() { let done = q.defer(); - /** - * the key is needed to accept the challenge - */ - let authKey = plugins.rawacme.keyAuthz(challengeArg.token, this.parentAcmeAccount.parentSmartAcme.keyPair.publicKey); - /** - * needed in case selected challenge is of type dns-01 - */ - let keyHash = plugins.rawacme.dnsKeyAuthzHash(authKey); // needed if dns challenge is chosen - this.parentAcmeAccount.parentSmartAcme.rawacmeClient.post(challengeArg.uri, { + this.parentAcmeAccount.parentSmartAcme.rawacmeClient.post(this.chosenChallenge.uri, { resource: 'challenge', - keyAuthorization: authKey + keyAuthorization: this.chosenChallenge.keyAuthorization }, this.parentAcmeAccount.parentSmartAcme.keyPair, (err, res) => { if (err) { console.log(err); done.reject(err); } - /** - * the return challenge - */ - let returnDNSChallenge = { - uri: res.body.uri, - type: res.body.type, - token: res.body.token, - keyAuthorization: res.body.keyAuthorization, - status: res.body.status, - dnsKeyHash: keyHash, - domainName: this.domainName, - domainNamePrefixed: helpers.prefixName(this.domainName) - }; - this.acceptedChallenge = returnDNSChallenge; - done.resolve(returnDNSChallenge); + done.resolve(res.body); }); return done.promise; } } 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.classes.smartacme.d.ts b/dist/smartacme.classes.smartacme.d.ts index 4495dd8..8affece 100644 --- a/dist/smartacme.classes.smartacme.d.ts +++ b/dist/smartacme.classes.smartacme.d.ts @@ -9,7 +9,7 @@ export interface IRsaKeypair { privateKey: string; } export { AcmeAccount } from './smartacme.classes.acmeaccount'; -export { AcmeCert, ISmartAcmeChallenge, ISmartAcmeChallengeAccepted } from './smartacme.classes.acmecert'; +export { AcmeCert, ISmartAcmeChallenge, ISmartAcmeChallengeChosen } from './smartacme.classes.acmecert'; /** * class SmartAcme exports methods for maintaining SSL Certificates */ diff --git a/dist/smartacme.classes.smartacme.js b/dist/smartacme.classes.smartacme.js index b6f8735..7495c29 100644 --- a/dist/smartacme.classes.smartacme.js +++ b/dist/smartacme.classes.smartacme.js @@ -63,4 +63,4 @@ class SmartAcme { } } exports.SmartAcme = SmartAcme; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxzQkFBc0I7QUFDdEIsdUJBQXNCLENBQUMsV0FBVztBQUNsQywrQ0FBOEM7QUFDOUMsK0NBQThDO0FBRTlDLG1GQUE2RDtBQVU3RCxpRkFBNkQ7QUFBcEQsc0RBQUEsV0FBVyxDQUFBO0FBQ3BCLDJFQUF5RztBQUFoRyxnREFBQSxRQUFRLENBQUE7QUFFakI7O0dBRUc7QUFDSDtJQU1JOztPQUVHO0lBQ0gsWUFBWSxnQkFBeUIsS0FBSztRQUN0QyxJQUFJLENBQUMsY0FBYyxHQUFHLGFBQWEsQ0FBQTtRQUNuQyxJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxhQUFhLEVBQUUsQ0FBQTtRQUN0QyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztZQUN0QixJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFBO1FBQ2xELENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNKLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQTtRQUMxRCxDQUFDO0lBQ0wsQ0FBQztJQUVEOztPQUVHO0lBQ0gsSUFBSTtRQUNBLElBQUksSUFBSSxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtRQUNwQixPQUFPLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FDeEI7WUFDSSxHQUFHLEVBQUUsSUFBSSxDQUFDLE9BQU87WUFDakIsU0FBUyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUztZQUNqQyxVQUFVLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVO1NBQ3RDLEVBQ0QsQ0FBQyxHQUFHLEVBQUUsTUFBTTtZQUNSLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ04sT0FBTyxDQUFDLEtBQUssQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFBO2dCQUNqRCxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO2dCQUNoQixJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO2dCQUNoQixNQUFNLENBQUE7WUFDVixDQUFDO1lBRUQsa0NBQWtDO1lBQ2xDLElBQUksQ0FBQyxhQUFhLEdBQUcsTUFBTSxDQUFBO1lBQzNCLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUNsQixDQUFDLENBQ0osQ0FBQTtRQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7SUFFRDs7O09BR0c7SUFDSCxpQkFBaUI7UUFDYixJQUFJLElBQUksR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFlLENBQUE7UUFDakMsSUFBSSxXQUFXLEdBQUcsSUFBSSwyQ0FBVyxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQ3ZDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxJQUFJLENBQUM7WUFDeEIsTUFBTSxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsQ0FBQTtRQUNqQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7WUFDSixJQUFJLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFBO1FBQzdCLENBQUMsQ0FBQyxDQUFBO1FBQ0YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7SUFDdkIsQ0FBQztDQUNKO0FBNURELDhCQTREQyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxzQkFBc0I7QUFDdEIsdUJBQXNCLENBQUMsV0FBVztBQUNsQywrQ0FBOEM7QUFDOUMsK0NBQThDO0FBRTlDLG1GQUE2RDtBQVU3RCxpRkFBNkQ7QUFBcEQsc0RBQUEsV0FBVyxDQUFBO0FBQ3BCLDJFQUF1RztBQUE5RixnREFBQSxRQUFRLENBQUE7QUFFakI7O0dBRUc7QUFDSDtJQU1JOztPQUVHO0lBQ0gsWUFBWSxnQkFBeUIsS0FBSztRQUN0QyxJQUFJLENBQUMsY0FBYyxHQUFHLGFBQWEsQ0FBQTtRQUNuQyxJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxhQUFhLEVBQUUsQ0FBQTtRQUN0QyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztZQUN0QixJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFBO1FBQ2xELENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNKLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQTtRQUMxRCxDQUFDO0lBQ0wsQ0FBQztJQUVEOztPQUVHO0lBQ0gsSUFBSTtRQUNBLElBQUksSUFBSSxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtRQUNwQixPQUFPLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FDeEI7WUFDSSxHQUFHLEVBQUUsSUFBSSxDQUFDLE9BQU87WUFDakIsU0FBUyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUztZQUNqQyxVQUFVLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVO1NBQ3RDLEVBQ0QsQ0FBQyxHQUFHLEVBQUUsTUFBTTtZQUNSLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ04sT0FBTyxDQUFDLEtBQUssQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFBO2dCQUNqRCxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO2dCQUNoQixJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO2dCQUNoQixNQUFNLENBQUE7WUFDVixDQUFDO1lBRUQsa0NBQWtDO1lBQ2xDLElBQUksQ0FBQyxhQUFhLEdBQUcsTUFBTSxDQUFBO1lBQzNCLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUNsQixDQUFDLENBQ0osQ0FBQTtRQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7SUFFRDs7O09BR0c7SUFDSCxpQkFBaUI7UUFDYixJQUFJLElBQUksR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFlLENBQUE7UUFDakMsSUFBSSxXQUFXLEdBQUcsSUFBSSwyQ0FBVyxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQ3ZDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxJQUFJLENBQUM7WUFDeEIsTUFBTSxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsQ0FBQTtRQUNqQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7WUFDSixJQUFJLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFBO1FBQzdCLENBQUMsQ0FBQyxDQUFBO1FBQ0YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7SUFDdkIsQ0FBQztDQUNKO0FBNURELDhCQTREQyJ9 \ No newline at end of file diff --git a/test/test.js b/test/test.js index 6c6fc74..ec1e9db 100644 --- a/test/test.js +++ b/test/test.js @@ -18,7 +18,7 @@ describe('smartacme', function () { let testChallenge; it('should create a valid instance', function (done) { this.timeout(10000); - testSmartAcme = new smartacme.SmartAcme(); + testSmartAcme = new smartacme.SmartAcme(false); testSmartAcme.init().then(() => { should(testSmartAcme).be.instanceOf(smartacme.SmartAcme); done(); @@ -38,32 +38,36 @@ describe('smartacme', function () { }); }); it('should create a AcmeCert', function () { - testAcmeAccount.createAcmeCert('test1.bleu.de').then(x => { + testAcmeAccount.createAcmeCert('carglide.com').then(x => { testAcmeCert = x; should(testAcmeAccount).be.instanceOf(smartacme.AcmeCert); }); }); it('should get a challenge for a AcmeCert', function (done) { this.timeout(10000); - testAcmeCert.requestChallenge().then((challengeAccepted) => { - console.log(challengeAccepted); - testChallenge = challengeAccepted; + testAcmeCert.requestChallenge().then((challengeChosen) => { + console.log(challengeChosen); + testChallenge = challengeChosen; done(); }); }); it('should set the challenge', function (done) { - this.timeout(30000); + this.timeout(10000); myCflareAccount.createRecord(testChallenge.domainNamePrefixed, 'TXT', testChallenge.dnsKeyHash).then(() => { done(); }); }); it('should check for a DNS record', function (done) { - this.timeout(40000); + this.timeout(20000); testAcmeCert.checkDns().then(x => { console.log(x); done(); }); }); + it('should accept the challenge', function (done) { + this.timeout(10000); + testAcmeCert.acceptChallenge().then(() => { done(); }); + }); it('should poll for validation of a challenge', function (done) { this.timeout(700000); testAcmeCert.requestValidation().then(x => { @@ -72,4 +76,4 @@ describe('smartacme', function () { }); }); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFDaEMsaUNBQWdDO0FBQ2hDLDZCQUE0QjtBQUU1QixJQUFJLFFBQVEsR0FBRyxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLE9BQU8sQ0FBQyxHQUFHLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQTtBQUV0RSw0QkFBNEI7QUFDNUIsMkNBQTBDO0FBRTFDLElBQUksZUFBZSxHQUFHLElBQUksTUFBTSxDQUFDLGFBQWEsRUFBRSxDQUFBO0FBQ2hELGVBQWUsQ0FBQyxJQUFJLENBQUM7SUFDakIsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUTtJQUMzQixHQUFHLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNO0NBQzFCLENBQUMsQ0FBQTtBQUVGLFFBQVEsQ0FBQyxXQUFXLEVBQUU7SUFDbEIsSUFBSSxhQUFrQyxDQUFBO0lBQ3RDLElBQUksZUFBc0MsQ0FBQTtJQUMxQyxJQUFJLFlBQWdDLENBQUE7SUFDcEMsSUFBSSxhQUFvRCxDQUFBO0lBRXhELEVBQUUsQ0FBQyxnQ0FBZ0MsRUFBRSxVQUFVLElBQUk7UUFDL0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNuQixhQUFhLEdBQUcsSUFBSSxTQUFTLENBQUMsU0FBUyxFQUFFLENBQUE7UUFDekMsYUFBYSxDQUFDLElBQUksRUFBRSxDQUFDLElBQUksQ0FBQztZQUN0QixNQUFNLENBQUMsYUFBYSxDQUFDLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLENBQUE7WUFDeEQsSUFBSSxFQUFFLENBQUE7UUFDVixDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxNQUFNLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQSxDQUFD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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFDaEMsaUNBQWdDO0FBQ2hDLDZCQUE0QjtBQUU1QixJQUFJLFFBQVEsR0FBRyxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLE9BQU8sQ0FBQyxHQUFHLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQTtBQUV0RSw0QkFBNEI7QUFDNUIsMkNBQTBDO0FBRTFDLElBQUksZUFBZSxHQUFHLElBQUksTUFBTSxDQUFDLGFBQWEsRUFBRSxDQUFBO0FBQ2hELGVBQWUsQ0FBQyxJQUFJLENBQUM7SUFDakIsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUTtJQUMzQixHQUFHLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNO0NBQzFCLENBQUMsQ0FBQTtBQUVGLFFBQVEsQ0FBQyxXQUFXLEVBQUU7SUFDbEIsSUFBSSxhQUFrQyxDQUFBO0lBQ3RDLElBQUksZUFBc0MsQ0FBQTtJQUMxQyxJQUFJLFlBQWdDLENBQUE7SUFDcEMsSUFBSSxhQUFrRCxDQUFBO0lBRXRELEVBQUUsQ0FBQyxnQ0FBZ0MsRUFBRSxVQUFVLElBQUk7UUFDL0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNuQixhQUFhLEdBQUcsSUFBSSxTQUFTLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQzlDLGFBQWEsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUM7WUFDdEIsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFBO1lBQ3hELElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsTUFBTSxJQUFJLENBQUMsR0FBRyxDQUFD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 \ No newline at end of file diff --git a/test/test.ts b/test/test.ts index 203b3b0..3f86521 100644 --- a/test/test.ts +++ b/test/test.ts @@ -18,11 +18,11 @@ describe('smartacme', function () { let testSmartAcme: smartacme.SmartAcme let testAcmeAccount: smartacme.AcmeAccount let testAcmeCert: smartacme.AcmeCert - let testChallenge: smartacme.ISmartAcmeChallengeAccepted + let testChallenge: smartacme.ISmartAcmeChallengeChosen it('should create a valid instance', function (done) { this.timeout(10000) - testSmartAcme = new smartacme.SmartAcme() + testSmartAcme = new smartacme.SmartAcme(false) testSmartAcme.init().then(() => { should(testSmartAcme).be.instanceOf(smartacme.SmartAcme) done() @@ -45,7 +45,7 @@ describe('smartacme', function () { }) it('should create a AcmeCert', function() { - testAcmeAccount.createAcmeCert('test1.bleu.de').then(x => { + testAcmeAccount.createAcmeCert('carglide.com').then(x => { testAcmeCert = x should(testAcmeAccount).be.instanceOf(smartacme.AcmeCert) }) @@ -53,15 +53,15 @@ describe('smartacme', function () { it('should get a challenge for a AcmeCert', function (done) { this.timeout(10000) - testAcmeCert.requestChallenge().then((challengeAccepted) => { - console.log(challengeAccepted) - testChallenge = challengeAccepted + testAcmeCert.requestChallenge().then((challengeChosen) => { + console.log(challengeChosen) + testChallenge = challengeChosen done() }) }) it('should set the challenge', function(done) { - this.timeout(30000) + this.timeout(10000) myCflareAccount.createRecord( testChallenge.domainNamePrefixed, 'TXT', testChallenge.dnsKeyHash @@ -71,13 +71,18 @@ describe('smartacme', function () { }) it('should check for a DNS record', function(done) { - this.timeout(40000) + this.timeout(20000) testAcmeCert.checkDns().then(x => { console.log(x) done() }) }) + it('should accept the challenge', function(done){ + this.timeout(10000) + testAcmeCert.acceptChallenge().then(() => { done() }) + }) + it('should poll for validation of a challenge', function (done) { this.timeout(700000) testAcmeCert.requestValidation().then(x => { diff --git a/ts/smartacme.classes.acmecert.ts b/ts/smartacme.classes.acmecert.ts index 41069c1..4c2bc81 100644 --- a/ts/smartacme.classes.acmecert.ts +++ b/ts/smartacme.classes.acmecert.ts @@ -24,7 +24,7 @@ export interface ISmartAcmeChallenge { keyAuthorization: string } -export interface ISmartAcmeChallengeAccepted extends ISmartAcmeChallenge { +export interface ISmartAcmeChallengeChosen extends ISmartAcmeChallenge { dnsKeyHash: string domainName: string domainNamePrefixed: string @@ -53,7 +53,6 @@ let myDnsly = new plugins.dnsly.Dnsly('google') export class AcmeCert { domainName: string attributes - acceptedChallenge: ISmartAcmeChallengeAccepted fullchain: string parentAcmeAccount: AcmeAccount csr @@ -61,6 +60,8 @@ export class AcmeCert { validTo: Date keypair: IRsaKeypair keyPairFinal: IRsaKeypair + chosenChallenge: ISmartAcmeChallengeChosen + dnsKeyHash: string constructor(optionsArg: IAcmeCsrConstructorOptions, parentAcmeAccount: AcmeAccount) { this.domainName = optionsArg.domain this.parentAcmeAccount = parentAcmeAccount @@ -103,7 +104,7 @@ export class AcmeCert { * @param challengeType - the challenge type to request */ requestChallenge(challengeTypeArg: TChallengeType = 'dns-01') { - let done = q.defer() + let done = q.defer() this.parentAcmeAccount.parentSmartAcme.rawacmeClient.newAuthz( { identifier: { @@ -118,13 +119,36 @@ export class AcmeCert { console.log(err) done.reject(err) } - let dnsChallenge = res.body.challenges.filter(x => { + let preChosenChallenge = res.body.challenges.filter(x => { return x.type === challengeTypeArg })[0] - this.acceptChallenge(dnsChallenge) - .then((x: ISmartAcmeChallengeAccepted) => { - done.resolve(x) - }) + + /** + * the key is needed to accept the challenge + */ + let authKey: string = plugins.rawacme.keyAuthz( + preChosenChallenge.token, + this.parentAcmeAccount.parentSmartAcme.keyPair.publicKey + ) + + /** + * needed in case selected challenge is of type dns-01 + */ + this.dnsKeyHash = plugins.rawacme.dnsKeyAuthzHash(authKey) // needed if dns challenge is chosen + /** + * the return challenge + */ + this.chosenChallenge = { + uri: preChosenChallenge.uri, + type: preChosenChallenge.type, + token: preChosenChallenge.token, + keyAuthorization: authKey, + status: preChosenChallenge.status, + dnsKeyHash: this.dnsKeyHash, + domainName: this.domainName, + domainNamePrefixed: helpers.prefixName(this.domainName) + } + done.resolve(this.chosenChallenge) } ) return done.promise @@ -134,13 +158,7 @@ export class AcmeCert { * checks if DNS records are set, will go through a max of 30 cycles */ async checkDns(cycleArg = 1) { - console.log(`checkDns failed ${cycleArg} times and has ${30 - cycleArg} cycles to go before it fails permanently!`) - let myRecord - try { - myRecord = await myDnsly.getRecord(helpers.prefixName(this.domainName), 'TXT') - console.log('DNS is set!') - return myRecord[0][0] - } catch (err) { + let redoCheck = async (err?) => { if (cycleArg < 30) { cycleArg++ await plugins.smartdelay.delayFor(2000) @@ -150,17 +168,32 @@ export class AcmeCert { throw err } } + console.log(`checkDns failed ${cycleArg} times and has ${30 - cycleArg} cycles to go before it fails permanently!`) + let myRecord + try { + myRecord = await myDnsly.getRecord(helpers.prefixName(this.domainName), 'TXT') + myRecord = myRecord[0][0] + if (myRecord === this.dnsKeyHash) { + console.log('and matches the required dnsKeyHash') + } else { + console.log('but does not match required dns keyHash!') + return redoCheck() + } + console.log('DNS is set!') + return myRecord + } catch (err) { + return redoCheck() + } } /** * validates a challenge, only call after you have set the challenge at the expected location */ async requestValidation() { - console.log('give it 2 minutes to settle!') - await plugins.smartdelay.delayFor(120000) + await plugins.smartdelay.delayFor(20000) let makeRequest = () => { let done = q.defer() - this.parentAcmeAccount.parentSmartAcme.rawacmeClient.poll(this.acceptedChallenge.uri, async (err, res) => { + this.parentAcmeAccount.parentSmartAcme.rawacmeClient.poll(this.chosenChallenge.uri, async (err, res) => { if (err) { console.log(err) return @@ -168,8 +201,8 @@ export class AcmeCert { 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) + console.log('retry in 6 minutes!') + await plugins.smartdelay.delayFor(3000) makeRequest().then((x: any) => { done.resolve(x) }) } else { done.resolve(res.body) @@ -220,27 +253,13 @@ export class AcmeCert { /** * accept a challenge - for private use only */ - private acceptChallenge(challengeArg: ISmartAcmeChallenge) { + acceptChallenge() { let done = q.defer() - - /** - * the key is needed to accept the challenge - */ - let authKey: string = plugins.rawacme.keyAuthz( - challengeArg.token, - this.parentAcmeAccount.parentSmartAcme.keyPair.publicKey - ) - - /** - * needed in case selected challenge is of type dns-01 - */ - let keyHash: string = plugins.rawacme.dnsKeyAuthzHash(authKey) // needed if dns challenge is chosen - this.parentAcmeAccount.parentSmartAcme.rawacmeClient.post( - challengeArg.uri, + this.chosenChallenge.uri, { resource: 'challenge', - keyAuthorization: authKey + keyAuthorization: this.chosenChallenge.keyAuthorization }, this.parentAcmeAccount.parentSmartAcme.keyPair, (err, res) => { @@ -248,21 +267,7 @@ export class AcmeCert { console.log(err) done.reject(err) } - /** - * the return challenge - */ - let returnDNSChallenge: ISmartAcmeChallengeAccepted = { - uri: res.body.uri, - type: res.body.type, - token: res.body.token, - keyAuthorization: res.body.keyAuthorization, - status: res.body.status, - dnsKeyHash: keyHash, - domainName: this.domainName, - domainNamePrefixed: helpers.prefixName(this.domainName) - } - this.acceptedChallenge = returnDNSChallenge - done.resolve(returnDNSChallenge) + done.resolve(res.body) } ) return done.promise diff --git a/ts/smartacme.classes.smartacme.ts b/ts/smartacme.classes.smartacme.ts index 7184919..ed432e7 100644 --- a/ts/smartacme.classes.smartacme.ts +++ b/ts/smartacme.classes.smartacme.ts @@ -14,7 +14,7 @@ export interface IRsaKeypair { } export { AcmeAccount } from './smartacme.classes.acmeaccount' -export { AcmeCert, ISmartAcmeChallenge, ISmartAcmeChallengeAccepted } from './smartacme.classes.acmecert' +export { AcmeCert, ISmartAcmeChallenge, ISmartAcmeChallengeChosen } from './smartacme.classes.acmecert' /** * class SmartAcme exports methods for maintaining SSL Certificates