diff --git a/lib/generateSSLcert.js b/lib/generateSSLcert.js index 316b2981..7731b2f7 100644 --- a/lib/generateSSLcert.js +++ b/lib/generateSSLcert.js @@ -7,18 +7,22 @@ var pki = forge.pki; var rsa = forge.pki.rsa; var startTime, endTime; + + module.exports = function({ bits = 2048, certificatePath = "database/certificate", doLogging = false, } = {}){ - if(!doLogging) console.log = function(){}; - console.log("Generating SSL certificate with "+bits+" bits at "+certificatePath); + function log(t){ + if(doLogging) console.log("lib/generateSSLcert.js | "+t); + } + log("Generating SSL certificate with "+bits+" bits at "+certificatePath); startTime = Date.now(); var keypair = rsa.generateKeyPair({bits: bits, e: 0x10001}); endTime = Date.now(); - console.log("Generated 2048bit keypair in: "+(endTime-startTime)+" ms"); + log("Generated 2048bit keypair in: "+(endTime-startTime)+" ms"); startTime = Date.now(); var cert = pki.createCertificate(); @@ -37,9 +41,9 @@ module.exports = function({ mkdirp.sync(certificatePath); console.log("Created directory: "+certificatePath); } - fs.writeFileSync(certificatePath+ "cert.key", pki.privateKeyToPem(keypair.privateKey)); /////////////////// THIS WRITES [object object] + fs.writeFileSync(certificatePath+ "cert.key", pki.privateKeyToPem(keypair.privateKey)); fs.writeFileSync(certificatePath+ "cert.crt", pki.certificateToPem(cert)); endTime = Date.now(); - console.log("Generated certificate in: "+(endTime-startTime)+" ms"); + log("Generated certificate in: "+(endTime-startTime)+" ms"); } diff --git a/lib/generateSSLcert.spec.js b/lib/generateSSLcert.spec.js index 2b356621..0e468c10 100644 --- a/lib/generateSSLcert.spec.js +++ b/lib/generateSSLcert.spec.js @@ -7,12 +7,12 @@ var generateSSLcert = require("./generateSSLcert.js") describe("generateSSLcert.js(options)", ()=>{ it("Creates a folder with a .crt and .key file in it", ()=>{ let certPath = "lib/certTestPlsDelete"; - assert(!fs.existsSync(certPath)); // if it already exsits, the test might pass because of leftover data (which is bad) generateSSLcert({ // bits:512, // supported, but I just use the default of 2048 for this test certificatePath:certPath, + doLogging: false, }); assert(fs.existsSync(certPath));