improve upon keyCreation

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
      */

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 {
 }

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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFDQSw2REFBNEQ7QUFFNUQ7SUFHSSxZQUFZLGtCQUEwQixvREFBb0Q7UUFDdEYsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLFVBQVUsQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLENBQUE7SUFDaEUsQ0FBQztJQUVEOztPQUVHO0lBQ0gsYUFBYTtRQUNULElBQUksQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLGNBQWMsRUFBQyxDQUFDLE1BQU07WUFDaEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUN2QixDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUM7SUFFRDs7T0FFRztJQUNILFVBQVU7UUFDTixNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxVQUFVLEVBQUUsQ0FBQTtJQUN2QyxDQUFDO0NBQ0o7QUF0QkQsOEJBc0JDO0FBRUQ7Q0FFQztBQUZELGtDQUVDIn0=

dist/smartacme.paths.d.ts

@@ -0,0 +1,2 @@
+export declare let packageDir: string;
+export declare let assetDir: string;

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==

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 };

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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGFjbWUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBQ3ZCLDZCQUE0QjtBQU14QixvQkFBSTtBQUxSLHVDQUFzQztBQU1sQyw4QkFBUztBQUxiLDJDQUEwQztBQU10QyxrQ0FBVztBQUxmLG1DQUFrQztBQU05QiwwQkFBTyJ9

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"
   },

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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFFaEMsNEJBQTRCO0FBQzVCLDJDQUEwQztBQUUxQyxRQUFRLENBQUMsV0FBVyxFQUFFO0lBQ2xCLElBQUksUUFBNkIsQ0FBQTtJQUNqQyxFQUFFLENBQUMsZ0NBQWdDLEVBQUU7UUFDakMsUUFBUSxHQUFHLElBQUksU0FBUyxDQUFDLFNBQVMsRUFBRSxDQUFBO1FBQ3BDLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUN2RCxDQUFDLENBQUMsQ0FBQTtJQUNGLEVBQUUsQ0FBQyw2QkFBNkIsRUFBRTtJQUVsQyxDQUFDLENBQUMsQ0FBQTtJQUNGLEVBQUUsQ0FBQywrQkFBK0IsRUFBRTtRQUNoQyxRQUFRLENBQUMsYUFBYSxFQUFFLENBQUE7SUFDNUIsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUMsQ0FBQSJ9

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()

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) {
+    requestSigning(commonName, callback) {
-        /*jshint -W069 */
+        let done = q.defer()
-        if (typeof callback !== 'function') {
+        fs.readFile(commonName + '.csr', (err, csrBuffer: Buffer) => {
-            callback = this.emptyCallback // ensure callback is function
-        }
-        fs.readFile(domain + '.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
+                countryCodeArg = this.makeSafeFileName(countryCodeArg)
-                // sanitize
+                domainArg = this.makeSafeFileName(domainArg)
-                bit = Number(bit)
-                country = this.makeSafeFileName(country)
-                domain = this.makeSafeFileName(domain)
                 email = this.makeSafeFileName(email)
-                organization = this.makeSafeFileName(organization)
+                organizationArg = this.makeSafeFileName(organizationArg)
                 // create key pair
-                this.createKeyPair(bit, country, organization, domain, email)
+                this.createKeyPair({
-                    .then(() => { // create key pair
+                    keyBitSize: 4096,
-                        this.requestSigning(domain, (cert) => { // send CSR
+                    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') {

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 {

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/')
+

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
 }