push.rocks/smartacme
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

now has working requestValidation method

Browse Source
This commit is contained in:
Philipp Kunz 2017-01-15 13:33:55 +01:00
parent 4dadcf227c
commit dfd7edd330
5 changed files with 49 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/smartacme.classes.acmecert.d.ts vendored
View File

@ -39,6 +39,7 @@ export interface IAcmeCsrConstructorOptions {
export declare class AcmeCert { export declare class AcmeCert {
domainName: string; domainName: string;
attributes: any; attributes: any;
acceptedChallenge: ISmartAcmeChallengeAccepted;
fullchain: string; fullchain: string;
parentAcmeAccount: AcmeAccount; parentAcmeAccount: AcmeAccount;
csr: any; csr: any;
@ -56,7 +57,7 @@ export declare class AcmeCert {
/** /**
* validates a challenge, only call after you have set the challenge at the expected location * validates a challenge, only call after you have set the challenge at the expected location
*/ */
validate(challenge: ISmartAcmeChallengeAccepted): q.Promise<{}>; requestValidation(): q.Promise<{}>;
/** /**
* requests a certificate * requests a certificate
*/ */
@ -68,5 +69,5 @@ export declare class AcmeCert {
/** /**
* accept a challenge - for private use only * accept a challenge - for private use only
*/ */
private acceptChallenge(challenge); private acceptChallenge(challengeArg);
} }

27
dist/smartacme.classes.acmecert.js vendored
View File

File diff suppressed because one or more lines are too long

8
test/test.js
View File

@ -30,7 +30,7 @@ describe('smartacme', function () {
}); });
}); });
it('should create a AcmeCert', function () { it('should create a AcmeCert', function () {
testAcmeAccount.createAcmeCert('bleu.de').then(x => { testAcmeAccount.createAcmeCert('test1.bleu.de').then(x => {
testAcmeCert = x; testAcmeCert = x;
should(testAcmeAccount).be.instanceOf(smartacme.AcmeCert); should(testAcmeAccount).be.instanceOf(smartacme.AcmeCert);
}); });
@ -43,11 +43,11 @@ describe('smartacme', function () {
done(); done();
}); });
}); });
it.skip('should poll for validation of a challenge', function (done) { it('should poll for validation of a challenge', function (done) {
this.timeout(10000); this.timeout(10000);
testSmartAcme.validate(testChallenge).then(x => { testAcmeCert.requestValidation().then(x => {
done(); done();
}); });
}); });
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFHaEMsNEJBQTRCO0FBQzVCLDJDQUEwQztBQUUxQyxRQUFRLENBQUMsV0FBVyxFQUFFO0lBQ2xCLElBQUksYUFBa0MsQ0FBQTtJQUN0QyxJQUFJLGVBQXNDLENBQUE7SUFDMUMsSUFBSSxZQUFnQyxDQUFBO0lBQ3BDLElBQUksYUFBb0QsQ0FBQTtJQUN4RCxFQUFFLENBQUMsZ0NBQWdDLEVBQUUsVUFBVSxJQUFJO1FBQy9DLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDbkIsYUFBYSxHQUFHLElBQUksU0FBUyxDQUFDLFNBQVMsRUFBRSxDQUFBO1FBQ3pDLGFBQWEsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUM7WUFDdEIsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFBO1lBQ3hELElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsTUFBTSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNsQyxDQUFDLENBQUMsQ0FBQTtJQUVGLEVBQUUsQ0FBQyw2QkFBNkIsRUFBRTtRQUM5QixNQUFNLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQ3RELENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLCtCQUErQixFQUFFLFVBQVUsSUFBSTtRQUM5QyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ25CLGFBQWEsQ0FBQyxhQUFhLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNoQyxlQUFlLEdBQUcsQ0FBQyxDQUFBO1lBQ25CLElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUc7WUFDUixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ2hCLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNiLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7SUFFRixFQUFFLENBQUMsMEJBQTBCLEVBQUU7UUFDM0IsZUFBZSxDQUFDLGNBQWMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUM1QyxZQUFZLEdBQUcsQ0FBQyxDQUFBO1lBQ2hCLE1BQU0sQ0FBQyxlQUFlLENBQUMsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUM3RCxDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLHVDQUF1QyxFQUFFLFVBQVUsSUFBSTtRQUN0RCxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ25CLFlBQVksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLGlCQUFpQjtZQUNuRCxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFDLENBQUE7WUFDOUIsYUFBYSxHQUFHLGlCQUFpQixDQUFBO1lBQ2pDLElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtJQUVGLEVBQUUsQ0FBQyxJQUFJLENBQUMsMkNBQTJDLEVBQUUsVUFBVSxJQUFJO1FBQy9ELElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDbkIsYUFBYSxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUN4QyxJQUFJLEVBQUUsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUMsQ0FBQSJ9 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFHaEMsNEJBQTRCO0FBQzVCLDJDQUEwQztBQUUxQyxRQUFRLENBQUMsV0FBVyxFQUFFO0lBQ2xCLElBQUksYUFBa0MsQ0FBQTtJQUN0QyxJQUFJLGVBQXNDLENBQUE7SUFDMUMsSUFBSSxZQUFnQyxDQUFBO0lBQ3BDLElBQUksYUFBb0QsQ0FBQTtJQUV4RCxFQUFFLENBQUMsZ0NBQWdDLEVBQUUsVUFBVSxJQUFJO1FBQy9DLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDbkIsYUFBYSxHQUFHLElBQUksU0FBUyxDQUFDLFNBQVMsRUFBRSxDQUFBO1FBQ3pDLGFBQWEsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUM7WUFDdEIsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFBO1lBQ3hELElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsTUFBTSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNsQyxDQUFDLENBQUMsQ0FBQTtJQUVGLEVBQUUsQ0FBQyw2QkFBNkIsRUFBRTtRQUM5QixNQUFNLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQ3RELENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLCtCQUErQixFQUFFLFVBQVUsSUFBSTtRQUM5QyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ25CLGFBQWEsQ0FBQyxhQUFhLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNoQyxlQUFlLEdBQUcsQ0FBQyxDQUFBO1lBQ25CLElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUc7WUFDUixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ2hCLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNiLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7SUFFRixFQUFFLENBQUMsMEJBQTBCLEVBQUU7UUFDM0IsZUFBZSxDQUFDLGNBQWMsQ0FBQyxlQUFlLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNsRCxZQUFZLEdBQUcsQ0FBQyxDQUFBO1lBQ2hCLE1BQU0sQ0FBQyxlQUFlLENBQUMsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUM3RCxDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLHVDQUF1QyxFQUFFLFVBQVUsSUFBSTtRQUN0RCxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ25CLFlBQVksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLGlCQUFpQjtZQUNuRCxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFDLENBQUE7WUFDOUIsYUFBYSxHQUFHLGlCQUFpQixDQUFBO1lBQ2pDLElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtJQUVGLEVBQUUsQ0FBQywyQ0FBMkMsRUFBRSxVQUFVLElBQUk7UUFDMUQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNuQixZQUFZLENBQUMsaUJBQWlCLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNuQyxJQUFJLEVBQUUsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUMsQ0FBQSJ9

7
test/test.ts
View File

@ -10,6 +10,7 @@ describe('smartacme', function () {
let testAcmeAccount: smartacme.AcmeAccount let testAcmeAccount: smartacme.AcmeAccount
let testAcmeCert: smartacme.AcmeCert let testAcmeCert: smartacme.AcmeCert
let testChallenge: smartacme.ISmartAcmeChallengeAccepted let testChallenge: smartacme.ISmartAcmeChallengeAccepted
it('should create a valid instance', function (done) { it('should create a valid instance', function (done) {
this.timeout(10000) this.timeout(10000)
testSmartAcme = new smartacme.SmartAcme() testSmartAcme = new smartacme.SmartAcme()
@ -35,7 +36,7 @@ describe('smartacme', function () {
}) })
it('should create a AcmeCert', function() { it('should create a AcmeCert', function() {
testAcmeAccount.createAcmeCert('bleu.de').then(x => { testAcmeAccount.createAcmeCert('test1.bleu.de').then(x => {
testAcmeCert = x testAcmeCert = x
should(testAcmeAccount).be.instanceOf(smartacme.AcmeCert) should(testAcmeAccount).be.instanceOf(smartacme.AcmeCert)
}) })
@ -50,9 +51,9 @@ describe('smartacme', function () {
}) })
}) })
it.skip('should poll for validation of a challenge', function (done) { it('should poll for validation of a challenge', function (done) {
this.timeout(10000) this.timeout(10000)
testSmartAcme.validate(testChallenge).then(x => { testAcmeCert.requestValidation().then(x => {
done() done()
}) })
}) })

28
ts/smartacme.classes.acmecert.ts
View File

@ -48,6 +48,7 @@ export interface IAcmeCsrConstructorOptions {
export class AcmeCert { export class AcmeCert {
domainName: string domainName: string
attributes attributes
acceptedChallenge: ISmartAcmeChallengeAccepted
fullchain: string fullchain: string
parentAcmeAccount: AcmeAccount parentAcmeAccount: AcmeAccount
csr csr
@ -112,7 +113,6 @@ export class AcmeCert {
console.log(err) console.log(err)
done.reject(err) done.reject(err)
} }
console.log(JSON.stringify(res.body))
let dnsChallenge = res.body.challenges.filter(x => { let dnsChallenge = res.body.challenges.filter(x => {
return x.type === challengeTypeArg return x.type === challengeTypeArg
})[0] })[0]
@ -128,16 +128,25 @@ export class AcmeCert {
/** /**
* validates a challenge, only call after you have set the challenge at the expected location * validates a challenge, only call after you have set the challenge at the expected location
*/ */
validate(challenge: ISmartAcmeChallengeAccepted) { requestValidation() {
let done = q.defer() let done = q.defer()
this.parentAcmeAccount.parentSmartAcme.rawacmeClient.poll(challenge.uri, function (err, res) { this.parentAcmeAccount.parentSmartAcme.rawacmeClient.poll(this.acceptedChallenge.uri, (err, res) => {
if (err) { if (err) {
console.log(err) console.log(err)
done.reject(err) done.reject(err)
} }
console.log(res.status) console.log(`Validation response:`)
console.log(JSON.stringify(res.body)) console.log(JSON.stringify(res.body))
done.resolve() if (res.body.status === 'pending' || 'invalid') {
setTimeout(
() => {
this.requestValidation().then(x => { done.resolve(x) })
},
2000
)
} else {
done.resolve(res.body)
}
}) })
return done.promise return done.promise
} }
@ -166,6 +175,8 @@ export class AcmeCert {
console.log(err) console.log(err)
done.reject(err) done.reject(err)
} }
console.log(res.body)
done.resolve(res.body)
}) })
return done.promise return done.promise
} }
@ -180,14 +191,14 @@ export class AcmeCert {
/** /**
* accept a challenge - for private use only * accept a challenge - for private use only
*/ */
private acceptChallenge(challenge: ISmartAcmeChallenge) { private acceptChallenge(challengeArg: ISmartAcmeChallenge) {
let done = q.defer() let done = q.defer()
/** /**
* the key is needed to accept the challenge * the key is needed to accept the challenge
*/ */
let authKey: string = plugins.rawacme.keyAuthz( let authKey: string = plugins.rawacme.keyAuthz(
challenge.token, challengeArg.token,
this.parentAcmeAccount.parentSmartAcme.keyPair.publicKey this.parentAcmeAccount.parentSmartAcme.keyPair.publicKey
) )
@ -197,7 +208,7 @@ export class AcmeCert {
let keyHash: string = plugins.rawacme.dnsKeyAuthzHash(authKey) // needed if dns challenge is chosen let keyHash: string = plugins.rawacme.dnsKeyAuthzHash(authKey) // needed if dns challenge is chosen
this.parentAcmeAccount.parentSmartAcme.rawacmeClient.post( this.parentAcmeAccount.parentSmartAcme.rawacmeClient.post(
challenge.uri, challengeArg.uri,
{ {
resource: 'challenge', resource: 'challenge',
keyAuthorization: authKey keyAuthorization: authKey
@ -219,6 +230,7 @@ export class AcmeCert {
keyHash: keyHash, keyHash: keyHash,
status: res.body.status status: res.body.status
} }
this.acceptedChallenge = returnDNSChallenge
done.resolve(returnDNSChallenge) done.resolve(returnDNSChallenge)
} }
) )