From 11f12d7c0edfd68d097b6e6f58ed753943f59a0b Mon Sep 17 00:00:00 2001 From: PhilKunz Date: Mon, 7 Nov 2016 18:41:52 +0100 Subject: [PATCH] improve upon keyCreation --- dist/smartacme.classes.acmeclient.d.ts | 18 +++---- dist/smartacme.classes.acmeclient.js | 59 +++++++++-------------- dist/smartacme.classes.jwebclient.js | 2 +- dist/smartacme.classes.smartacme.d.ts | 7 +++ dist/smartacme.classes.smartacme.js | 11 ++++- dist/smartacme.paths.d.ts | 2 + dist/smartacme.paths.js | 5 ++ dist/smartacme.plugins.d.ts | 3 +- dist/smartacme.plugins.js | 4 +- package.json | 1 + test/test.js | 4 +- test/test.ts | 3 ++ ts/smartacme.classes.acmeclient.ts | 67 ++++++++++++-------------- ts/smartacme.classes.smartacme.ts | 10 ++++ ts/smartacme.paths.ts | 5 ++ ts/smartacme.plugins.ts | 2 + 16 files changed, 116 insertions(+), 87 deletions(-) create mode 100644 dist/smartacme.paths.d.ts create mode 100644 dist/smartacme.paths.js create mode 100644 ts/smartacme.paths.ts diff --git a/dist/smartacme.classes.acmeclient.d.ts b/dist/smartacme.classes.acmeclient.d.ts index ae5a0d1..2f8474d 100644 --- a/dist/smartacme.classes.acmeclient.d.ts +++ b/dist/smartacme.classes.acmeclient.d.ts @@ -11,7 +11,6 @@ import { IReqResArg } from './smartacme.classes.jwebclient'; export declare class AcmeClient { clientProfilePubKey: any; daysValid: number; - defaultRsaKeySize: number; directory: any; directoryUrl: string; emailDefaultPrefix: string; @@ -80,7 +79,7 @@ export declare class AcmeClient { * @param {string} domain - expected to be already sanitized * @param {function} callback - first argument will be the answer object */ - requestSigning(domain: any, callback: any): void; + requestSigning(commonName: any, callback: any): q.Promise<{}>; /** * retrieves profile of user (will make directory lookup and registration check) * @param {function} callback - first argument will be the answer object @@ -102,13 +101,8 @@ export declare class AcmeClient { agreeTos(tosLink: any, callback: any): void; /** * Entry-Point: Request certificate - * @param {string} domain - * @param {string} organization - * @param {string} country - * @param {function} callback - * @returns Promise */ - requestCertificate(domain: string, organization: string, country: string): q.Promise<{}>; + requestCertificate(domainArg: string, organizationArg: string, countryCodeArg: string): q.Promise<{}>; /** * External: Create key pair * @param {number} bit - key strength, expected to be already sanitized @@ -118,7 +112,13 @@ 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): q.Promise<{}>; + createKeyPair(optionsArg: { + keyBitSize: number; + countryCode: string; + organization: string; + commonName: string; + emailAddress: string; + }): q.Promise<{}>; /** * Helper: Empty callback */ diff --git a/dist/smartacme.classes.acmeclient.js b/dist/smartacme.classes.acmeclient.js index 4d5f1cc..c7eca4c 100644 --- a/dist/smartacme.classes.acmeclient.js +++ b/dist/smartacme.classes.acmeclient.js @@ -36,12 +36,6 @@ class AcmeClient { * @default 1 */ this.daysValid = 1; - /** - * @member {number} module:AcmeClient~AcmeClient#defaultRsaKeySize - * @desc Key strength in bits - * @default 4096 - */ - this.defaultRsaKeySize = 4096; /** * @member {Object} module:AcmeClient~AcmeClient#directory * @desc Hash map of REST URIs @@ -323,12 +317,9 @@ class AcmeClient { * @param {string} domain - expected to be already sanitized * @param {function} callback - first argument will be the answer object */ - requestSigning(domain, callback) { - /*jshint -W069 */ - if (typeof callback !== 'function') { - callback = this.emptyCallback; // ensure callback is function - } - fs.readFile(domain + '.csr', (err, csrBuffer) => { + requestSigning(commonName, callback) { + let done = q.defer(); + fs.readFile(commonName + '.csr', (err, csrBuffer) => { if (err instanceof Object) { if (this.jWebClient.verbose) { console.error('Error : File system error', err['code'], 'while reading key from file'); @@ -363,6 +354,7 @@ class AcmeClient { }); } }); + return done.promise; } /** * retrieves profile of user (will make directory lookup and registration check) @@ -442,30 +434,28 @@ class AcmeClient { } /** * Entry-Point: Request certificate - * @param {string} domain - * @param {string} organization - * @param {string} country - * @param {function} callback - * @returns Promise */ - requestCertificate(domain, organization, country) { + requestCertificate(domainArg, organizationArg, countryCodeArg) { 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); + countryCodeArg = this.makeSafeFileName(countryCodeArg); + domainArg = this.makeSafeFileName(domainArg); email = this.makeSafeFileName(email); - organization = this.makeSafeFileName(organization); + organizationArg = this.makeSafeFileName(organizationArg); // create key pair - this.createKeyPair(bit, country, organization, domain, email) + this.createKeyPair({ + keyBitSize: 4096, + countryCode: countryCodeArg, + organization: organizationArg, + commonName: domainArg, + emailAddress: email + }) .then(() => { - this.requestSigning(domain, (cert) => { + this.requestSigning(domainArg, (cert) => { if ((cert instanceof Buffer) || (typeof cert === 'string')) { - fs.writeFile(domain + '.der', cert, (err) => { + fs.writeFile(domainArg + '.der', cert, (err) => { if (err instanceof Object) { if (this.jWebClient.verbose) { console.error('Error : File system error', err['code'], 'while writing certificate to file'); @@ -494,9 +484,12 @@ class AcmeClient { * @param {string} e - email address, expected to be already sanitized * @param {function} callback */ - createKeyPair(bit, c, o, cn, e) { + createKeyPair(optionsArg) { 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\"`; + let openssl = `openssl req -new -nodes -newkey rsa:${optionsArg.keyBitSize} ` + + `-sha256 ` + + `-subj "/C=${optionsArg.countryCode}/O=${optionsArg.organization}/CN=${optionsArg.commonName}/emailAddress=${optionsArg.emailAddress}" ` + + `-keyout \"${optionsArg.commonName}.key\" -outform der -out \"${optionsArg.commonName}.csr\"`; console.error('Action : Creating key pair'); if (this.jWebClient.verbose) { console.error('Running:', openssl); @@ -627,12 +620,6 @@ class AcmeClient { * @return {string} */ extractEmail(profile) { - /*jshint -W069 */ - if (!(profile instanceof Object) || !(profile['contact'] instanceof Array)) { - // dereference - profile = null; - return void 0; // invalid profile - } let prefix = 'mailto:'; let email = profile.contact.filter((entry) => { if (typeof entry !== 'string') { @@ -725,4 +712,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":";AAAA,+CAA8C;AAC9C,uBAAsB;AACtB,iCAAgC;AAChC,yBAAwB;AACxB,qCAAoC;AACpC,iFAA2D;AAG3D;;;;;;;GAOG;AACH,IAAI,kBAAkB,GAAG,CAAC,GAAG;IACzB,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAA;AAClD,CAAC,CAAA;AAED;;;;;;GAMG;AACH;IAaI,YAAY,eAAe;QACvB;;;WAGG;QACH,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAA;QAC7B;;;;WAIG;QACH,IAAI,CAAC,SAAS,GAAG,CAAC,CAAA;QAElB;;;WAGG;QACH,IAAI,CAAC,SAAS,GAAG,EAAE,CAAA;QACnB;;;WAGG;QACH,IAAI,CAAC,YAAY,GAAG,eAAe,CAAA;QACnC;;;;WAIG;QACH,IAAI,CAAC,kBAAkB,GAAG,YAAY,CAAA,CAAC,WAAW;QAClD;;;WAGG;QACH,IAAI,CAAC,aAAa,GAAG,IAAI,CAAA,CAAC,WAAW;QACrC;;;WAGG;QACH,IAAI,CAAC,UAAU,GAAG,IAAI,yCAAU,EAAE,CAAA,CAAC,eAAe;QAClD;;;WAGG;QACH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA,CAAC,WAAW;QAC/B;;;WAGG;QACH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA,CAAC,WAAW;QAC/B;;;;WAIG;QACH,IAAI,CAAC,OAAO,GAAG,GAAG,CAAA,CAAC,WAAW;QAC9B;;;;WAIG;QACH,IAAI,CAAC,aAAa,GAAG,8BAA8B,CAAA,CAAC,WAAW;QAC/D;;;;WAIG;QACH,IAAI,CAAC,eAAe,GAAG,IAAI,CAAA,CAAC,YAAY;IAC5C,CAAC;IAED,gFAAgF;IAChF,kBAAkB;IAClB,gFAAgF;IAEhF;;;;OAIG;IACH,YAAY;QACR,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAc,CAAA;QAChC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;aACjC,IAAI,CAAC,CAAC,SAAqB;YACxB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAC3B,CAAC,CAAC,CAAA;QACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,OAAO,EAAE,QAAQ;QAC7B,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;YAC/B,OAAO,GAAG,EAAE,CAAA,CAAC,2BAA2B;QAC5C,CAAC;QACD,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAA;QAC5B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAC5E,cAAc;QACd,QAAQ,GAAG,IAAI,CAAA;QACf,OAAO,GAAG,IAAI,CAAA;IAClB,CAAC;IAED;;;;;;OAMG;IACH,eAAe,CAAC,GAAG,EAAE,OAAO;QACxB,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAc,CAAA;QAChC,OAAO,CAAC,UAAU,CAAC,GAAG,KAAK,CAAA;QAC3B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG;YACxC,EAAE,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC;gBACxB,IAAI,CAAC,mBAAmB,GAAG,GAAG,CAAC,GAAG,CAAA,CAAC,qCAAqC;gBACxE,EAAE,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;oBAChE,IAAI,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;oBACjC,EAAE,CAAC,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC;wBAC9B,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;wBACtC,EAAE,CAAC,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC;4BAC9B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA,CAAC,iBAAiB;wBAC5C,CAAC;wBAAC,IAAI,CAAC,CAAC;4BACJ,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA,CAAC,iBAAiB;wBACzC,CAAC;oBACL,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA,CAAC,iBAAiB;oBACzC,CAAC;gBACL,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA,CAAC,iBAAiB;gBACzC,CAAC;gBACD,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;YACxC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAA;YACxC,CAAC;QACL,CAAC,CAAC,CAAA;QACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,MAAM,EAAE,QAAQ;QAC5B,iBAAiB;QACjB,EAAE,CAAC,CAAC,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC;YACjC,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAA,CAAC,8BAA8B;QAChE,CAAC;QACD,IAAI,CAAC,UAAU,EAAE;aACZ,IAAI,CAAC,OAAO;YACT,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC/B,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,sBAAsB;YAC1C,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG;oBACpG,EAAE,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;wBACzD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI;4BACnC,EAAE,CAAC,CACC,CAAC,IAAI,YAAY,MAAM,CAAC;mCACrB,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC;mCAC3B,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,CACjC,CAAC,CAAC,CAAC;gCACC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA,CAAE,0BAA0B;4BACtE,CAAC;4BAAC,IAAI,CAAC,CAAC;gCACJ,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,mBAAmB;4BACvC,CAAC;wBACL,CAAC,CAAC,CAAA;oBACN,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,EAAE,CAAC,CACC,CAAC,GAAG,YAAY,MAAM,CAAC;+BACpB,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,MAAM,CAAC;+BAClC,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,QAAQ,CAAC;+BAC7C,CAAC,GAAG,YAAY,MAAM,CAC7B,CAAC,CAAC,CAAC;4BACC,IAAI,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA,CAAC,yBAAyB;4BAChE,IAAI,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA,CAAC,+BAA+B;4BACpF,EAAE,CAAC,CAAC,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC;gCAC9B,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE;oCACrC,QAAQ;oCACR,GAAG,GAAG,IAAI,CAAA;oCACV,GAAG,GAAG,IAAI,CAAA;oCACV,mBAAmB;oCACnB,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG;wCACrC,EAAE,CAAC,CACC,CAAC,GAAG,YAAY,MAAM,CAAC;+CACpB,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,CAAC,uCAAuC;wCACxE,CAAC,CAAC,CAAC;4CACC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA,CAAC,0CAA0C;wCACtF,CAAC;wCAAC,IAAI,CAAC,CAAC;4CACJ,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,8CAA8C;wCAClE,CAAC;oCACL,CAAC,CAAC,CAAA;gCACN,CAAC,CAAC,CAAA;4BACN,CAAC;4BAAC,IAAI,CAAC,CAAC;gCACJ,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,mCAAmC;4BACvD,CAAC;wBACL,CAAC;wBAAC,IAAI,CAAC,CAAC;4BACJ,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,yCAAyC;wBAC7D,CAAC;oBACL,CAAC;gBACL,CAAC,CAAC,CAAA;YACN,CAAC;QACL,CAAC,CAAC,CAAA;IACV,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,SAAS,EAAE,QAAQ;QAC/B,iBAAiB;QACjB,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;YACjC,SAAS,GAAG,EAAE,CAAA,CAAC,6BAA6B;QAChD,CAAC;QACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAA;QACvF,cAAc;QACd,QAAQ,GAAG,IAAI,CAAA;QACf,SAAS,GAAG,IAAI,CAAA;IACpB,CAAC;IAED;;;;;;OAMG;IACH,cAAc,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,GAAG,CAAC;QACnC,iBAAiB;QACjB,EAAE,CAAC,CAAC,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC;YACjC,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAA,CAAC,8BAA8B;QAChE,CAAC;QACD,EAAE,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC;YACd,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,sCAAsC;QAC1D,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG;gBAC9B,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;oBAC3B,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,iBAAiB;gBACrC,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC;wBAC9B,UAAU,CAAC;4BACP,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA,CAAC,QAAQ;wBAC1D,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC,CAAA;oBACnB,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA,CAAC,qBAAqB;oBAC5C,CAAC;gBACL,CAAC;YACL,CAAC,CAAC,CAAA;QACN,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,eAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,GAAG,CAAC;QACpC,iBAAiB;QACjB,EAAE,CAAC,CAAC,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC;YACjC,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAA,CAAC,8BAA8B;QAChE,CAAC;QACD,EAAE,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC;YACd,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,sCAAsC;QAC1D,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG;gBAC9B,EAAE,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC9C,QAAQ,CAAC,GAAG,CAAC,CAAA,CAAC,uCAAuC;gBACzD,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;wBACvD,UAAU,CAAC;4BACP,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA,CAAC,QAAQ;wBAC3D,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC,CAAA;oBACnB,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,eAAe;oBACnC,CAAC;gBACL,CAAC;YACL,CAAC,CAAC,CAAA;QACN,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,cAAc,CAAC,UAAU,EAAE,QAAQ;QAC/B,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,EAAE,CAAC,QAAQ,CAAC,UAAU,GAAG,MAAM,EAAE,CAAC,GAAG,EAAE,SAAiB;YACpD,EAAE,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC;gBACxB,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;oBAC1B,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,6BAA6B,CAAC,CAAA;gBAC3F,CAAC;gBACD,QAAQ,CAAC,KAAK,CAAC,CAAA;YACnB,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,GAAG,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAA;gBAC9B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG;oBACjG,EAAE,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC9C,QAAQ,CAAC,GAAG,CAAC,CAAA,CAAC,uCAAuC;oBACzD,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,EAAE,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC;4BACxB,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gCACpC,IAAI,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,CAAA;gCAC5B,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;oCAC/B,OAAO,GAAG,EAAE,CAAA,CAAE,2BAA2B;gCAC7C,CAAC;gCACD,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAA,CAAC,2BAA2B;gCAC/E,cAAc;gCACd,OAAO,GAAG,IAAI,CAAA;4BAClB,CAAC;4BAAC,IAAI,CAAC,CAAC;gCACJ,QAAQ,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,CAAA,CAAC,6CAA6C;4BACnG,CAAC;wBACL,CAAC;wBAAC,IAAI,CAAC,CAAC;4BACJ,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,mBAAmB;wBACvC,CAAC;oBACL,CAAC;gBACL,CAAC,CAAC,CAAA;YACN,CAAC;QACL,CAAC,CAAC,CAAA;QACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;OAGG;IACH,UAAU;QACN,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,IAAI,CAAC,YAAY,EAAE;aACd,IAAI,CAAC,CAAC,GAAG;YACN,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC,CAAA;YACnE,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,CAAC,SAAS,GAAG,GAAG,CAAA,CAAC,kBAAkB;gBACvC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG;oBAChC,EAAE,CAAC,CACC,CAAC,GAAG,YAAY,MAAM,CAAC;2BACpB,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,MAAM,CAAC;2BAClC,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,QAAQ,CACnD,CAAC,CAAC,CAAC;wBACC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;wBACtC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC;6BACnC,IAAI,CAAC,CAAC,SAAqB;4BACxB,IAAI,CAAC,OAAO,EAAE,CAAA;wBAClB,CAAC,CAAC,CAAA,CAAC,kCAAkC;oBAC7C,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAA;oBACjD,CAAC;gBACL,CAAC,CAAC,CAAA;YACN,CAAC;QACL,CAAC,CAAC,CAAA;QACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,QAAQ;QACzB,iBAAiB;QACjB,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC;YAC5B,EAAE,CAAC,CAAC,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC;gBACjC,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAA,CAAC,8BAA8B;YAChE,CAAC;YACD,IAAI,CAAC,eAAe,CAChB;gBACI,OAAO,EAAE;oBACL,SAAS,GAAG,KAAK;iBACpB;aACJ,EACD,CAAC,GAAG,EAAE,GAAG;gBACL,EAAE,CAAC,CACC,CAAC,GAAG,YAAY,MAAM,CAAC;uBACpB,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,GAAG,CAAC;uBAC3B,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,MAAM,CAAC;uBAClC,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,QAAQ,CACnD,CAAC,CAAC,CAAC;oBACC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;oBACtC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA,CAAC,mBAAmB;gBAC9C,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,sBAAsB;gBAC1C,CAAC;YACL,CAAC,CAAC,CAAA;QACV,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,4BAA4B;QAChD,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ;QACtB,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE;YAC/B,WAAW,EAAE,OAAO,CAAC,uBAAuB;SAC/C,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,OAAO,EAAE,CAAA,CAAC,CAAC,CAAC,CAAA;IACrC,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,SAAiB,EAAE,eAAuB,EAAE,cAAsB;QACjF,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,IAAI,CAAC,UAAU,EAAE;aACZ,IAAI,CAAC,CAAC,OAAO;YACV,IAAI,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA,CAAC,8CAA8C;YACrF,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAA;YACtD,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAA;YAC5C,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAA;YACpC,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAA;YACxD,kBAAkB;YAClB,IAAI,CAAC,aAAa,CAAC;gBACf,UAAU,EAAE,IAAI;gBAChB,WAAW,EAAE,cAAc;gBAC3B,YAAY,EAAE,eAAe;gBAC7B,UAAU,EAAE,SAAS;gBACrB,YAAY,EAAE,KAAK;aACtB,CAAC;iBACG,IAAI,CAAC;gBACF,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,IAAI;oBAChC,EAAE,CAAC,CAAC,CAAC,IAAI,YAAY,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC;wBACzD,EAAE,CAAC,SAAS,CAAC,SAAS,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG;4BACvC,EAAE,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC;gCACxB,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;oCAC1B,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,mCAAmC,CAAC,CAAA;gCACjG,CAAC;gCACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;4BACpB,CAAC;4BAAC,IAAI,CAAC,CAAC;gCACJ,IAAI,CAAC,OAAO,EAAE,CAAA,CAAE,sDAAsD;4BAC1E,CAAC;wBACL,CAAC,CAAC,CAAA;oBACN,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAA;oBAC3C,CAAC;gBACL,CAAC,CAAC,CAAA;YAEN,CAAC,CAAC,CAAA;QACV,CAAC,CAAC,CAAA;QACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;;;;OAQG;IACH,aAAa,CAAC,UAMb;QACG,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,IAAI,OAAO,GAAG,uCAAuC,UAAU,CAAC,UAAU,GAAG;cACvE,UAAU;cACV,aAAa,UAAU,CAAC,WAAW,MAAM,UAAU,CAAC,YAAY,OAAO,UAAU,CAAC,UAAU,iBAAiB,UAAU,CAAC,YAAY,IAAI;cACxI,aAAa,UAAU,CAAC,UAAU,8BAA8B,UAAU,CAAC,UAAU,QAAQ,CAAA;QACnG,OAAO,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC3C,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;YAC1B,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QACtC,CAAC;QACD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,WAAW;YAC1D,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACf,IAAI,CAAC,OAAO,EAAE,CAAA;YAClB,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAC5B,CAAC;QACL,CAAC,CAAC,CAAA;QACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;OAEG;IACH,aAAa;QACT,MAAM;IACV,CAAC;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAG,KAAK;QACnC,EAAE,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC;YAC3B,IAAI,GAAG,EAAE,CAAA;QACb,CAAC;QACD,oDAAoD;QACpD,IAAI,SAAS,GAAG,4DAA4D,CAAA;QAC5E,IAAI,SAAS,GAAG,2DAA2D,CAAA;QAC3E,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,QAAQ,GAAG,SAAS,GAAG,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,aAAa;YACjF,EAAE,CAAC,CAAC,OAAO,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC;gBACpC,MAAM,CAAC,GAAG,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,iBAAiB,EAAE,CAAA;YAC7E,CAAC;YACD,MAAM,CAAC,KAAK,CAAA;QAChB,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ;QACxC,8BAA8B;QAC9B,EAAE,CAAC,CAAC,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC;YACjC,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAA,CAAC,8BAA8B;QAChE,CAAC;QACD,EAAE,CAAC,CAAC,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC;YAC9B,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC;gBAClC,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA,CAAC,mEAAmE;gBACrI,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG;oBACzD,EAAE,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC;wBACxB,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;4BAC1B,OAAO,CAAC,KAAK,CACT,4BAA4B,EAC5B,GAAG,CAAC,MAAM,CAAC,EAAE,sCAAsC,CACtD,CAAA;wBACL,CAAC;wBACD,QAAQ,EAAE,CAAA;oBACd,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,2EAA2E;wBAC3E,IAAI,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;wBAChE,EAAE,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;4BACvB,EAAE,CAAC,QAAQ,CAAC,wBAAwB,EAAE,CAAC,MAAM;gCACzC,EAAE,CAAC,KAAK,EAAE,CAAA;gCACV,QAAQ,EAAE,CAAA;4BACd,CAAC,CAAC,CAAA;wBACN,CAAC;wBAAC,IAAI,CAAC,CAAC;4BACJ,EAAE,CAAC,KAAK,EAAE,CAAA;4BACV,QAAQ,EAAE,CAAA,CAAC,qCAAqC;wBACpD,CAAC;oBACL,CAAC;gBACL,CAAC,CAAC,CAAA;YACN,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAA;gBACjD,QAAQ,EAAE,CAAA;YACd,CAAC;QACL,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,OAAO,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAA;YACpD,QAAQ,EAAE,CAAA;QACd,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,UAAU,CAAC,OAAO;QACd,IAAI,KAAK,GAAG,uCAAuC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACjE,EAAE,CAAC,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,IAAI,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACrB,cAAc;YACd,KAAK,GAAG,IAAI,CAAA;YACZ,MAAM,CAAC,MAAM,CAAA;QACjB,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,aAAqB;QACtC,iBAAiB;QACjB,EAAE,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC;YAClE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK;gBAC/B,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAA;gBACxB,cAAc;gBACd,KAAK,GAAG,IAAI,CAAA;gBACZ,EAAE,CAAC,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC;oBACzB,MAAM,CAAC,IAAI,CAAA;gBACf,CAAC;gBACD,MAAM,CAAC,KAAK,CAAA;YAChB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAA;QACZ,CAAC,CAAC,kCAAkC;QACpC,cAAc;QACd,GAAG,GAAG,IAAI,CAAA;QACV,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,iDAAiD;IACnE,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,OAAO;QAChB,IAAI,MAAM,GAAG,SAAS,CAAA;QACtB,IAAI,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK;YACrC,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC;gBAC5B,MAAM,CAAC,KAAK,CAAA;YAChB,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,MAAM,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA,CAAC,wBAAwB;YAC1D,CAAC;QACL,CAAC,CACA,CAAC,GAAG,EAAE,CAAA;QACP,cAAc;QACd,OAAO,GAAG,IAAI,CAAA;QACd,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC;YAC5B,MAAM,CAAC,KAAK,CAAC,CAAA;QACjB,CAAC,CAAC,iBAAiB;QACnB,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA,CAAC,oDAAoD;IAC3F,CAAC;IAED;;;;OAIG;IACH,8BAA8B,CAAC,MAAM;QACjC,MAAM,CAAC;YACH,UAAU,EAAE,WAAW;YACvB,YAAY,EAAE;gBACV,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,MAAM;aAClB;SACJ,CAAA;IACL,CAAC;IAED;;;;OAIG;IACH,oBAAoB,CAAC,SAAS;QAC1B,iBAAiB;QACjB,EAAE,CAAC,CAAC,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC;YAC9B,EAAE,CAAC,CAAC,IAAI,CAAC,mBAAmB,YAAY,MAAM,CAAC,CAAC,CAAC;gBAC7C,IAAI,GAAG,GAAG,kBAAkB,CAAC;oBACzB,CAAC,EAAE,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC;oBAChC,GAAG,EAAE,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC;oBACpC,CAAC,EAAE,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC;iBACnC,CACA,CAAA;gBACD,IAAI,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,CAAA;gBACpF,4CAA4C;gBAC5C,IAAI,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;gBACvE,IAAI,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;gBAC9B,MAAM,CAAC,KAAK,GAAG,GAAG,GAAG,WAAW,CAAA;YACpC,CAAC;QACL,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,MAAM,CAAC,EAAE,CAAA,CAAC,uCAAuC;QACrD,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,qBAAqB,CAAC,SAAS;QAC3B,MAAM,CAAC;YACH,UAAU,EAAE,WAAW;YACvB,kBAAkB,EAAE,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC;SAC3D,CAAA;IACL,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,GAAW,EAAE,UAAkB;QAC3C,EAAE,CAAC,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;YACtD,GAAG,GAAG,EAAE,CAAA,CAAC,yBAAyB;QACtC,CAAC;QACD,EAAE,CAAC,CAAC,CAAC,OAAO,UAAU,KAAK,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAChF,UAAU,GAAG,CAAC,CAAA,CAAC,oCAAoC;QACvD,CAAC;QACD,IAAI,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA,CAAC,4BAA4B;QAC3F,IAAI,YAAY,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA,CAAC,iCAAiC;QAE/E,4CAA4C;QAC5C,IAAI,aAAa,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA;QACxG,MAAM,CAAC;YACH,UAAU,EAAE,UAAU;YACtB,KAAK,EAAE,cAAc;YACrB,WAAW,EAAE,YAAY;YACzB,UAAU,EAAE,aAAa;SAC5B,CAAA;IACL,CAAC;CACJ;AA3sBD,gCA2sBC"} \ No newline at end of file diff --git a/dist/smartacme.classes.jwebclient.js b/dist/smartacme.classes.jwebclient.js index 162c10c..4a2bb76 100644 --- a/dist/smartacme.classes.jwebclient.js +++ b/dist/smartacme.classes.jwebclient.js @@ -219,4 +219,4 @@ class JWebClient { } } 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":"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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 06f69b4..04e7d4c 100644 --- a/dist/smartacme.classes.smartacme.d.ts +++ b/dist/smartacme.classes.smartacme.d.ts @@ -3,7 +3,14 @@ export declare class SmartAcme { acmeAccount: AcmeAccount; acmeClient: acmeclient.AcmeClient; constructor(directoryUrlArg?: string); + /** + * creates an account + */ createAccount(): void; + /** + * returns the openssl key pair for + */ + getKeyPair(): any; } export declare class AcmeAccount { } diff --git a/dist/smartacme.classes.smartacme.js b/dist/smartacme.classes.smartacme.js index 530f4cd..5824955 100644 --- a/dist/smartacme.classes.smartacme.js +++ b/dist/smartacme.classes.smartacme.js @@ -4,14 +4,23 @@ class SmartAcme { constructor(directoryUrlArg = 'https://acme-staging.api.letsencrypt.org/directory') { this.acmeClient = new acmeclient.AcmeClient(directoryUrlArg); } + /** + * creates an account + */ createAccount() { this.acmeClient.createAccount('test@bleu.de', (answer) => { console.log(answer); }); } + /** + * returns the openssl key pair for + */ + getKeyPair() { + return this.acmeClient.getKeyPair(); + } } exports.SmartAcme = SmartAcme; class AcmeAccount { } exports.AcmeAccount = AcmeAccount; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFDQSw2REFBNEQ7QUFFNUQ7SUFHSSxZQUFZLGtCQUEwQixvREFBb0Q7UUFDdEYsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLFVBQVUsQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLENBQUE7SUFDaEUsQ0FBQztJQUVELGFBQWE7UUFDVCxJQUFJLENBQUMsVUFBVSxDQUFDLGFBQWEsQ0FBQyxjQUFjLEVBQUMsQ0FBQyxNQUFNO1lBQ2hELE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUE7UUFDdkIsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDO0NBQ0o7QUFaRCw4QkFZQztBQUVEO0NBRUM7QUFGRCxrQ0FFQyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFDQSw2REFBNEQ7QUFFNUQ7SUFHSSxZQUFZLGtCQUEwQixvREFBb0Q7UUFDdEYsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLFVBQVUsQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLENBQUE7SUFDaEUsQ0FBQztJQUVEOztPQUVHO0lBQ0gsYUFBYTtRQUNULElBQUksQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLGNBQWMsRUFBQyxDQUFDLE1BQU07WUFDaEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUN2QixDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUM7SUFFRDs7T0FFRztJQUNILFVBQVU7UUFDTixNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxVQUFVLEVBQUUsQ0FBQTtJQUN2QyxDQUFDO0NBQ0o7QUF0QkQsOEJBc0JDO0FBRUQ7Q0FFQztBQUZELGtDQUVDIn0= \ No newline at end of file diff --git a/dist/smartacme.paths.d.ts b/dist/smartacme.paths.d.ts new file mode 100644 index 0000000..06164dd --- /dev/null +++ b/dist/smartacme.paths.d.ts @@ -0,0 +1,2 @@ +export declare let packageDir: string; +export declare let assetDir: string; diff --git a/dist/smartacme.paths.js b/dist/smartacme.paths.js new file mode 100644 index 0000000..3fd577f --- /dev/null +++ b/dist/smartacme.paths.js @@ -0,0 +1,5 @@ +"use strict"; +const plugins = require("./smartacme.plugins"); +exports.packageDir = plugins.path.join(__dirname, '../'); +exports.assetDir = plugins.path.join(exports.packageDir, 'assets/'); +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLnBhdGhzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhY21lLnBhdGhzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwrQ0FBOEM7QUFFbkMsUUFBQSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFDLEtBQUssQ0FBQyxDQUFBO0FBQy9DLFFBQUEsUUFBUSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGtCQUFVLEVBQUMsU0FBUyxDQUFDLENBQUEifQ== \ No newline at end of file diff --git a/dist/smartacme.plugins.d.ts b/dist/smartacme.plugins.d.ts index a61b275..52ad01f 100644 --- a/dist/smartacme.plugins.d.ts +++ b/dist/smartacme.plugins.d.ts @@ -1,5 +1,6 @@ import 'typings-global'; import * as path from 'path'; +import * as smartfile from 'smartfile'; import * as smartstring from 'smartstring'; import * as shelljs from 'shelljs'; -export { path, smartstring, shelljs }; +export { path, smartfile, smartstring, shelljs }; diff --git a/dist/smartacme.plugins.js b/dist/smartacme.plugins.js index 50be8e7..0a53b08 100644 --- a/dist/smartacme.plugins.js +++ b/dist/smartacme.plugins.js @@ -2,8 +2,10 @@ require("typings-global"); const path = require("path"); exports.path = path; +const smartfile = require("smartfile"); +exports.smartfile = smartfile; const smartstring = require("smartstring"); exports.smartstring = smartstring; const shelljs = require("shelljs"); exports.shelljs = shelljs; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGFjbWUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBQ3ZCLDZCQUE0QjtBQUt4QixvQkFBSTtBQUpSLDJDQUEwQztBQUt0QyxrQ0FBVztBQUpmLG1DQUFrQztBQUs5QiwwQkFBTyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGFjbWUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBQ3ZCLDZCQUE0QjtBQU14QixvQkFBSTtBQUxSLHVDQUFzQztBQU1sQyw4QkFBUztBQUxiLDJDQUEwQztBQU10QyxrQ0FBVztBQUxmLG1DQUFrQztBQU05QiwwQkFBTyJ9 \ No newline at end of file diff --git a/package.json b/package.json index 16fcfda..74e7e72 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "q": "^1.4.1", "rsa-pem-to-jwk": "^1.1.3", "shelljs": "^0.7.5", + "smartfile": "^4.1.0", "smartstring": "^2.0.20", "typings-global": "^1.0.14" }, diff --git a/test/test.js b/test/test.js index 78d7084..f3b513e 100644 --- a/test/test.js +++ b/test/test.js @@ -9,8 +9,10 @@ describe('smartacme', function () { testAcme = new smartacme.SmartAcme(); should(testAcme).be.instanceOf(smartacme.SmartAcme); }); + it('should have created keyPair', function () { + }); it('should register a new account', function () { testAcme.createAccount(); }); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFFaEMsNEJBQTRCO0FBQzVCLDJDQUEwQztBQUUxQyxRQUFRLENBQUMsV0FBVyxFQUFFO0lBQ2xCLElBQUksUUFBNkIsQ0FBQTtJQUNqQyxFQUFFLENBQUMsZ0NBQWdDLEVBQUU7UUFDakMsUUFBUSxHQUFHLElBQUksU0FBUyxDQUFDLFNBQVMsRUFBRSxDQUFBO1FBQ3BDLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUN2RCxDQUFDLENBQUMsQ0FBQTtJQUNGLEVBQUUsQ0FBQywrQkFBK0IsRUFBRTtRQUNoQyxRQUFRLENBQUMsYUFBYSxFQUFFLENBQUE7SUFDNUIsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUMsQ0FBQSJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFFaEMsNEJBQTRCO0FBQzVCLDJDQUEwQztBQUUxQyxRQUFRLENBQUMsV0FBVyxFQUFFO0lBQ2xCLElBQUksUUFBNkIsQ0FBQTtJQUNqQyxFQUFFLENBQUMsZ0NBQWdDLEVBQUU7UUFDakMsUUFBUSxHQUFHLElBQUksU0FBUyxDQUFDLFNBQVMsRUFBRSxDQUFBO1FBQ3BDLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUN2RCxDQUFDLENBQUMsQ0FBQTtJQUNGLEVBQUUsQ0FBQyw2QkFBNkIsRUFBRTtJQUVsQyxDQUFDLENBQUMsQ0FBQTtJQUNGLEVBQUUsQ0FBQywrQkFBK0IsRUFBRTtRQUNoQyxRQUFRLENBQUMsYUFBYSxFQUFFLENBQUE7SUFDNUIsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUMsQ0FBQSJ9 \ No newline at end of file diff --git a/test/test.ts b/test/test.ts index 89f76d1..25cd7f8 100644 --- a/test/test.ts +++ b/test/test.ts @@ -9,6 +9,9 @@ describe('smartacme', function(){ it('should create a valid instance', function(){ testAcme = new smartacme.SmartAcme() should(testAcme).be.instanceOf(smartacme.SmartAcme) + }) + it('should have created keyPair', function() { + }) it('should register a new account', function() { testAcme.createAccount() diff --git a/ts/smartacme.classes.acmeclient.ts b/ts/smartacme.classes.acmeclient.ts index 84fc287..42404a0 100644 --- a/ts/smartacme.classes.acmeclient.ts +++ b/ts/smartacme.classes.acmeclient.ts @@ -28,7 +28,6 @@ let json_to_utf8buffer = (obj) => { export class AcmeClient { clientProfilePubKey: any daysValid: number - defaultRsaKeySize: number directory: any directoryUrl: string emailDefaultPrefix: string @@ -51,12 +50,7 @@ export class AcmeClient { * @default 1 */ this.daysValid = 1 - /** - * @member {number} module:AcmeClient~AcmeClient#defaultRsaKeySize - * @desc Key strength in bits - * @default 4096 - */ - this.defaultRsaKeySize = 4096 + /** * @member {Object} module:AcmeClient~AcmeClient#directory * @desc Hash map of REST URIs @@ -336,12 +330,9 @@ export class AcmeClient { * @param {string} domain - expected to be already sanitized * @param {function} callback - first argument will be the answer object */ - requestSigning(domain, callback) { - /*jshint -W069 */ - if (typeof callback !== 'function') { - callback = this.emptyCallback // ensure callback is function - } - fs.readFile(domain + '.csr', (err, csrBuffer: Buffer) => { + requestSigning(commonName, callback) { + let done = q.defer() + fs.readFile(commonName + '.csr', (err, csrBuffer: Buffer) => { if (err instanceof Object) { // file system error if (this.jWebClient.verbose) { console.error('Error : File system error', err['code'], 'while reading key from file') @@ -372,6 +363,7 @@ export class AcmeClient { }) } }) + return done.promise } /** @@ -457,30 +449,28 @@ export class AcmeClient { /** * Entry-Point: Request certificate - * @param {string} domain - * @param {string} organization - * @param {string} country - * @param {function} callback - * @returns Promise */ - requestCertificate(domain: string, organization: string, country: string) { + requestCertificate(domainArg: string, organizationArg: string, countryCodeArg: 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) + countryCodeArg = this.makeSafeFileName(countryCodeArg) + domainArg = this.makeSafeFileName(domainArg) email = this.makeSafeFileName(email) - organization = this.makeSafeFileName(organization) + organizationArg = this.makeSafeFileName(organizationArg) // create key pair - this.createKeyPair(bit, country, organization, domain, email) - .then(() => { // create key pair - this.requestSigning(domain, (cert) => { // send CSR + this.createKeyPair({ + keyBitSize: 4096, + countryCode: countryCodeArg, + organization: organizationArg, + commonName: domainArg, + emailAddress: email + }) + .then(() => { + this.requestSigning(domainArg, (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 + fs.writeFile(domainArg + '.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') @@ -509,9 +499,18 @@ export class AcmeClient { * @param {string} e - email address, expected to be already sanitized * @param {function} callback */ - createKeyPair(bit, c, o, cn, e) { + createKeyPair(optionsArg: { + keyBitSize: number, + countryCode: string, + organization: string, + commonName: string, + emailAddress: string + }) { 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\"` + let openssl = `openssl req -new -nodes -newkey rsa:${optionsArg.keyBitSize} ` + + `-sha256 ` + + `-subj "/C=${optionsArg.countryCode}/O=${optionsArg.organization}/CN=${optionsArg.commonName}/emailAddress=${optionsArg.emailAddress}" ` + + `-keyout \"${optionsArg.commonName}.key\" -outform der -out \"${optionsArg.commonName}.csr\"` console.error('Action : Creating key pair') if (this.jWebClient.verbose) { console.error('Running:', openssl) @@ -646,12 +645,6 @@ export class AcmeClient { * @return {string} */ extractEmail(profile) { - /*jshint -W069 */ - if (!(profile instanceof Object) || !(profile['contact'] instanceof Array)) { - // dereference - profile = null - return void 0 // invalid profile - } let prefix = 'mailto:' let email = profile.contact.filter((entry) => { if (typeof entry !== 'string') { diff --git a/ts/smartacme.classes.smartacme.ts b/ts/smartacme.classes.smartacme.ts index 299b922..df1fb73 100644 --- a/ts/smartacme.classes.smartacme.ts +++ b/ts/smartacme.classes.smartacme.ts @@ -8,11 +8,21 @@ export class SmartAcme { this.acmeClient = new acmeclient.AcmeClient(directoryUrlArg) } + /** + * creates an account + */ createAccount() { this.acmeClient.createAccount('test@bleu.de',(answer) => { console.log(answer) }) } + + /** + * returns the openssl key pair for + */ + getKeyPair() { + return this.acmeClient.getKeyPair() + } } export class AcmeAccount { diff --git a/ts/smartacme.paths.ts b/ts/smartacme.paths.ts new file mode 100644 index 0000000..c675e44 --- /dev/null +++ b/ts/smartacme.paths.ts @@ -0,0 +1,5 @@ +import * as plugins from './smartacme.plugins' + +export let packageDir = plugins.path.join(__dirname,'../') +export let assetDir = plugins.path.join(packageDir,'assets/') + diff --git a/ts/smartacme.plugins.ts b/ts/smartacme.plugins.ts index 7856852..70dc773 100644 --- a/ts/smartacme.plugins.ts +++ b/ts/smartacme.plugins.ts @@ -1,10 +1,12 @@ import 'typings-global' import * as path from 'path' +import * as smartfile from 'smartfile' import * as smartstring from 'smartstring' import * as shelljs from 'shelljs' export { path, + smartfile, smartstring, shelljs }