Compare commits
No commits in common. "d7313d932af48cf210530e2ecf1c2e65d274ba73" and "cab8ae510f65293775a3122bed7b1a869454eecd" have entirely different histories.
d7313d932a
...
cab8ae510f
92
index.js
92
index.js
|
|
@ -1,29 +1,12 @@
|
|||
'use strict';
|
||||
/* global Promise */
|
||||
|
||||
var PromiseA;
|
||||
try {
|
||||
PromiseA = require('bluebird');
|
||||
} catch(e) {
|
||||
PromiseA = Promise;
|
||||
}
|
||||
var util = require('util');
|
||||
function promisifyAll(obj) {
|
||||
var aobj = {};
|
||||
Object.keys(obj).forEach(function (key) {
|
||||
aobj[key + 'Async'] = util.promisify(obj[key]);
|
||||
});
|
||||
return aobj;
|
||||
}
|
||||
var mkdirpAsync = util.promisify(require('mkdirp'));
|
||||
var PromiseA = require('bluebird');
|
||||
var mkdirpAsync = PromiseA.promisify(require('mkdirp'));
|
||||
var path = require('path');
|
||||
var fs = require('fs');
|
||||
var readFileAsync = util.promisify(fs.readFile);
|
||||
var readdirAsync = util.promisify(fs.readdir);
|
||||
var writeFileAsync = util.promisify(fs.writeFile);
|
||||
var statAsync = util.promisify(fs.stat);
|
||||
var fs = PromiseA.promisifyAll(require('fs'));
|
||||
var sfs = require('safe-replace');
|
||||
var os = require('os');
|
||||
var symlink = require('fs-symlink');
|
||||
|
||||
function log(debug) {
|
||||
if (debug) {
|
||||
|
|
@ -38,7 +21,7 @@ function writeRenewalConfig(args) {
|
|||
var pyobj = args.pyobj;
|
||||
pyobj.checkpoints = parseInt(pyobj.checkpoints, 10) || 0;
|
||||
|
||||
var pyconf = promisifyAll(require('pyconf'));
|
||||
var pyconf = PromiseA.promisifyAll(require('pyconf'));
|
||||
|
||||
var liveDir = args.liveDir || path.join(args.configDir, 'live', args.domains[0]);
|
||||
|
||||
|
|
@ -118,12 +101,10 @@ function pyToJson(pyobj) {
|
|||
return jsobj;
|
||||
}
|
||||
|
||||
var crypto = require('crypto');
|
||||
var rnd = crypto.randomBytes(8).toString('hex');
|
||||
var defaults = {
|
||||
configDir: [ os.homedir(), 'letsencrypt', 'etc' ].join(path.sep) // /etc/letsencrypt/
|
||||
, logsDir: [ os.tmpdir(), 'acme-' + rnd, 'log' ].join(path.sep) // /var/log/letsencrypt/
|
||||
, webrootPath: [ os.tmpdir(), 'acme-' + rnd, 'acme-challenge' ].join(path.sep)
|
||||
, logsDir: [ os.homedir(), 'tmp', 'acme', 'log' ].join(path.sep) // /var/log/letsencrypt/
|
||||
, webrootPath: [ os.homedir(), 'tmp', 'acme-challenge' ].join(path.sep)
|
||||
|
||||
, accountsDir: [ ':configDir', 'accounts', ':serverDir' ].join(path.sep)
|
||||
, renewalPath: [ ':configDir', 'renewal', ':hostname.conf' ].join(path.sep)
|
||||
|
|
@ -136,7 +117,6 @@ var defaults = {
|
|||
, fullchainPath: [ ':configDir', 'live', ':hostname', 'fullchain.pem' ].join(path.sep)
|
||||
, certPath: [ ':configDir', 'live', ':hostname', 'cert.pem' ].join(path.sep)
|
||||
, chainPath: [ ':configDir', 'live', ':hostname', 'chain.pem' ].join(path.sep)
|
||||
, bundlePath: [ ':configDir', 'live', ':hostname', 'bundle.pem' ].join(path.sep)
|
||||
|
||||
, rsaKeySize: 2048
|
||||
};
|
||||
|
|
@ -169,7 +149,7 @@ module.exports.create = function (configs) {
|
|||
if (!keypath) {
|
||||
return null;
|
||||
}
|
||||
return readFileAsync(keypath, 'ascii').then(function (key) {
|
||||
return fs.readFileAsync(keypath, 'ascii').then(function (key) {
|
||||
if ('jwk' === format) {
|
||||
return { privateKeyJwk: JSON.parse(key) };
|
||||
}
|
||||
|
|
@ -195,7 +175,7 @@ module.exports.create = function (configs) {
|
|||
key = keypair.privateKeyPem;
|
||||
}
|
||||
|
||||
return writeFileAsync(keypath, key, 'ascii').then(function () {
|
||||
return fs.writeFileAsync(keypath, key, 'ascii').then(function () {
|
||||
return keypair;
|
||||
});
|
||||
});
|
||||
|
|
@ -224,15 +204,15 @@ module.exports.create = function (configs) {
|
|||
return PromiseA.reject(new Error("missing one or more of privkeyPath, fullchainPath, certPath, chainPath from options"));
|
||||
}
|
||||
|
||||
//, readFileAsync(fullchainPath, 'ascii')
|
||||
//, fs.readFileAsync(fullchainPath, 'ascii')
|
||||
// note: if this ^^ gets added back in, the arrays below must change
|
||||
return PromiseA.all([
|
||||
readFileAsync(args.privkeyPath, 'ascii') // 0
|
||||
, readFileAsync(args.certPath, 'ascii') // 1
|
||||
, readFileAsync(args.chainPath, 'ascii') // 2
|
||||
fs.readFileAsync(args.privkeyPath, 'ascii') // 0
|
||||
, fs.readFileAsync(args.certPath, 'ascii') // 1
|
||||
, fs.readFileAsync(args.chainPath, 'ascii') // 2
|
||||
|
||||
// stat the file, not the link
|
||||
, statAsync(args.certPath) // 3
|
||||
, fs.statAsync(args.certPath) // 3
|
||||
]).then(function (arr) {
|
||||
return {
|
||||
privkey: arr[0] // privkey.pem
|
||||
|
|
@ -264,8 +244,9 @@ module.exports.create = function (configs) {
|
|||
var certPath = args.certPath || pyobj.cert || path.join(liveDir, 'cert.pem');
|
||||
var fullchainPath = args.fullchainPath || pyobj.fullchain || path.join(liveDir, 'fullchain.pem');
|
||||
var chainPath = args.chainPath || pyobj.chain || path.join(liveDir, 'chain.pem');
|
||||
var privkeyPath = args.privkeyPath || pyobj.privkey || args.domainKeyPath || path.join(liveDir, 'privkey.pem');
|
||||
var bundlePath = args.bundlePath || pyobj.bundle || path.join(liveDir, 'bundle.pem');
|
||||
var privkeyPath = args.privkeyPath || pyobj.privkey
|
||||
|| args.domainKeyPath
|
||||
|| path.join(liveDir, 'privkey.pem');
|
||||
|
||||
var archiveDir = args.archiveDir || path.join(args.configDir, 'archive', args.domains[0]);
|
||||
|
||||
|
|
@ -274,27 +255,22 @@ module.exports.create = function (configs) {
|
|||
var fullchainArchive = path.join(archiveDir, 'fullchain' + checkpoints + '.pem');
|
||||
var chainArchive = path.join(archiveDir, 'chain'+ checkpoints + '.pem');
|
||||
var privkeyArchive = path.join(archiveDir, 'privkey' + checkpoints + '.pem');
|
||||
var bundleArchive = path.join(archiveDir, 'bundle' + checkpoints + '.pem');
|
||||
|
||||
return mkdirpAsync(archiveDir).then(function () {
|
||||
return PromiseA.all([
|
||||
sfs.writeFileAsync(certArchive, pems.cert, 'ascii')
|
||||
, sfs.writeFileAsync(chainArchive, pems.chain, 'ascii')
|
||||
, sfs.writeFileAsync(fullchainArchive, [ pems.cert, pems.chain ].join('\n'), 'ascii')
|
||||
, sfs.writeFileAsync(fullchainArchive, pems.cert + pems.chain, 'ascii')
|
||||
, sfs.writeFileAsync(privkeyArchive, pems.privkey, 'ascii')
|
||||
, sfs.writeFileAsync(bundleArchive, pems.bundle, 'ascii')
|
||||
]);
|
||||
}).then(function () {
|
||||
return mkdirpAsync(liveDir);
|
||||
}).then(function () {
|
||||
return PromiseA.all([
|
||||
sfs.writeFileAsync(certPath, pems.cert, 'ascii')
|
||||
, sfs.writeFileAsync(chainPath, pems.chain, 'ascii')
|
||||
// Most platforms need these two
|
||||
, sfs.writeFileAsync(fullchainPath, [ pems.cert, pems.chain ].join('\n'), 'ascii')
|
||||
, sfs.writeFileAsync(privkeyPath, pems.privkey, 'ascii')
|
||||
// HAProxy needs "bundle.pem" aka "combined.pem"
|
||||
, sfs.writeFileAsync(bundlePath, [ pems.privkey, pems.cert, pems.chain ].join('\n'), 'ascii')
|
||||
symlink(certArchive, certPath)
|
||||
, symlink(chainArchive, chainPath)
|
||||
, symlink(fullchainArchive, fullchainPath)
|
||||
, symlink(privkeyArchive, privkeyPath)
|
||||
]);
|
||||
}).then(function () {
|
||||
pyobj.checkpoints += 1;
|
||||
|
|
@ -308,8 +284,6 @@ module.exports.create = function (configs) {
|
|||
privkey: pems.privkey
|
||||
, cert: pems.cert
|
||||
, chain: pems.chain
|
||||
, expires: pems.expires
|
||||
, identifiers: pems.identifiers
|
||||
|
||||
/*
|
||||
// TODO populate these only if they are actually known
|
||||
|
|
@ -354,11 +328,11 @@ module.exports.create = function (configs) {
|
|||
log(args.debug, "No email given");
|
||||
return PromiseA.resolve(null);
|
||||
}
|
||||
return readdirAsync(args.accountsDir).then(function (nodes) {
|
||||
return fs.readdirAsync(args.accountsDir).then(function (nodes) {
|
||||
log(args.debug, "success reading arg.accountsDir");
|
||||
|
||||
return PromiseA.all(nodes.map(function (node) {
|
||||
return readFileAsync(path.join(args.accountsDir, node, 'regr.json'), 'utf8').then(function (text) {
|
||||
return fs.readFileAsync(path.join(args.accountsDir, node, 'regr.json'), 'utf8').then(function (text) {
|
||||
var regr = JSON.parse(text);
|
||||
regr.__accountId = node;
|
||||
|
||||
|
|
@ -399,8 +373,8 @@ module.exports.create = function (configs) {
|
|||
// Accounts
|
||||
, _getAccountIdByPublicKey: function (keypair) {
|
||||
// we use insecure md5 - even though we know it's bad - because that's how the python client did
|
||||
var pubkey = keypair.publicKeyPem.replace(/\r/g, '');
|
||||
return crypto.createHash('md5').update(pubkey).digest('hex');
|
||||
const pubkey = keypair.publicKeyPem.replace(/\r/g, '');
|
||||
return require('crypto').createHash('md5').update(pubkey).digest('hex');
|
||||
}
|
||||
// Accounts
|
||||
, checkKeypairAsync: function (args) {
|
||||
|
|
@ -456,7 +430,7 @@ module.exports.create = function (configs) {
|
|||
return PromiseA.all(configs.map(function (filename) {
|
||||
var keyname = filename.slice(0, -5);
|
||||
|
||||
return readFileAsync(path.join(accountDir, filename), 'utf8').then(function (text) {
|
||||
return fs.readFileAsync(path.join(accountDir, filename), 'utf8').then(function (text) {
|
||||
var data;
|
||||
|
||||
try {
|
||||
|
|
@ -524,9 +498,9 @@ module.exports.create = function (configs) {
|
|||
// TODO abstract file writing
|
||||
return PromiseA.all([
|
||||
// meta.json {"creation_host": "ns1.redirect-www.org", "creation_dt": "2015-12-11T04:14:38Z"}
|
||||
writeFileAsync(path.join(accountDir, 'meta.json'), JSON.stringify(accountMeta), 'utf8')
|
||||
fs.writeFileAsync(path.join(accountDir, 'meta.json'), JSON.stringify(accountMeta), 'utf8')
|
||||
// private_key.json { "e", "d", "n", "q", "p", "kty", "qi", "dp", "dq" }
|
||||
, writeFileAsync(path.join(accountDir, 'private_key.json'), JSON.stringify(reg.keypair.privateKeyJwk), 'utf8')
|
||||
, fs.writeFileAsync(path.join(accountDir, 'private_key.json'), JSON.stringify(reg.keypair.privateKeyJwk), 'utf8')
|
||||
// regr.json:
|
||||
/*
|
||||
{ body: { contact: [ 'mailto:coolaj86@gmail.com' ],
|
||||
|
|
@ -536,7 +510,7 @@ module.exports.create = function (configs) {
|
|||
new_authzr_uri: 'https://acme-v01.api.letsencrypt.org/acme/new-authz',
|
||||
terms_of_service: 'https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf' }
|
||||
*/
|
||||
, writeFileAsync(path.join(accountDir, 'regr.json'),
|
||||
, fs.writeFileAsync(path.join(accountDir, 'regr.json'),
|
||||
JSON.stringify(regrBody),
|
||||
'utf8')
|
||||
]);
|
||||
|
|
@ -552,7 +526,7 @@ module.exports.create = function (configs) {
|
|||
}
|
||||
// Accounts
|
||||
, getAccountIdAsync: function (args) {
|
||||
var pyconf = promisifyAll(require('pyconf'));
|
||||
var pyconf = PromiseA.promisifyAll(require('pyconf'));
|
||||
|
||||
return pyconf.readFileAsync(args.renewalPath).then(function (renewal) {
|
||||
var accountId = renewal.account;
|
||||
|
|
@ -588,7 +562,7 @@ module.exports.create = function (configs) {
|
|||
}
|
||||
// Configs
|
||||
, _checkHelperAsync: function (args) {
|
||||
var pyconf = promisifyAll(require('pyconf'));
|
||||
var pyconf = PromiseA.promisifyAll(require('pyconf'));
|
||||
|
||||
return pyconf.readFileAsync(args.renewalPath).then(function (pyobj) {
|
||||
return pyobj;
|
||||
|
|
@ -642,7 +616,7 @@ module.exports.create = function (configs) {
|
|||
, allAsync: function (copy) {
|
||||
copy.domains = [];
|
||||
|
||||
return readdirAsync(copy.renewalDir).then(function (nodes) {
|
||||
return fs.readdirAsync(copy.renewalDir).then(function (nodes) {
|
||||
nodes = nodes.filter(function (node) {
|
||||
return /^[a-z0-9]+.*\.conf$/.test(node);
|
||||
});
|
||||
|
|
|
|||
11
package.json
11
package.json
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "le-store-certbot",
|
||||
"version": "2.2.0",
|
||||
"version": "2.1.2",
|
||||
"description": "The \"certbot\" storage strategy for Greenlock.js",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
|
|
@ -23,12 +23,11 @@
|
|||
"url": "https://git.coolaj86.com/coolaj86/le-store-certbot.js/issues"
|
||||
},
|
||||
"homepage": "https://git.coolaj86.com/coolaj86/le-store-certbot.js",
|
||||
"trulyOptionalDependencies": {
|
||||
"bluebird": "^3.5.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"bluebird": "^3.5.1",
|
||||
"fs-symlink": "^1.2.1",
|
||||
"mkdirp": "^0.5.1",
|
||||
"pyconf": "^1.1.5",
|
||||
"safe-replace": "^1.0.3"
|
||||
"pyconf": "^1.1.2",
|
||||
"safe-replace": "^1.0.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue