coolaj86
/
greenlock.js
mirror of https://github.com/therootcompany/greenlock.js.git
1
0
Fork 0
Code Projects Releases Wiki Activity

fix #27 use domainKeyPath, move to rsa-compat, use RSA.exportPrivatePem

This commit is contained in:
AJ ONeal 2016-08-03 23:00:41 -04:00
parent 663ead5ec0
commit 2f36d31f73
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/accounts.js
View File

@ -12,10 +12,8 @@ function createAccount(args, handlers) {
var os = require("os"); var os = require("os");
var localname = os.hostname(); var localname = os.hostname();
// TODO support ECDSA
// arg.rsaBitLength args.rsaExponent // arg.rsaBitLength args.rsaExponent
return RSA.generateKeypairAsync(args.rsaKeySize || 1024, 65537, { public: true, pem: true }).then(function (keypair) { return RSA.generateKeypairAsync(args.rsaKeySize || 2048, 65537, { public: true, pem: true }).then(function (keypair) {
/* keypair = { privateKeyPem, privateKeyJwk, publicKeyPem } */
return LeCore.registerNewAccountAsync({ return LeCore.registerNewAccountAsync({
email: args.email email: args.email

21
lib/core.js
View File

@ -8,7 +8,6 @@ var fs = PromiseA.promisifyAll(require('fs'));
var sfs = require('safe-replace'); var sfs = require('safe-replace');
var LE = require('../'); var LE = require('../');
var LeCore = PromiseA.promisifyAll(require('letiny-core')); var LeCore = PromiseA.promisifyAll(require('letiny-core'));
var leCrypto = PromiseA.promisifyAll(LeCore.leCrypto);
var Accounts = require('./accounts'); var Accounts = require('./accounts');
var merge = require('./common').merge; var merge = require('./common').merge;
@ -199,7 +198,7 @@ function writeCertificateAsync(args, defaults, handlers) {
, sfs.writeFileAsync( , sfs.writeFileAsync(
privkeyArchive privkeyArchive
// TODO nix args.key, args.domainPrivateKeyPem ?? // TODO nix args.key, args.domainPrivateKeyPem ??
, (result.privkey || result.key) || RSA.exportPrivateKey(args.domainKeypair) , (result.privkey || result.key) || RSA.exportPrivatePem(args.domainKeypair)
, 'ascii' , 'ascii'
) )
]); ]);
@ -213,7 +212,7 @@ function writeCertificateAsync(args, defaults, handlers) {
, sfs.writeFileAsync( , sfs.writeFileAsync(
privkeyPath privkeyPath
// TODO nix args.key, args.domainPrivateKeyPem ?? // TODO nix args.key, args.domainPrivateKeyPem ??
, (result.privkey || result.key) || RSA.exportPrivateKey(args.domainKeypair) , (result.privkey || result.key) || RSA.exportPrivatePem(args.domainKeypair)
, 'ascii' , 'ascii'
) )
]); ]);
@ -235,7 +234,7 @@ function writeCertificateAsync(args, defaults, handlers) {
// TODO nix args.key, args.domainPrivateKeyPem ?? // TODO nix args.key, args.domainPrivateKeyPem ??
// some ambiguity here... // some ambiguity here...
, privkey: (result.privkey || result.key) || RSA.exportPrivateKey(args.domainKeypair) , privkey: (result.privkey || result.key) || RSA.exportPrivatePem(args.domainKeypair)
, fullchain: result.fullchain || (result.cert + '\n' + result.chain) , fullchain: result.fullchain || (result.cert + '\n' + result.chain)
, chain: (result.chain || result.ca) , chain: (result.chain || result.ca)
// especially this one... might be cert only, might be fullchain // especially this one... might be cert only, might be fullchain
@ -254,15 +253,25 @@ function getCertificateAsync(args, defaults, handlers) {
if (!args.domainKeyPath) { if (!args.domainKeyPath) {
// TODO use default path ??? // TODO use default path ???
if (args.debug) {
console.log('[domainKeyPath]: none');
}
promise = RSA.generateKeypairAsync(args.rsaKeySize, 65537, keypairOpts); promise = RSA.generateKeypairAsync(args.rsaKeySize, 65537, keypairOpts);
} }
if (args.domainKeyPath) { if (args.domainKeyPath) {
if (args.debug) {
console.log('[domainKeyPath]:', args.domainKeyPath);
}
promise = fs.readFileAsync(args.domainKeyPath, 'ascii').then(function (pem) { promise = fs.readFileAsync(args.domainKeyPath, 'ascii').then(function (pem) {
return RSA.import({ privateKeyPem: pem }); return RSA.import({ privateKeyPem: pem });
}, function (err) { }, function (/*err*/) {
return RSA.generateKeypairAsync(args.rsaKeySize, 65537, keypairOpts).then(function (keypair) { return RSA.generateKeypairAsync(args.rsaKeySize, 65537, keypairOpts).then(function (keypair) {
return fs.writeFileAsync(args.domainKeyPath, keypair.privateKeyPem, 'ascii'); return mkdirpAsync(path.dirname(args.domainKeyPath)).then(function () {
return fs.writeFileAsync(args.domainKeyPath, keypair.privateKeyPem, 'ascii').then(function () {
return keypair;
});
});
}); });
}); });
} }