coolaj86
/
le-store-certbot.js
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor cleanup

This commit is contained in:
AJ ONeal 2016-08-09 15:53:44 -04:00
parent 03c2be409a
commit 61235c798c
1 changed files with 63 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
index.js
View File

@ -117,7 +117,7 @@ var defaults = {
, chainPath: [ ':configDir', 'live', ':hostname', 'chain.pem' ].join(path.sep) , chainPath: [ ':configDir', 'live', ':hostname', 'chain.pem' ].join(path.sep)
, rsaKeySize: 2048 , rsaKeySize: 2048
, webrootPath: [ '~', 'letsencrypt', 'srv', 'www', ':hostname', '.well-known', 'acme-challenge' ].join(path.sep) , webrootPath: [ ':workDir', 'acme-challenge' ].join(path.sep)
}; };
module.exports.create = function (configs) { module.exports.create = function (configs) {
@ -129,6 +129,9 @@ module.exports.create = function (configs) {
return configs; return configs;
} }
if (!configs.domainKeyPath) {
configs.domainKeyPath = configs.privkeyPath || defaults.privkeyPath;
}
Object.keys(defaults).forEach(function (key) { Object.keys(defaults).forEach(function (key) {
if (!(key in configs)) { if (!(key in configs)) {
configs[key] = defaults[key]; configs[key] = defaults[key];
@ -148,6 +151,12 @@ module.exports.create = function (configs) {
else { else {
return { privateKeyPem: key }; return { privateKeyPem: key };
} }
}, function (err) {
if ('ENOENT' !== err.code) {
throw err;
}
return null;
}); });
} }
, setAsync: function (keypath, keypair, format) { , setAsync: function (keypath, keypair, format) {
@ -178,11 +187,11 @@ module.exports.create = function (configs) {
return PromiseA.reject(new Error("missing options.domainKeyPath")); return PromiseA.reject(new Error("missing options.domainKeyPath"));
} }
return store.keypairs.checkAsync(args.domainKeyPath); return store.keypairs.checkAsync(args.domainKeyPath, 'pem');
} }
// Certificates // Certificates
, setKeypairAsync: function (args, keypair) { , setKeypairAsync: function (args, keypair) {
return store.keypairs.setAsync(args.domainKeyPath, keypair); return store.keypairs.setAsync(args.domainKeyPath, keypair, 'pem');
} }
// Certificates // Certificates
, checkAsync: function (args) { , checkAsync: function (args) {
@ -220,71 +229,64 @@ module.exports.create = function (configs) {
} }
// Certificates // Certificates
, setAsync: function (args) { , setAsync: function (args) {
// TODO get config return store.configs.getAsync(args).then(function (pyobj) {
var pyobj = args.pyobj; var pems = args.pems;
var pems = args.pems;
pyobj.checkpoints = parseInt(pyobj.checkpoints, 10) || 0; pyobj.checkpoints = parseInt(pyobj.checkpoints, 10) || 0;
var liveDir = args.liveDir || path.join(args.configDir, 'live', args.domains[0]); var liveDir = args.liveDir || path.join(args.configDir, 'live', args.domains[0]);
var certPath = args.certPath || pyobj.cert || path.join(liveDir, 'cert.pem'); var certPath = args.certPath || pyobj.cert || path.join(liveDir, 'cert.pem');
var fullchainPath = args.fullchainPath || pyobj.fullchain || path.join(liveDir, 'fullchain.pem'); var fullchainPath = args.fullchainPath || pyobj.fullchain || path.join(liveDir, 'fullchain.pem');
var chainPath = args.chainPath || pyobj.chain || path.join(liveDir, 'chain.pem'); var chainPath = args.chainPath || pyobj.chain || path.join(liveDir, 'chain.pem');
var privkeyPath = args.privkeyPath || pyobj.privkey var privkeyPath = args.privkeyPath || pyobj.privkey
//|| args.domainPrivateKeyPath || args.domainKeyPath || pyobj.keyPath || args.domainKeyPath
|| path.join(liveDir, 'privkey.pem'); || path.join(liveDir, 'privkey.pem');
var archiveDir = args.archiveDir || path.join(args.configDir, 'archive', args.domains[0]); var archiveDir = args.archiveDir || path.join(args.configDir, 'archive', args.domains[0]);
var checkpoints = pyobj.checkpoints.toString(); var checkpoints = pyobj.checkpoints.toString();
var certArchive = path.join(archiveDir, 'cert' + checkpoints + '.pem'); var certArchive = path.join(archiveDir, 'cert' + checkpoints + '.pem');
var fullchainArchive = path.join(archiveDir, 'fullchain' + checkpoints + '.pem'); var fullchainArchive = path.join(archiveDir, 'fullchain' + checkpoints + '.pem');
var chainArchive = path.join(archiveDir, 'chain'+ checkpoints + '.pem'); var chainArchive = path.join(archiveDir, 'chain'+ checkpoints + '.pem');
var privkeyArchive = path.join(archiveDir, 'privkey' + checkpoints + '.pem'); var privkeyArchive = path.join(archiveDir, 'privkey' + checkpoints + '.pem');
return mkdirpAsync(archiveDir).then(function () { return mkdirpAsync(archiveDir).then(function () {
return PromiseA.all([ return PromiseA.all([
sfs.writeFileAsync(certArchive, pems.cert, 'ascii') sfs.writeFileAsync(certArchive, pems.cert, 'ascii')
, sfs.writeFileAsync(chainArchive, pems.chain, 'ascii') , sfs.writeFileAsync(chainArchive, pems.chain, 'ascii')
, sfs.writeFileAsync(fullchainArchive, pems.cert + pems.chain, 'ascii') , sfs.writeFileAsync(fullchainArchive, pems.cert + pems.chain, 'ascii')
, sfs.writeFileAsync( , sfs.writeFileAsync(privkeyArchive, pems.privkey, 'ascii')
privkeyArchive ]);
, pems.privkey }).then(function () {
, 'ascii' return mkdirpAsync(liveDir);
) }).then(function () {
]); return PromiseA.all([
}).then(function () { sfs.writeFileAsync(certPath, pems.cert, 'ascii')
return mkdirpAsync(liveDir); , sfs.writeFileAsync(chainPath, pems.chain, 'ascii')
}).then(function () { , sfs.writeFileAsync(fullchainPath, pems.cert + pems.chain, 'ascii')
return PromiseA.all([ , sfs.writeFileAsync(privkeyPath, pems.privkey, 'ascii')
sfs.writeFileAsync(certPath, pems.cert, 'ascii') ]);
, sfs.writeFileAsync(chainPath, pems.chain, 'ascii') }).then(function () {
, sfs.writeFileAsync(fullchainPath, pems.cert + pems.chain, 'ascii') pyobj.checkpoints += 1;
, sfs.writeFileAsync( args.checkpoints += 1;
privkeyPath
// TODO nix args.key, args.domainPrivateKeyPem ??
, pems.privkey
, 'ascii'
)
]);
}).then(function () {
pyobj.checkpoints += 1;
args.checkpoints += 1;
return writeRenewalConfig(args); // TODO other than for compatibility this is optional, right?
}).then(function () { // or is it actually needful for renewal? (i.e. list of domains)
return { return writeRenewalConfig(args);
privkey: pems.privkey }).then(function () {
, cert: pems.cert return {
, chain: pems.chain privkey: pems.privkey
, cert: pems.cert
, chain: pems.chain
/* /*
// TODO populate these only if they are actually known // TODO populate these only if they are actually known
, issuedAt: Date.now() , issuedAt: Date.now()
, expiresAt: Date.now() + (90 * 24 * 60 * 60 * 100) , expiresAt: Date.now() + (90 * 24 * 60 * 60 * 100)
*/ */
}; };
});
}); });
} }
@ -466,17 +468,6 @@ module.exports.create = function (configs) {
}); });
} }
// Accounts // Accounts
, getAsync: function (args) {
return store.accounts.checkAsync(args).then(function (account) {
if (!args.account) {
return store.accounts.registerAsync(args);
}
//args.account = account;
return account;
});
}
// Accounts
, setAsync: function (args, reg) { , setAsync: function (args, reg) {
var os = require("os"); var os = require("os");
var accountId = store.accounts._getAccountIdByPublicKey(reg.keypair); var accountId = store.accounts._getAccountIdByPublicKey(reg.keypair);
@ -598,7 +589,7 @@ module.exports.create = function (configs) {
//, logsDir: args.logsDir //, logsDir: args.logsDir
args.rsaKeySize = args.rsaKeySize || pyobj.rsaKeySize; args.rsaKeySize = args.rsaKeySize || pyobj.rsaKeySize;
args.http01Port = args.http01Port || pyobj.http01Port; args.http01Port = args.http01Port || pyobj.http01Port;
args.domainKeyPath = args.domainPrivateKeyPath || args.domainKeyPath || args.keyPath || pyobj.keyPath; args.domainKeyPath = args.domainKeyPath || args.keyPath || pyobj.keyPath;
return writeRenewalConfig(args); return writeRenewalConfig(args);
}); });