diff --git a/dist/smartacme.classes.acmeclient.d.ts b/dist/smartacme.classes.acmeclient.d.ts index 7f344af..ae5a0d1 100644 --- a/dist/smartacme.classes.acmeclient.d.ts +++ b/dist/smartacme.classes.acmeclient.d.ts @@ -1,3 +1,6 @@ +/// +import * as q from 'q'; +import { IReqResArg } from './smartacme.classes.jwebclient'; /** * @class AcmeClient * @constructor @@ -7,7 +10,7 @@ */ export declare class AcmeClient { clientProfilePubKey: any; - days_valid: number; + daysValid: number; defaultRsaKeySize: number; directory: any; directoryUrl: string; @@ -17,7 +20,7 @@ export declare class AcmeClient { regLink: string; tosLink: string; webroot: string; - well_known_path: string; + wellKnownPath: string; withInteraction: boolean; constructor(directoryUrlArg: any); /** @@ -25,7 +28,7 @@ export declare class AcmeClient { * @description retrieve directory entries (directory url must be set prior to execution) * @param {function} callback - first argument will be the answer object */ - getDirectory(callback: any): void; + getDirectory(): q.Promise; /** * newRegistration * @description try to register (directory lookup must have occured prior to execution) @@ -40,7 +43,7 @@ export declare class AcmeClient { * @param {Object} payload - update information * @param {function} callback - first argument will be the answer object */ - getRegistration(uri: any, payload: any, callback: any): void; + getRegistration(uri: any, payload: any): q.Promise; /** * authorizeDomain * @description authorize domain using challenge-response-method @@ -79,11 +82,10 @@ export declare class AcmeClient { */ requestSigning(domain: any, callback: any): void; /** - * getProfile - * @description retrieve profile of user (will make directory lookup and registration check) + * retrieves profile of user (will make directory lookup and registration check) * @param {function} callback - first argument will be the answer object */ - getProfile(callback: any): void; + getProfile(): q.Promise<{}>; /** * createAccount * @description create new account (assumes directory lookup has already occured) @@ -104,8 +106,9 @@ export declare class AcmeClient { * @param {string} organization * @param {string} country * @param {function} callback + * @returns Promise */ - requestCertificate(domain: any, organization: any, country: any, callback: any): void; + requestCertificate(domain: string, organization: string, country: string): q.Promise<{}>; /** * External: Create key pair * @param {number} bit - key strength, expected to be already sanitized @@ -115,7 +118,7 @@ export declare class AcmeClient { * @param {string} e - email address, expected to be already sanitized * @param {function} callback */ - createKeyPair(bit: any, c: any, o: any, cn: any, e: any, callback: any): void; + createKeyPair(bit: any, c: any, o: any, cn: any, e: any): q.Promise<{}>; /** * Helper: Empty callback */ diff --git a/dist/smartacme.classes.acmeclient.js b/dist/smartacme.classes.acmeclient.js index 53a1c0e..4d5f1cc 100644 --- a/dist/smartacme.classes.acmeclient.js +++ b/dist/smartacme.classes.acmeclient.js @@ -1,6 +1,6 @@ "use strict"; const plugins = require("./smartacme.plugins"); -const child_process = require("child_process"); +const q = require("q"); const crypto = require("crypto"); const fs = require("fs"); const readline = require("readline"); @@ -35,7 +35,7 @@ class AcmeClient { * @desc Validity period in days * @default 1 */ - this.days_valid = 1; + this.daysValid = 1; /** * @member {number} module:AcmeClient~AcmeClient#defaultRsaKeySize * @desc Key strength in bits @@ -89,7 +89,7 @@ class AcmeClient { * @desc Directory structure for challenge data * @default "/.well-known/acme-challenge/" */ - this.well_known_path = '/.well-known/acme-challenge/'; // {string} + this.wellKnownPath = '/.well-known/acme-challenge/'; // {string} /** * @member {boolean} module:AcmeClient~AcmeClient#withInteraction * @desc Determines if interaction of user is required @@ -105,10 +105,13 @@ class AcmeClient { * @description retrieve directory entries (directory url must be set prior to execution) * @param {function} callback - first argument will be the answer object */ - getDirectory(callback) { - this.jWebClient.get(this.directoryUrl, callback, callback); - // dereference - callback = null; + getDirectory() { + let done = q.defer(); + this.jWebClient.get(this.directoryUrl) + .then((reqResArg) => { + done.resolve(reqResArg); + }); + return done.promise; } /** * newRegistration @@ -133,15 +136,9 @@ class AcmeClient { * @param {Object} payload - update information * @param {function} callback - first argument will be the answer object */ - getRegistration(uri, payload, callback) { - /*jshint -W069 */ - if (!(payload instanceof Object)) { - payload = {}; // ensure payload is object - } + getRegistration(uri, payload) { + let done = q.defer(); payload['resource'] = 'reg'; - if (typeof callback !== 'function') { - callback = this.emptyCallback; // ensure callback is function - } this.jWebClient.post(uri, payload, (ans, res) => { if (ans instanceof Object) { this.clientProfilePubKey = ans.key; // cache or reset returned public key @@ -163,14 +160,13 @@ class AcmeClient { else { this.tosLink = null; // reset TOS link } - callback(ans, res); + done.resolve({ ans: ans, res: res }); } else { - callback(false); + done.reject(new Error('some error')); } }); - // dereference - payload = null; + return done.promise; } /** * authorizeDomain @@ -183,7 +179,8 @@ class AcmeClient { if (typeof callback !== 'function') { callback = this.emptyCallback; // ensure callback is function } - this.getProfile((profile) => { + this.getProfile() + .then(profile => { if (!(profile instanceof Object)) { callback(false); // no profile returned } @@ -340,7 +337,7 @@ class AcmeClient { } else { let csr = csrBuffer.toString(); - this.jWebClient.post(this.directory['new-cert'], this.makeCertRequest(csr, this.days_valid), (ans, res) => { + this.jWebClient.post(this.directory['new-cert'], this.makeCertRequest(csr, this.daysValid), (ans, res) => { if ((ans instanceof Buffer) && (ans.length > 0)) { callback(ans); // certificate was returned with answer } @@ -368,18 +365,15 @@ class AcmeClient { }); } /** - * getProfile - * @description retrieve profile of user (will make directory lookup and registration check) + * retrieves profile of user (will make directory lookup and registration check) * @param {function} callback - first argument will be the answer object */ - getProfile(callback) { - /*jshint -W069 */ - if (typeof callback !== 'function') { - callback = this.emptyCallback; // ensure callback is function - } - this.getDirectory((dir) => { + getProfile() { + let done = q.defer(); + this.getDirectory() + .then((dir) => { if (!(dir instanceof Object)) { - callback(false); // server did not respond with directory + done.reject(new Error('server did not respond with directory')); } else { this.directory = dir; // cache directory @@ -388,14 +382,18 @@ class AcmeClient { && (res['headers'] instanceof Object) && (typeof res.headers['location'] === 'string')) { this.regLink = res.headers['location']; - this.getRegistration(this.regLink, null, callback); // get registration info from link + this.getRegistration(this.regLink, null) + .then((reqResArg) => { + done.resolve(); + }); // get registration info from link } else { - callback(false); // registration failed + done.reject(new Error('registration failed')); } }); } }); + return done.promise; } /** * createAccount @@ -437,11 +435,10 @@ class AcmeClient { * @param {function} callback - first argument will be the answer object */ agreeTos(tosLink, callback) { + let done = q.defer(); this.getRegistration(this.regLink, { 'Agreement': tosLink // terms of service URI - }, callback); - // dereference - callback = null; + }).then(() => { done.resolve(); }); } /** * Entry-Point: Request certificate @@ -449,23 +446,13 @@ class AcmeClient { * @param {string} organization * @param {string} country * @param {function} callback + * @returns Promise */ - requestCertificate(domain, organization, country, callback) { - /*jshint -W069 */ - if (typeof domain !== 'string') { - domain = ''; // ensure domain is string - } - if (typeof callback !== 'function') { - callback = this.emptyCallback; // ensure callback is function - } - this.getProfile((profile) => { + requestCertificate(domain, organization, country) { + let done = q.defer(); + this.getProfile() + .then((profile) => { let email = this.extractEmail(profile); // try to determine email address from profile - if (typeof this.emailOverride === 'string') { - email = this.emailOverride; // override email address if set - } - else if (typeof email !== 'string') { - email = this.emailDefaultPrefix + '@' + domain; // or set default - } let bit = this.defaultRsaKeySize; // sanitize bit = Number(bit); @@ -474,32 +461,29 @@ class AcmeClient { email = this.makeSafeFileName(email); organization = this.makeSafeFileName(organization); // create key pair - this.createKeyPair(bit, country, organization, domain, email, (e) => { - if (!e) { - this.requestSigning(domain, (cert) => { - if ((cert instanceof Buffer) || (typeof cert === 'string')) { - fs.writeFile(domain + '.der', cert, (err) => { - if (err instanceof Object) { - if (this.jWebClient.verbose) { - console.error('Error : File system error', err['code'], 'while writing certificate to file'); - } - callback(false); + this.createKeyPair(bit, country, organization, domain, email) + .then(() => { + this.requestSigning(domain, (cert) => { + if ((cert instanceof Buffer) || (typeof cert === 'string')) { + fs.writeFile(domain + '.der', cert, (err) => { + if (err instanceof Object) { + if (this.jWebClient.verbose) { + console.error('Error : File system error', err['code'], 'while writing certificate to file'); } - else { - callback(true); // CSR complete and certificate written to file system - } - }); - } - else { - callback(false); // invalid certificate data - } - }); - } - else { - callback(false); // could not create key pair - } + done.reject(err); + } + else { + done.resolve(); // CSR complete and certificate written to file system + } + }); + } + else { + done.reject('invalid certificate data'); + } + }); }); }); + return done.promise; } /** * External: Create key pair @@ -510,27 +494,22 @@ class AcmeClient { * @param {string} e - email address, expected to be already sanitized * @param {function} callback */ - createKeyPair(bit, c, o, cn, e, callback) { - if (typeof callback !== 'function') { - callback = this.emptyCallback; // ensure callback is function - } + createKeyPair(bit, c, o, cn, e) { + let done = q.defer(); let openssl = `openssl req -new -nodes -newkey rsa:${bit} -sha256 -subj "/C=${c}/O=${o}/CN=${cn}/emailAddress=${e}" -keyout \"${cn}.key\" -outform der -out \"${cn}.csr\"`; console.error('Action : Creating key pair'); if (this.jWebClient.verbose) { console.error('Running:', openssl); } - child_process.exec(openssl, (e) => { - if (!e) { - console.error('Result : done'); + plugins.shelljs.exec(openssl, (codeArg, stdOutArg, stdErrorArg) => { + if (!stdErrorArg) { + done.resolve(); } else { - console.error('Result : failed'); + done.reject(stdErrorArg); } - callback(e); - // dereference - callback = null; - e = null; }); + return done.promise; } /** * Helper: Empty callback @@ -549,9 +528,9 @@ class AcmeClient { name = ''; } // respects file name restrictions for ntfs and ext2 - let regex_file = '[<>:\"/\\\\\\|\\?\\*\\u0000-\\u001f\\u007f\\u0080-\\u009f]'; - let regex_path = '[<>:\"\\\\\\|\\?\\*\\u0000-\\u001f\\u007f\\u0080-\\u009f]'; - return name.replace(new RegExp(withPath ? regex_path : regex_file, 'g'), (charToReplace) => { + let regexFile = '[<>:\"/\\\\\\|\\?\\*\\u0000-\\u001f\\u007f\\u0080-\\u009f]'; + let regexPath = '[<>:\"\\\\\\|\\?\\*\\u0000-\\u001f\\u007f\\u0080-\\u009f]'; + return name.replace(new RegExp(withPath ? regexPath : regexFile, 'g'), (charToReplace) => { if (typeof charToReplace === 'string') { return '%' + charToReplace.charCodeAt(0).toString(16).toLocaleUpperCase(); } @@ -571,7 +550,7 @@ class AcmeClient { } if (challenge instanceof Object) { if (challenge['type'] === 'http-01') { - let path = this.webroot + this.well_known_path + challenge['token']; // webroot and well_known_path are expected to be already sanitized + let path = this.webroot + this.wellKnownPath + challenge['token']; // webroot and well_known_path are expected to be already sanitized fs.writeFile(path, this.makeKeyAuthorization(challenge), (err) => { if (err instanceof Object) { if (this.jWebClient.verbose) { @@ -746,4 +725,4 @@ class AcmeClient { } } exports.AcmeClient = AcmeClient; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartacme.classes.acmeclient.js","sourceRoot":"","sources":["../ts/smartacme.classes.acmeclient.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartacme.classes.acmeclient.js","sourceRoot":"","sources":["../ts/smartacme.classes.acmeclient.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/smartacme.classes.jwebclient.d.ts b/dist/smartacme.classes.jwebclient.d.ts index ad0360a..b6fa06c 100644 --- a/dist/smartacme.classes.jwebclient.d.ts +++ b/dist/smartacme.classes.jwebclient.d.ts @@ -1,11 +1,27 @@ +/// +import * as q from 'q'; +export interface IReqResArg { + ans: any; + res: any; +} /** * @class JWebClient * @constructor * @description Implementation of HTTPS-based JSON-Web-Client */ export declare class JWebClient { - key_pair: any; - last_nonce: string; + /** + * User account key pair + */ + keyPair: any; + /** + * Cached nonce returned with last request + */ + lastNonce: string; + /** + * @member {boolean} module:JWebClient~JWebClient#verbose + * @desc Determines verbose mode + */ verbose: boolean; constructor(); /** @@ -27,7 +43,7 @@ export declare class JWebClient { * @param {function} callback * @param {function} errorCallback */ - request(query: any, payload: any, callback: any, errorCallback: any): void; + request(query: string, payload?: string): q.Promise<{}>; /** * get * @description make GET request @@ -35,27 +51,21 @@ export declare class JWebClient { * @param {function} callback * @param {function} errorCallback */ - get(uri: any, callback: any, errorCallback: any): void; + get(uri: string): q.Promise; /** - * post - * @description make POST request + * make POST request * @param {string} uri * @param {Object|string|number|boolean} payload * @param {function} callback * @param {function} errorCallback */ - post(uri: any, payload: any, callback: any, errorCallback: any): void; + post(uri: string, payload: any): q.Promise; /** - * evaluateStatus - * @description check if status is expected and log errors + * checks if status is expected and log errors * @param {string} uri * @param {Object|string|number|boolean} payload * @param {Object|string} ans * @param {Object} res */ evaluateStatus(uri: any, payload: any, ans: any, res: any): void; - /** - * Helper: Empty callback - */ - emptyCallback(): void; } diff --git a/dist/smartacme.classes.jwebclient.js b/dist/smartacme.classes.jwebclient.js index 75e7db2..162c10c 100644 --- a/dist/smartacme.classes.jwebclient.js +++ b/dist/smartacme.classes.jwebclient.js @@ -3,6 +3,7 @@ const plugins = require("./smartacme.plugins"); const https = require("https"); let jwa = require('jwa'); const url = require("url"); +const q = require("q"); /** * json_to_utf8base64url * @private @@ -11,7 +12,7 @@ const url = require("url"); * @return {string} * @throws Exception if object cannot be stringified or contains cycle */ -let json_to_utf8base64url = function (obj) { +let json_to_utf8base64url = (obj) => { return plugins.smartstring.base64.encodeUri(JSON.stringify(obj)); }; /** @@ -22,19 +23,13 @@ let json_to_utf8base64url = function (obj) { class JWebClient { constructor() { /** - * @member {Object} module:JWebClient~JWebClient#key_pair - * @desc User account key pair + * User account key pair */ - this.key_pair = {}; + this.keyPair = {}; /** - * @member {string} module:JWebClient~JWebClient#last_nonce - * @desc Cached nonce returned with last request - */ - this.last_nonce = null; - /** - * @member {boolean} module:JWebClient~JWebClient#verbose - * @desc Determines verbose mode + * Cached nonce returned with last request */ + this.lastNonce = null; this.verbose = false; } /** @@ -87,17 +82,8 @@ class JWebClient { * @param {function} callback * @param {function} errorCallback */ - request(query, payload, callback, errorCallback) { - /*jshint -W069 */ - if (typeof query !== 'string') { - query = ''; // ensure query is string - } - if (typeof callback !== 'function') { - callback = this.emptyCallback; // ensure callback is function - } - if (typeof errorCallback !== 'function') { - errorCallback = this.emptyCallback; // ensure callback is function - } + request(query, payload = null) { + let done = q.defer(); // prepare options let uri = url.parse(query); let options = { @@ -107,7 +93,7 @@ class JWebClient { method: null, headers: {} }; - if (typeof payload === 'string') { + if (!payload === null) { options.method = 'POST'; options.headers = { 'Content-Type': 'application/jose', @@ -118,15 +104,15 @@ class JWebClient { options.method = 'GET'; } // prepare request - let req = https.request(options, function (res) { + let req = https.request(options, (res) => { // receive data let data = []; - res.on('data', function (block) { + res.on('data', (block) => { if (block instanceof Buffer) { data.push(block); } }); - res.on('end', function () { + res.on('end', () => { let buf = Buffer.concat(data); let isJSON = ((res instanceof Object) && (res['headers'] instanceof Object) @@ -136,28 +122,26 @@ class JWebClient { try { // convert to JSON let json = JSON.parse(buf.toString('utf8')); - callback(json, res); + done.resolve({ json: json, res: res }); } catch (e) { // error (if empty or invalid JSON) - errorCallback(void 0, e); + done.reject(e); } } - else { - callback(buf, res); - } }); - }).on('error', function (e) { + }).on('error', (e) => { console.error('Error occured', e); // error - errorCallback(void 0, e); + done.reject(e); }); // write POST body if payload was specified - if (typeof payload === 'string') { + if (!payload === null) { req.write(payload); } // make request req.end(); + return done.promise; } /** * get @@ -166,62 +150,48 @@ class JWebClient { * @param {function} callback * @param {function} errorCallback */ - get(uri, callback, errorCallback) { - /*jshint -W069 */ - let ctx = this; - if (typeof callback !== 'function') { - callback = this.emptyCallback; // ensure callback is function - } - this.request(uri, void 0, function (ans, res) { - ctx.evaluateStatus(uri, null, ans, res); + get(uri) { + let done = q.defer(); + this.request(uri) + .then((reqResArg) => { + this.evaluateStatus(uri, null, reqResArg.ans, reqResArg.res); // save replay nonce for later requests - if ((res instanceof Object) && (res['headers'] instanceof Object)) { - ctx.last_nonce = res.headers['replay-nonce']; + if ((reqResArg.res instanceof Object) && (reqResArg.res['headers'] instanceof Object)) { + this.lastNonce = reqResArg.res.headers['replay-nonce']; } - callback(ans, res); - // dereference - ans = null; - callback = null; - ctx = null; - res = null; - }, errorCallback); - // dereference - errorCallback = null; + done.resolve(reqResArg); + }); + return done.promise; } /** - * post - * @description make POST request + * make POST request * @param {string} uri * @param {Object|string|number|boolean} payload * @param {function} callback * @param {function} errorCallback */ - post(uri, payload, callback, errorCallback) { - /*jshint -W069 */ - let ctx = this; - if (typeof callback !== 'function') { - callback = this.emptyCallback; // ensure callback is function - } - let jwt = this.createJWT(this.last_nonce, payload, 'RS256', this.key_pair['private_pem'], this.key_pair['public_jwk']); - this.request(uri, jwt, (ans, res) => { - ctx.evaluateStatus(uri, payload, ans, res); + post(uri, payload) { + let done = q.defer(); + let jwt = this.createJWT(this.lastNonce, payload, 'RS256', this.keyPair['private_pem'], this.keyPair['public_jwk']); + this.request(uri, jwt) + .then((reqResArg) => { + this.evaluateStatus(uri, payload, reqResArg.ans, reqResArg.res); // save replay nonce for later requests - if ((res instanceof Object) && (res['headers'] instanceof Object)) { - ctx.last_nonce = res.headers['replay-nonce']; + if ((reqResArg.res instanceof Object) && (reqResArg.res['headers'] instanceof Object)) { + this.lastNonce = reqResArg.res.headers['replay-nonce']; } - callback(ans, res); - }, errorCallback); + done.resolve(reqResArg); + }); + return done.promise; } /** - * evaluateStatus - * @description check if status is expected and log errors + * checks if status is expected and log errors * @param {string} uri * @param {Object|string|number|boolean} payload * @param {Object|string} ans * @param {Object} res */ evaluateStatus(uri, payload, ans, res) { - /*jshint -W069 */ if (this.verbose) { if ((payload instanceof Object) || (typeof payload === 'string') @@ -247,12 +217,6 @@ class JWebClient { console.error('Receive:', ans); // received data } } - /** - * Helper: Empty callback - */ - emptyCallback() { - // nop - } } exports.JWebClient = JWebClient; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartacme.classes.jwebclient.js","sourceRoot":"","sources":["../ts/smartacme.classes.jwebclient.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartacme.classes.jwebclient.js","sourceRoot":"","sources":["../ts/smartacme.classes.jwebclient.ts"],"names":[],"mappings":";AAAA,+CAA8C;AAC9C,+BAA8B;AAC9B,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,CAAA;AACxB,2BAA0B;AAC1B,uBAAsB;AAQtB;;;;;;;GAOG;AACH,IAAI,qBAAqB,GAAG,CAAC,GAAG;IAC5B,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;AACpE,CAAC,CAAA;AAED;;;;GAIG;AACH;IAgBI;QAfA;;WAEG;QACH,YAAO,GAAQ,EAAE,CAAA;QAEjB;;WAEG;QACH,cAAS,GAAW,IAAI,CAAA;QAQpB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;IACxB,CAAC;IAED;;;;;;;;;OASG;IACH,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;QACnC,iBAAiB;QACjB,cAAc;QACd,EAAE,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC;YACxB,GAAG,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QACjE,CAAC;QACD,iBAAiB;QACjB,IAAI,MAAM,GAAG;YACT,GAAG,EAAE,KAAK;YACV,GAAG,EAAE,GAAG;YACR,GAAG,EAAE,GAAG;YACR,KAAK,EAAE,IAAI;SACd,CAAA;QAED,EAAE,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC;YACnB,MAAM,CAAC,KAAK,GAAG,KAAK,CAAA;QACxB,CAAC;QACD,iCAAiC;QACjC,IAAI,KAAK,GAAG;YACR,qBAAqB,CAAC,MAAM,CAAC;YAC7B,qBAAqB,CAAC,OAAO,CAAC;SACjC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACX,aAAa;QACb,IAAI,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,CAAA;QACnB,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QAC/B,kCAAkC;QAClC,IAAI,MAAM,GAAG;YACT,KAAK;YACL,GAAG;SACN,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACX,SAAS;QACT,MAAM,CAAC,MAAM,CAAA;IACjB,CAAC;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,KAAa,EAAE,UAAkB,IAAI;QACzC,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,kBAAkB;QAClB,IAAI,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC1B,IAAI,OAAO,GAAG;YACV,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;YAC5B,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,EAAE;SACd,CAAA;QACD,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC;YACpB,OAAO,CAAC,MAAM,GAAG,MAAM,CAAA;YACvB,OAAO,CAAC,OAAO,GAAG;gBACd,cAAc,EAAE,kBAAkB;gBAClC,gBAAgB,EAAE,OAAO,CAAC,MAAM;aACnC,CAAA;QACL,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,OAAO,CAAC,MAAM,GAAG,KAAK,CAAA;QAC1B,CAAC;QACD,kBAAkB;QAClB,IAAI,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,GAAG;YACjC,eAAe;YACf,IAAI,IAAI,GAAG,EAAE,CAAA;YACb,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK;gBACjB,EAAE,CAAC,CAAC,KAAK,YAAY,MAAM,CAAC,CAAC,CAAC;oBAC1B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACpB,CAAC;YACL,CAAC,CAAC,CAAA;YACF,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE;gBACV,IAAI,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;gBAC7B,IAAI,MAAM,GAAG,CACT,CAAC,GAAG,YAAY,MAAM,CAAC;uBACpB,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,MAAM,CAAC;uBAClC,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,QAAQ,CAAC;uBACjD,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CACxD,CAAA;gBACD,EAAE,CAAC,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;oBAC3B,IAAI,CAAC;wBACD,kBAAkB;wBAClB,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;wBAC3C,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;oBAC1C,CAAE;oBAAA,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBACT,mCAAmC;wBACnC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;oBAClB,CAAC;gBACL,CAAC;YACL,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC,CAAA;YACjC,QAAQ;YACR,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAClB,CAAC,CAAC,CAAA;QACF,2CAA2C;QAC3C,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC;YACpB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QACtB,CAAC;QACD,eAAe;QACf,GAAG,CAAC,GAAG,EAAE,CAAA;QACT,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;;OAMG;IACH,GAAG,CAAC,GAAW;QACX,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAc,CAAA;QAChC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;aACZ,IAAI,CAAC,CAAC,SAAqB;YACxB,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,CAAA;YAC5D,uCAAuC;YACvC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;gBACpF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;YAC1D,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAC3B,CAAC,CAAC,CAAA;QACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;;OAMG;IACH,IAAI,CAAC,GAAW,EAAE,OAAO;QACrB,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAc,CAAA;QAChC,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CACpB,IAAI,CAAC,SAAS,EACd,OAAO,EACP,OAAO,EACP,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAC3B,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAA;QAC/B,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC;aACjB,IAAI,CAAC,CAAC,SAAqB;YACxB,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,CAAA;YAC/D,uCAAuC;YACvC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;gBACpF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;YAC1D,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAC3B,CAAC,CAAC,CAAA;QACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;;OAMG;IACH,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG;QACjC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YACf,EAAE,CAAC,CACC,CAAC,OAAO,YAAY,MAAM,CAAC;mBACxB,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC;mBAC7B,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC;mBAC7B,CAAC,OAAO,OAAO,KAAK,SAAS,CACpC,CAAC,CAAC,CAAC;gBACC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA,CAAC,qBAAqB;YAC5D,CAAC;QACL,CAAC;QACD,IAAI,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC/B,EAAE,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;YACtD,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,YAAY,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,CAAA,CAAC,8BAA8B;QAChG,CAAC;QACD,EAAE,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;YACtD,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,YAAY,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,CAAA,CAAC,yBAAyB;YACvF,EAAE,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC;gBACxB,EAAE,CAAC,CAAC,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC;oBACpC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,CAAA,CAAC,uBAAuB;gBACrF,CAAC;YACL,CAAC;QACL,CAAC;QACD,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAA,CAAC,mBAAmB;YAC7D,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA,CAAC,gBAAgB;QACnD,CAAC;IACL,CAAC;CACJ;AAzND,gCAyNC"} \ No newline at end of file diff --git a/dist/smartacme.plugins.d.ts b/dist/smartacme.plugins.d.ts index 092605d..a61b275 100644 --- a/dist/smartacme.plugins.d.ts +++ b/dist/smartacme.plugins.d.ts @@ -1,4 +1,5 @@ import 'typings-global'; import * as path from 'path'; import * as smartstring from 'smartstring'; -export { path, smartstring }; +import * as shelljs from 'shelljs'; +export { path, smartstring, shelljs }; diff --git a/dist/smartacme.plugins.js b/dist/smartacme.plugins.js index 5a09677..50be8e7 100644 --- a/dist/smartacme.plugins.js +++ b/dist/smartacme.plugins.js @@ -4,4 +4,6 @@ const path = require("path"); exports.path = path; const smartstring = require("smartstring"); exports.smartstring = smartstring; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGFjbWUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBQ3ZCLDZCQUE0QjtBQUl4QixvQkFBSTtBQUhSLDJDQUEwQztBQUl0QyxrQ0FBVyJ9 \ No newline at end of file +const shelljs = require("shelljs"); +exports.shelljs = shelljs; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGFjbWUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBQ3ZCLDZCQUE0QjtBQUt4QixvQkFBSTtBQUpSLDJDQUEwQztBQUt0QyxrQ0FBVztBQUpmLG1DQUFrQztBQUs5QiwwQkFBTyJ9 \ No newline at end of file diff --git a/package.json b/package.json index b47fdad..16fcfda 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,9 @@ "dependencies": { "@types/base64url": "^2.0.3", "jwa": "^1.1.3", + "q": "^1.4.1", "rsa-pem-to-jwk": "^1.1.3", + "shelljs": "^0.7.5", "smartstring": "^2.0.20", "typings-global": "^1.0.14" }, diff --git a/ts/smartacme.classes.acmeclient.ts b/ts/smartacme.classes.acmeclient.ts index 1452b4c..84fc287 100644 --- a/ts/smartacme.classes.acmeclient.ts +++ b/ts/smartacme.classes.acmeclient.ts @@ -1,9 +1,10 @@ import * as plugins from './smartacme.plugins' -import * as child_process from 'child_process' +import * as q from 'q' import * as crypto from 'crypto' import * as fs from 'fs' import * as readline from 'readline' import { JWebClient } from './smartacme.classes.jwebclient' +import { IReqResArg } from './smartacme.classes.jwebclient' /** * json_to_utf8buffer @@ -121,10 +122,13 @@ export class AcmeClient { * @description retrieve directory entries (directory url must be set prior to execution) * @param {function} callback - first argument will be the answer object */ - getDirectory(callback) { - this.jWebClient.get(this.directoryUrl, callback, callback) - // dereference - callback = null + getDirectory() { + let done = q.defer() + this.jWebClient.get(this.directoryUrl) + .then((reqResArg: IReqResArg) => { + done.resolve(reqResArg) + }) + return done.promise } /** @@ -151,16 +155,10 @@ export class AcmeClient { * @param {Object} payload - update information * @param {function} callback - first argument will be the answer object */ - getRegistration(uri, payload, callback) { - /*jshint -W069 */ - if (!(payload instanceof Object)) { - payload = {} // ensure payload is object - } + getRegistration(uri, payload) { + let done = q.defer() payload['resource'] = 'reg' - if (typeof callback !== 'function') { - callback = this.emptyCallback // ensure callback is function - } - this.jWebClient.post(uri, payload,(ans, res) => { + this.jWebClient.post(uri, payload, (ans, res) => { if (ans instanceof Object) { this.clientProfilePubKey = ans.key // cache or reset returned public key if ((res instanceof Object) && (res['headers'] instanceof Object)) { @@ -178,13 +176,12 @@ export class AcmeClient { } else { this.tosLink = null // reset TOS link } - callback(ans, res) + done.resolve({ ans: ans, res: res }) } else { - callback(false) + done.reject(new Error('some error')) } }) - // dereference - payload = null + return done.promise } /** @@ -198,59 +195,60 @@ export class AcmeClient { if (typeof callback !== 'function') { callback = this.emptyCallback // ensure callback is function } - this.getProfile((profile) => { - if (!(profile instanceof Object)) { - callback(false) // no profile returned - } else { - this.jWebClient.post(this.directory['new-authz'], this.makeDomainAuthorizationRequest(domain), (ans, res) => { - if ((res instanceof Object) && (res['statusCode'] === 403)) { // if unauthorized - this.agreeTos(this.tosLink, (ans_, res_) => { // agree to TOS - if ( // if TOS were agreed successfully - (res_ instanceof Object) - && (res_['statusCode'] >= 200) - && (res_['statusCode'] <= 400) - ) { - this.authorizeDomain(domain, callback) // try authorization again - } else { - callback(false) // agreement failed - } - }) - } else { - if ( - (res instanceof Object) - && (res['headers'] instanceof Object) - && (typeof res.headers['location'] === 'string') - && (ans instanceof Object) - ) { - let poll_uri = res.headers['location'] // status URI for polling - let challenge = this.selectChallenge(ans, 'http-01') // select simple http challenge - if (challenge instanceof Object) { // desired challenge is in list - this.prepareChallenge(domain, challenge, () => { // prepare all objects and files for challenge - // reset - ans = null - res = null - // accept challenge - this.acceptChallenge(challenge, (ans, res) => { - if ( - (res instanceof Object) - && (res['statusCode'] < 400) // server confirms challenge acceptance - ) { - this.pollUntilValid(poll_uri, callback) // poll status until server states success - } else { - callback(false) // server did not confirm challenge acceptance - } - }) - }) - } else { - callback(false) // desired challenge is not in list - } + this.getProfile() + .then(profile => { + if (!(profile instanceof Object)) { + callback(false) // no profile returned + } else { + this.jWebClient.post(this.directory['new-authz'], this.makeDomainAuthorizationRequest(domain), (ans, res) => { + if ((res instanceof Object) && (res['statusCode'] === 403)) { // if unauthorized + this.agreeTos(this.tosLink, (ans_, res_) => { // agree to TOS + if ( // if TOS were agreed successfully + (res_ instanceof Object) + && (res_['statusCode'] >= 200) + && (res_['statusCode'] <= 400) + ) { + this.authorizeDomain(domain, callback) // try authorization again + } else { + callback(false) // agreement failed + } + }) } else { - callback(false) // server did not respond with status URI + if ( + (res instanceof Object) + && (res['headers'] instanceof Object) + && (typeof res.headers['location'] === 'string') + && (ans instanceof Object) + ) { + let poll_uri = res.headers['location'] // status URI for polling + let challenge = this.selectChallenge(ans, 'http-01') // select simple http challenge + if (challenge instanceof Object) { // desired challenge is in list + this.prepareChallenge(domain, challenge, () => { // prepare all objects and files for challenge + // reset + ans = null + res = null + // accept challenge + this.acceptChallenge(challenge, (ans, res) => { + if ( + (res instanceof Object) + && (res['statusCode'] < 400) // server confirms challenge acceptance + ) { + this.pollUntilValid(poll_uri, callback) // poll status until server states success + } else { + callback(false) // server did not confirm challenge acceptance + } + }) + }) + } else { + callback(false) // desired challenge is not in list + } + } else { + callback(false) // server did not respond with status URI + } } - } - }) - } - }) + }) + } + }) } /** @@ -316,7 +314,7 @@ export class AcmeClient { if (retry > 128) { callback(false) // stop if retry value exceeds maximum } else { - this.jWebClient.get(uri,(ans, res) => { + this.jWebClient.get(uri, (ans, res) => { if ((ans instanceof Buffer) && (ans.length > 0)) { callback(ans) // certificate was returned with answer } else { @@ -377,34 +375,35 @@ export class AcmeClient { } /** - * getProfile - * @description retrieve profile of user (will make directory lookup and registration check) + * retrieves profile of user (will make directory lookup and registration check) * @param {function} callback - first argument will be the answer object */ - getProfile(callback) { - /*jshint -W069 */ - if (typeof callback !== 'function') { - callback = this.emptyCallback // ensure callback is function - } - this.getDirectory((dir) => { - if (!(dir instanceof Object)) { - callback(false) // server did not respond with directory - } else { - this.directory = dir // cache directory - this.newRegistration(null, (ans, res) => { // try new registration to get registration link - if ( - (res instanceof Object) - && (res['headers'] instanceof Object) - && (typeof res.headers['location'] === 'string') - ) { - this.regLink = res.headers['location'] - this.getRegistration(this.regLink, null, callback) // get registration info from link - } else { - callback(false) // registration failed - } - }) - } - }) + getProfile() { + let done = q.defer() + this.getDirectory() + .then((dir) => { + if (!(dir instanceof Object)) { + done.reject(new Error('server did not respond with directory')) + } else { + this.directory = dir // cache directory + this.newRegistration(null, (ans, res) => { // try new registration to get registration link + if ( + (res instanceof Object) + && (res['headers'] instanceof Object) + && (typeof res.headers['location'] === 'string') + ) { + this.regLink = res.headers['location'] + this.getRegistration(this.regLink, null) + .then((reqResArg: IReqResArg) => { + done.resolve() + }) // get registration info from link + } else { + done.reject(new Error('registration failed')) + } + }) + } + }) + return done.promise } /** @@ -450,11 +449,10 @@ export class AcmeClient { * @param {function} callback - first argument will be the answer object */ agreeTos(tosLink, callback) { + let done = q.defer() this.getRegistration(this.regLink, { 'Agreement': tosLink // terms of service URI - }, callback) - // dereference - callback = null + }).then(() => { done.resolve() }) } /** @@ -463,53 +461,43 @@ export class AcmeClient { * @param {string} organization * @param {string} country * @param {function} callback + * @returns Promise */ - requestCertificate(domain, organization, country, callback) { - /*jshint -W069 */ - if (typeof domain !== 'string') { - domain = '' // ensure domain is string - } - if (typeof callback !== 'function') { - callback = this.emptyCallback // ensure callback is function - } - this.getProfile((profile) => { - let email = this.extractEmail(profile) // try to determine email address from profile - if (typeof this.emailOverride === 'string') { - email = this.emailOverride // override email address if set - } else if (typeof email !== 'string') { - email = this.emailDefaultPrefix + '@' + domain // or set default - } - let bit = this.defaultRsaKeySize - // sanitize - bit = Number(bit) - country = this.makeSafeFileName(country) - domain = this.makeSafeFileName(domain) - email = this.makeSafeFileName(email) - organization = this.makeSafeFileName(organization) - // create key pair - this.createKeyPair(bit, country, organization, domain, email, (e) => { // create key pair - if (!e) { - this.requestSigning(domain, (cert) => { // send CSR - if ((cert instanceof Buffer) || (typeof cert === 'string')) { // valid certificate data - fs.writeFile(domain + '.der', cert, (err) => { // sanitize domain name for file path - if (err instanceof Object) { // file system error - if (this.jWebClient.verbose) { - console.error('Error : File system error', err['code'], 'while writing certificate to file') + requestCertificate(domain: string, organization: string, country: string) { + let done = q.defer() + this.getProfile() + .then((profile) => { + let email = this.extractEmail(profile) // try to determine email address from profile + let bit = this.defaultRsaKeySize + // sanitize + bit = Number(bit) + country = this.makeSafeFileName(country) + domain = this.makeSafeFileName(domain) + email = this.makeSafeFileName(email) + organization = this.makeSafeFileName(organization) + // create key pair + this.createKeyPair(bit, country, organization, domain, email) + .then(() => { // create key pair + this.requestSigning(domain, (cert) => { // send CSR + if ((cert instanceof Buffer) || (typeof cert === 'string')) { // valid certificate data + fs.writeFile(domain + '.der', cert, (err) => { // sanitize domain name for file path + if (err instanceof Object) { // file system error + if (this.jWebClient.verbose) { + console.error('Error : File system error', err['code'], 'while writing certificate to file') + } + done.reject(err) + } else { + done.resolve() // CSR complete and certificate written to file system } - callback(false) - } else { - callback(true) // CSR complete and certificate written to file system - } - }) - } else { - callback(false) // invalid certificate data - } + }) + } else { + done.reject('invalid certificate data') + } + }) + }) - } else { - callback(false) // could not create key pair - } }) - }) + return done.promise } /** @@ -521,27 +509,21 @@ export class AcmeClient { * @param {string} e - email address, expected to be already sanitized * @param {function} callback */ - createKeyPair(bit, c, o, cn, e, callback) { - if (typeof callback !== 'function') { - callback = this.emptyCallback // ensure callback is function - } + createKeyPair(bit, c, o, cn, e) { + let done = q.defer() let openssl = `openssl req -new -nodes -newkey rsa:${bit} -sha256 -subj "/C=${c}/O=${o}/CN=${cn}/emailAddress=${e}" -keyout \"${cn}.key\" -outform der -out \"${cn}.csr\"` console.error('Action : Creating key pair') if (this.jWebClient.verbose) { console.error('Running:', openssl) } - child_process.exec(openssl, (e) => { - if (!e) { - console.error('Result : done') + plugins.shelljs.exec(openssl, (codeArg, stdOutArg, stdErrorArg) => { + if (!stdErrorArg) { + done.resolve() } else { - console.error('Result : failed') + done.reject(stdErrorArg) } - callback(e) - // dereference - callback = null - e = null - } - ) + }) + return done.promise } /** @@ -562,9 +544,9 @@ export class AcmeClient { name = '' } // respects file name restrictions for ntfs and ext2 - let regex_file = '[<>:\"/\\\\\\|\\?\\*\\u0000-\\u001f\\u007f\\u0080-\\u009f]' - let regex_path = '[<>:\"\\\\\\|\\?\\*\\u0000-\\u001f\\u007f\\u0080-\\u009f]' - return name.replace(new RegExp(withPath ? regex_path : regex_file, 'g'), (charToReplace) => { + let regexFile = '[<>:\"/\\\\\\|\\?\\*\\u0000-\\u001f\\u007f\\u0080-\\u009f]' + let regexPath = '[<>:\"\\\\\\|\\?\\*\\u0000-\\u001f\\u007f\\u0080-\\u009f]' + return name.replace(new RegExp(withPath ? regexPath : regexFile, 'g'), (charToReplace) => { if (typeof charToReplace === 'string') { return '%' + charToReplace.charCodeAt(0).toString(16).toLocaleUpperCase() } diff --git a/ts/smartacme.classes.jwebclient.ts b/ts/smartacme.classes.jwebclient.ts index c340787..610951e 100644 --- a/ts/smartacme.classes.jwebclient.ts +++ b/ts/smartacme.classes.jwebclient.ts @@ -2,6 +2,12 @@ import * as plugins from './smartacme.plugins' import * as https from 'https' let jwa = require('jwa') import * as url from 'url' +import * as q from 'q' + +export interface IReqResArg { + ans: any + res: any +} /** * json_to_utf8base64url @@ -11,7 +17,7 @@ import * as url from 'url' * @return {string} * @throws Exception if object cannot be stringified or contains cycle */ -let json_to_utf8base64url = function (obj) { +let json_to_utf8base64url = (obj) => { return plugins.smartstring.base64.encodeUri(JSON.stringify(obj)) } @@ -21,24 +27,22 @@ let json_to_utf8base64url = function (obj) { * @description Implementation of HTTPS-based JSON-Web-Client */ export class JWebClient { - key_pair: any - last_nonce: string + /** + * User account key pair + */ + keyPair: any = {} + + /** + * Cached nonce returned with last request + */ + lastNonce: string = null + + /** + * @member {boolean} module:JWebClient~JWebClient#verbose + * @desc Determines verbose mode + */ verbose: boolean constructor() { - /** - * @member {Object} module:JWebClient~JWebClient#key_pair - * @desc User account key pair - */ - this.key_pair = {} - /** - * @member {string} module:JWebClient~JWebClient#last_nonce - * @desc Cached nonce returned with last request - */ - this.last_nonce = null - /** - * @member {boolean} module:JWebClient~JWebClient#verbose - * @desc Determines verbose mode - */ this.verbose = false } @@ -94,17 +98,8 @@ export class JWebClient { * @param {function} callback * @param {function} errorCallback */ - request(query, payload, callback, errorCallback) { - /*jshint -W069 */ - if (typeof query !== 'string') { - query = '' // ensure query is string - } - if (typeof callback !== 'function') { - callback = this.emptyCallback // ensure callback is function - } - if (typeof errorCallback !== 'function') { - errorCallback = this.emptyCallback // ensure callback is function - } + request(query: string, payload: string = null) { + let done = q.defer() // prepare options let uri = url.parse(query) let options = { @@ -114,7 +109,7 @@ export class JWebClient { method: null, headers: {} } - if (typeof payload === 'string') { + if (!payload === null) { options.method = 'POST' options.headers = { 'Content-Type': 'application/jose', @@ -124,15 +119,15 @@ export class JWebClient { options.method = 'GET' } // prepare request - let req = https.request(options, function (res) { + let req = https.request(options, (res) => { // receive data let data = [] - res.on('data', function (block) { + res.on('data', (block) => { if (block instanceof Buffer) { data.push(block) } }) - res.on('end', function () { + res.on('end', () => { let buf = Buffer.concat(data) let isJSON = ( (res instanceof Object) @@ -144,26 +139,25 @@ export class JWebClient { try { // convert to JSON let json = JSON.parse(buf.toString('utf8')) - callback(json, res) + done.resolve({ json: json, res: res }) } catch (e) { // error (if empty or invalid JSON) - errorCallback(void 0, e) + done.reject(e) } - } else { - callback(buf, res) } }) - }).on('error', function (e) { + }).on('error', (e) => { console.error('Error occured', e) // error - errorCallback(void 0, e) + done.reject(e) }) // write POST body if payload was specified - if (typeof payload === 'string') { + if (!payload === null) { req.write(payload) } // make request req.end() + return done.promise } /** @@ -173,69 +167,55 @@ export class JWebClient { * @param {function} callback * @param {function} errorCallback */ - get(uri, callback, errorCallback) { - /*jshint -W069 */ - let ctx = this - if (typeof callback !== 'function') { - callback = this.emptyCallback // ensure callback is function - } - this.request(uri, void 0, function (ans, res) { - ctx.evaluateStatus(uri, null, ans, res) - // save replay nonce for later requests - if ((res instanceof Object) && (res['headers'] instanceof Object)) { - ctx.last_nonce = res.headers['replay-nonce'] - } - callback(ans, res) - // dereference - ans = null - callback = null - ctx = null - res = null - }, errorCallback) - // dereference - errorCallback = null + get(uri: string) { + let done = q.defer() + this.request(uri) + .then((reqResArg: IReqResArg) => { + this.evaluateStatus(uri, null, reqResArg.ans, reqResArg.res) + // save replay nonce for later requests + if ((reqResArg.res instanceof Object) && (reqResArg.res['headers'] instanceof Object)) { + this.lastNonce = reqResArg.res.headers['replay-nonce'] + } + done.resolve(reqResArg) + }) + return done.promise } /** - * post - * @description make POST request + * make POST request * @param {string} uri * @param {Object|string|number|boolean} payload * @param {function} callback * @param {function} errorCallback */ - post(uri, payload, callback, errorCallback) { - /*jshint -W069 */ - let ctx = this - if (typeof callback !== 'function') { - callback = this.emptyCallback // ensure callback is function - } + post(uri: string, payload) { + let done = q.defer() let jwt = this.createJWT( - this.last_nonce, + this.lastNonce, payload, 'RS256', - this.key_pair['private_pem'], - this.key_pair['public_jwk']) - this.request(uri, jwt, (ans, res) => { - ctx.evaluateStatus(uri, payload, ans, res) - // save replay nonce for later requests - if ((res instanceof Object) && (res['headers'] instanceof Object)) { - ctx.last_nonce = res.headers['replay-nonce'] - } - callback(ans, res) - }, errorCallback ) + this.keyPair['private_pem'], + this.keyPair['public_jwk']) + this.request(uri, jwt) + .then((reqResArg: IReqResArg) => { + this.evaluateStatus(uri, payload, reqResArg.ans, reqResArg.res) + // save replay nonce for later requests + if ((reqResArg.res instanceof Object) && (reqResArg.res['headers'] instanceof Object)) { + this.lastNonce = reqResArg.res.headers['replay-nonce'] + } + done.resolve(reqResArg) + }) + return done.promise } /** - * evaluateStatus - * @description check if status is expected and log errors + * checks if status is expected and log errors * @param {string} uri * @param {Object|string|number|boolean} payload * @param {Object|string} ans * @param {Object} res */ evaluateStatus(uri, payload, ans, res) { - /*jshint -W069 */ if (this.verbose) { if ( (payload instanceof Object) @@ -263,11 +243,4 @@ export class JWebClient { console.error('Receive:', ans) // received data } } - - /** - * Helper: Empty callback - */ - emptyCallback() { - // nop - } } diff --git a/ts/smartacme.plugins.ts b/ts/smartacme.plugins.ts index ab0b54b..7856852 100644 --- a/ts/smartacme.plugins.ts +++ b/ts/smartacme.plugins.ts @@ -1,8 +1,10 @@ import 'typings-global' import * as path from 'path' import * as smartstring from 'smartstring' +import * as shelljs from 'shelljs' export { path, - smartstring + smartstring, + shelljs }