From aec8958ca8de8f727b330929d4fefbce452703ea Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Tue, 15 Dec 2015 22:35:42 +0000 Subject: [PATCH] workin' it --- lib/register-new-account.js | 197 ++++++++++++++++++------------------ 1 file changed, 99 insertions(+), 98 deletions(-) diff --git a/lib/register-new-account.js b/lib/register-new-account.js index 662fff4..4b5ff05 100644 --- a/lib/register-new-account.js +++ b/lib/register-new-account.js @@ -6,112 +6,113 @@ */ 'use strict'; +module.exports.create = function (deps) { + var NOOP=function () {}, log=NOOP; + var request=require('request'); + var importPemPrivateKey=deps.leCrypto.importPemPrivateKey; + var Acme = deps.Acme; -var NOOP=function () {}, log=NOOP; -var request=require('request'); -var cryptoUtil=require('./crypto-util'); -var Acme = require('./acme-client'); + function registerNewAccount(options, cb) { + var state = {}; -function registerNewAccount(options, cb) { - var state = {}; - - if (!options.accountPrivateKeyPem) { - return handleErr(new Error("options.accountPrivateKeyPem must be an ascii private key pem")); - } - if (!options.agreeToTerms) { - cb(new Error("options.agreeToTerms must be function (tosUrl, fn => (err, true))")); - return; - } - if (!options.newReg) { - cb(new Error("options.newReg must be the a new registration url")); - return; - } - if (!options.email) { - cb(new Error("options.email must be an email")); - return; - } - - state.accountKeyPem=options.accountPrivateKeyPem; - state.accountKeyPair=cryptoUtil.importPemPrivateKey(state.accountKeyPem); - state.acme=new Acme(state.accountKeyPair); - - register(); - - function register() { - state.acme.post(options.newReg, { - resource:'new-reg', - contact:['mailto:'+options.email] - }, getTerms); - } - - function getTerms(err, res) { - var links; - - if (err || Math.floor(res.statusCode/100)!==2) { - return handleErr(err, 'Registration request failed: ' + res.body.toString('utf8')); + if (!options.accountPrivateKeyPem) { + return handleErr(new Error("options.accountPrivateKeyPem must be an ascii private key pem")); + } + if (!options.agreeToTerms) { + cb(new Error("options.agreeToTerms must be function (tosUrl, fn => (err, true))")); + return; + } + if (!options.newReg) { + cb(new Error("options.newReg must be the a new registration url")); + return; + } + if (!options.email) { + cb(new Error("options.email must be an email")); + return; } - links=Acme.parseLink(res.headers.link); - if (!links || !('next' in links)) { - return handleErr(err, 'Server didn\'t provide information to proceed (1)'); + state.accountKeyPem=options.accountPrivateKeyPem; + state.accountKeyPair=importPemPrivateKey(state.accountKeyPem); + state.acme=new Acme(state.accountKeyPair); + + register(); + + function register() { + state.acme.post(options.newReg, { + resource:'new-reg', + contact:['mailto:'+options.email] + }, getTerms); } - state.registrationUrl=res.headers.location; - // TODO should we pass this along? - //state.newAuthorizationUrl=links.next; - state.termsRequired=('terms-of-service' in links); + function getTerms(err, res) { + var links; - if (state.termsRequired) { - state.termsUrl=links['terms-of-service']; - options.agreeToTerms(state.termsUrl, function (err, agree) { - if (err) { - return handleErr(err); - } - if (!agree) { - return handleErr(new Error("You must agree to the terms of use at '" + state.termsUrl + "'")); - } - - state.agreeTerms = agree; - state.termsUrl=links['terms-of-service']; - log(state.termsUrl); - request.get(state.termsUrl, getAgreement); - }); - } else { - cb(); - } - } - - function getAgreement(err/*, res, body*/) { - if (err) { - return handleErr(err, 'Couldn\'t get agreement'); - } - log('The CA requires your agreement to terms:\n'+state.termsUrl); - sendAgreement(); - } - - function sendAgreement() { - if (state.termsRequired && !state.agreeTerms) { - return handleErr(null, 'The CA requires your agreement to terms: '+state.termsUrl); - } - - log('Posting agreement to: '+state.registrationUrl); - - state.acme.post(state.registrationUrl, { - resource:'reg', - agreement:state.termsUrl - }, function(err, res, body) { if (err || Math.floor(res.statusCode/100)!==2) { - return handleErr(err, 'Couldn\'t POST agreement back to server', body); - } else { - cb(null, body); + return handleErr(err, 'Registration request failed: ' + res.body.toString('utf8')); } - }); + + links=Acme.parseLink(res.headers.link); + if (!links || !('next' in links)) { + return handleErr(err, 'Server didn\'t provide information to proceed (1)'); + } + + state.registrationUrl=res.headers.location; + // TODO should we pass this along? + //state.newAuthorizationUrl=links.next; + state.termsRequired=('terms-of-service' in links); + + if (state.termsRequired) { + state.termsUrl=links['terms-of-service']; + options.agreeToTerms(state.termsUrl, function (err, agree) { + if (err) { + return handleErr(err); + } + if (!agree) { + return handleErr(new Error("You must agree to the terms of use at '" + state.termsUrl + "'")); + } + + state.agreeTerms = agree; + state.termsUrl=links['terms-of-service']; + log(state.termsUrl); + request.get(state.termsUrl, getAgreement); + }); + } else { + cb(); + } + } + + function getAgreement(err/*, res, body*/) { + if (err) { + return handleErr(err, 'Couldn\'t get agreement'); + } + log('The CA requires your agreement to terms:\n'+state.termsUrl); + sendAgreement(); + } + + function sendAgreement() { + if (state.termsRequired && !state.agreeTerms) { + return handleErr(null, 'The CA requires your agreement to terms: '+state.termsUrl); + } + + log('Posting agreement to: '+state.registrationUrl); + + state.acme.post(state.registrationUrl, { + resource:'reg', + agreement:state.termsUrl + }, function(err, res, body) { + if (err || Math.floor(res.statusCode/100)!==2) { + return handleErr(err, 'Couldn\'t POST agreement back to server', body); + } else { + cb(null, body); + } + }); + } + + function handleErr(err, text, info) { + log(text, err, info); + cb(err || new Error(text)); + } } - function handleErr(err, text, info) { - log(text, err, info); - cb(err || new Error(text)); - } -} - -module.exports = registerNewAccount; + return registerNewAccount; +};