root
/
gl-store-s3.js
mirror of https://github.com/cderche/greenlock-storage-s3
2
0
Fork 0
Code Issues 1 Releases Wiki Activity

refactoring

This commit is contained in:
Cyrille 2019-05-08 17:12:22 +01:00
parent 1eb8d14b7e
commit 371e95fd22
12 changed files with 210 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
index.js
View File

@ -1,23 +1,3 @@
////////////////////////////
// File names for support //
////////////////////////////
const fileNames = {
privkey: {
pem: 'privkey.pem'
, jwk: 'privkey.jwk'
}
, cert: 'cert.pem'
, chain: 'chain.pem'
, fullchain: 'fullchain.pem'
, bundle: 'bundle.pem'
}
///////////////////////////
// Setup the environment //
///////////////////////////
var path = require('path'); var path = require('path');
var Promise = require('bluebird') var Promise = require('bluebird')
@ -35,7 +15,8 @@ const defaultOptions = {
const s3 = new AWS.S3({ apiVersion: '2006-03-01' }); const s3 = new AWS.S3({ apiVersion: '2006-03-01' });
const pathHelper = require('./pathHelper'); const pathHelper = require('./lib/pathHelper');
const fileNames = require('./lib/fileNames');
module.exports.create = (createOptions) => { module.exports.create = (createOptions) => {
@ -58,179 +39,30 @@ module.exports.create = (createOptions) => {
const handlers = { const handlers = {
certificates: { certificates: {
check: (opts) => { check: (opts) => {
return require('./lib/certificates/check').check(opts, options, s3);
var id = opts.certificate && opts.certificate.id || opts.subject;
console.log('certificates.check for', opts.subject);
var privkeyPath = pathHelper.certificatesPath(options, id, fileNames.privkey.pem);
var certPath = pathHelper.certificatesPath(options, id, fileNames.cert);
var chainPath = pathHelper.certificatesPath(options, id, fileNames.chain);
return Promise.all([
s3.getObject({ Key: privkeyPath, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully retrieved certificate privkey.pem');
return data.Body.toString();
}).catch((err) => {
console.error('There was an error retrieving your certificate privkey.pem:', err.message);
throw err;
}),
s3.getObject({ Key: certPath, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully retrieved certificate cert.pem');
return data.Body.toString();
}).catch((err) => {
console.error('There was an error retrieving your certificate cert.pem:', err.message);
throw err;
}),
s3.getObject({ Key: chainPath, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully retrieved certificate chain.pem');
return data.Body.toString();
}).catch((err) => {
console.error('There was an error retrieving your certificate chain.pem:', err.message);
throw err;
})
]).then((values) => {
// console.log('Promise.all(values):', values);
return {
privkey: values[0]
, cert: values[1]
, chain: values[2]
}
}).catch((err) => {
console.error('There was an error checking the ceritifcates:', err.message);
return null;
});
}, },
checkKeypair: (opts) => { checkKeypair: (opts) => {
console.log('certificates.checkKeypair for', opts.subject); return require('./lib/certificates/checkKeypair').checkKeypair(opts, options, s3);
id = opts.certificate.kid || opts.certificate.id || opts.subject;
pemKeyPath = pathHelper.certificatesPath(options, id, fileNames.privkey.pem);
jwkKeyPath = pathHelper.certificatesPath(options, id, fileNames.privkey.jwk);
return s3.getObject({ Key: pemKeyPath, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully retrieved certificate PEM keypair.');
return {
privateKeyPem: data.Body.toString()
}
}).catch((err) => {
console.error('There was an error retrieving your certificate PEM keypair:', err.message);
return null
});
}, },
setKeypair: (opts) => { setKeypair: (opts) => {
id = opts.certificate.kid || opts.certificate.id || opts.subject; return require('./lib/certificates/setKeypair').setKeypair(opts, options, s3);
console.log('certificates.setKeypair for', id);
pemKeyPath = pathHelper.certificatesPath(options, id, fileNames.privkey.pem);
jwkKeyPath = pathHelper.certificatesPath(options, id, fileNames.privkey.jwk);
return s3.putObject({ Key: pemKeyPath, Body: opts.keypair.privateKeyPem, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully set the PEM privateKey.');
return null;
}).catch((err) => {
console.error('There was an error setting your PEM privateKey:', err.message);
throw err;
});
}, },
set: (opts) => { set: (opts) => {
console.log('certificates.set for ', opts.subject); return require('./lib/certificates/set').set(opts, options, s3);
var pems = {
cert: opts.pems.cert
, chain: opts.pems.chain
, privkey: opts.pems.privkey
}
var certPath = pathHelper.certificatesPath(options, opts.subject, fileNames.cert);
var chainPath = pathHelper.certificatesPath(options, opts.subject, fileNames.chain);
var fullchainPath = pathHelper.certificatesPath(options, opts.subject, fileNames.fullchain);
var bundlePath = pathHelper.certificatesPath(options, opts.subject, fileNames.bundle);
var fullchainPem = [pems.cert, pems.chain].join('\n'); // for Apache, Nginx, etc
var bundlePem = [pems.privkey, pems.cert, pems.chain].join('\n'); // for HAProxy
return Promise.all([
s3.putObject({ Key: certPath, Body: pems.cert, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully set', certPath);
}).catch((err) => {
console.error('There was an error setting cert.pem:', err.message);
throw err;
}),
s3.putObject({ Key: chainPath, Body: pems.chain, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully set', chainPath);
}).catch((err) => {
console.error('There was an error setting chain.pem:', err.message);
throw err;
}),
s3.putObject({ Key: fullchainPath, Body: fullchainPem, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully set', fullchainPath);
}).catch((err) => {
console.error('There was an error setting fullchain.pem:', err.message);
throw err;
}),
s3.putObject({ Key: bundlePath, Body: bundlePem, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully set', bundlePath);
}).catch((err) => {
console.error('There was an error setting bundle.pem:', err.message);
throw err;
})
]).then((values) => {
return null;
}).catch((err) => {
console.error('There was an error setting the certificates:', err.message);
throw err;
});
} }
}, },
accounts: { accounts: {
check: (opts) => { check: (opts) => {
console.log("accounts.check", opts.account.id); return require('./lib/accounts/check').check(opts, options, s3);
// console.log(opts);
}, },
checkKeypair: (opts) => { checkKeypair: (opts) => {
var id = opts.account.id || opts.email || 'single-user'; return require('./lib/accounts/checkKeypair').checkKeypair(opts, options, s3);
console.log('accounts.checkKeypair for', id);
key = pathHelper.accountsPath(options, id)
return s3.getObject({ Key: key, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully retrieved account keypair.');
var keypair = JSON.parse(data.Body.toString());
return {
privateKeyPem: keypair.privateKeyPem // string PEM private key
, privateKeyJwk: keypair.privateKeyJwk // object JWK private key
};
}).catch((err) => {
console.error('There was an error retrieving your account keypair:', err.message);
return null;
});
}, },
setKeypair: (opts) => { setKeypair: (opts) => {
console.log('accounts.setKeypair for', opts.account); return require('./lib/accounts/setKeypair').setKeypair(opts, options, s3);
var id = opts.account.id || opts.email || 'single-user';
key = pathHelper.accountsPath(options, id)
var body = JSON.stringify({
privateKeyPem: opts.keypair.privateKeyPem // string PEM
, privateKeyJwk: opts.keypair.privateKeyJwk // object JWK
});
return s3.putObject({ Key: key, Body: body, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully created account keypair.');
return null;
}).catch((err) => {
console.error('There was an error creating account keypair:', err.message);
return null;
});
}, },
set: (opts) => { set: (opts) => {
console.log("accounts.set"); return require('./lib/accounts/set').set(opts, options, s3);
} }
} }
} }

6
lib/accounts/check.js Normal file
View File

@ -0,0 +1,6 @@
const pathHelper = require('../pathHelper');
const fileNames = require('../fileNames');
module.exports.check = (opts, options, s3) => {
console.log("accounts.check", opts.account.id);
}

21
lib/accounts/checkKeypair.js Normal file
View File

@ -0,0 +1,21 @@
const pathHelper = require('../pathHelper');
const fileNames = require('../fileNames');
module.exports.checkKeypair = (opts, options, s3) => {
var id = opts.account.id || opts.email || 'single-user';
console.log('accounts.checkKeypair for', id);
key = pathHelper.accountsPath(options, id)
return s3.getObject({ Key: key, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully retrieved account keypair.');
var keypair = JSON.parse(data.Body.toString());
return {
privateKeyPem: keypair.privateKeyPem // string PEM private key
, privateKeyJwk: keypair.privateKeyJwk // object JWK private key
};
}).catch((err) => {
console.error('There was an error retrieving your account keypair:', err.message);
return null;
});
}

6
lib/accounts/set.js Normal file
View File

@ -0,0 +1,6 @@
const pathHelper = require('../pathHelper');
const fileNames = require('../fileNames');
module.exports.set = (opts, options, s3) => {
console.log("accounts.set");
}

22
lib/accounts/setKeypair.js Normal file
View File

@ -0,0 +1,22 @@
const pathHelper = require('../pathHelper');
const fileNames = require('../fileNames');
module.exports.setKeypair = (opts, options, s3) => {
console.log('accounts.setKeypair for', opts.account);
var id = opts.account.id || opts.email || 'single-user';
key = pathHelper.accountsPath(options, id)
var body = JSON.stringify({
privateKeyPem: opts.keypair.privateKeyPem // string PEM
, privateKeyJwk: opts.keypair.privateKeyJwk // object JWK
});
return s3.putObject({ Key: key, Body: body, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully created account keypair.');
return null;
}).catch((err) => {
console.error('There was an error creating account keypair:', err.message);
return null;
});
}

44
lib/certificates/check.js Normal file
View File

@ -0,0 +1,44 @@
const pathHelper = require('../pathHelper');
const fileNames = require('../fileNames');
module.exports.check = (opts, options, s3) => {
var id = opts.certificate && opts.certificate.id || opts.subject;
console.log('certificates.check for', opts.subject);
var privkeyPath = pathHelper.certificatesPath(options, id, fileNames.privkey.pem);
var certPath = pathHelper.certificatesPath(options, id, fileNames.cert);
var chainPath = pathHelper.certificatesPath(options, id, fileNames.chain);
return Promise.all([
s3.getObject({ Key: privkeyPath, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully retrieved certificate privkey.pem');
return data.Body.toString();
}).catch((err) => {
console.error('There was an error retrieving your certificate privkey.pem:', err.message);
throw err;
}),
s3.getObject({ Key: certPath, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully retrieved certificate cert.pem');
return data.Body.toString();
}).catch((err) => {
console.error('There was an error retrieving your certificate cert.pem:', err.message);
throw err;
}),
s3.getObject({ Key: chainPath, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully retrieved certificate chain.pem');
return data.Body.toString();
}).catch((err) => {
console.error('There was an error retrieving your certificate chain.pem:', err.message);
throw err;
})
]).then((values) => {
return {
privkey: values[0]
, cert: values[1]
, chain: values[2]
}
}).catch((err) => {
console.error('There was an error checking the ceritifcates:', err.message);
return null;
});
}

21
lib/certificates/checkKeypair.js Normal file
View File

@ -0,0 +1,21 @@
const pathHelper = require('../pathHelper');
const fileNames = require('../fileNames');
module.exports.checkKeypair = (opts, options, s3) => {
console.log('certificates.checkKeypair for', opts.subject);
id = opts.certificate.kid || opts.certificate.id || opts.subject;
pemKeyPath = pathHelper.certificatesPath(options, id, fileNames.privkey.pem);
jwkKeyPath = pathHelper.certificatesPath(options, id, fileNames.privkey.jwk);
return s3.getObject({ Key: pemKeyPath, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully retrieved certificate PEM keypair.');
return {
privateKeyPem: data.Body.toString()
}
}).catch((err) => {
console.error('There was an error retrieving your certificate PEM keypair:', err.message);
return null;
});
}

52
lib/certificates/set.js Normal file
View File

@ -0,0 +1,52 @@
const pathHelper = require('../pathHelper');
const fileNames = require('../fileNames');
module.exports.set = (opts, options, s3) => {
console.log('certificates.set for ', opts.subject);
var pems = {
cert: opts.pems.cert
, chain: opts.pems.chain
, privkey: opts.pems.privkey
}
var certPath = pathHelper.certificatesPath(options, opts.subject, fileNames.cert);
var chainPath = pathHelper.certificatesPath(options, opts.subject, fileNames.chain);
var fullchainPath = pathHelper.certificatesPath(options, opts.subject, fileNames.fullchain);
var bundlePath = pathHelper.certificatesPath(options, opts.subject, fileNames.bundle);
var fullchainPem = [pems.cert, pems.chain].join('\n'); // for Apache, Nginx, etc
var bundlePem = [pems.privkey, pems.cert, pems.chain].join('\n'); // for HAProxy
return Promise.all([
s3.putObject({ Key: certPath, Body: pems.cert, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully set', certPath);
}).catch((err) => {
console.error('There was an error setting cert.pem:', err.message);
throw err;
}),
s3.putObject({ Key: chainPath, Body: pems.chain, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully set', chainPath);
}).catch((err) => {
console.error('There was an error setting chain.pem:', err.message);
throw err;
}),
s3.putObject({ Key: fullchainPath, Body: fullchainPem, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully set', fullchainPath);
}).catch((err) => {
console.error('There was an error setting fullchain.pem:', err.message);
throw err;
}),
s3.putObject({ Key: bundlePath, Body: bundlePem, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully set', bundlePath);
}).catch((err) => {
console.error('There was an error setting bundle.pem:', err.message);
throw err;
})
]).then((values) => {
return null;
}).catch((err) => {
console.error('There was an error setting the certificates:', err.message);
throw err;
});
}

18
lib/certificates/setKeypair.js Normal file
View File

@ -0,0 +1,18 @@
const pathHelper = require('../pathHelper');
const fileNames = require('../fileNames');
module.exports.setKeypair = (opts, options, s3) => {
id = opts.certificate.kid || opts.certificate.id || opts.subject;
console.log('certificates.setKeypair for', id);
pemKeyPath = pathHelper.certificatesPath(options, id, fileNames.privkey.pem);
jwkKeyPath = pathHelper.certificatesPath(options, id, fileNames.privkey.jwk);
return s3.putObject({ Key: pemKeyPath, Body: opts.keypair.privateKeyPem, Bucket: options.bucketName }).promise().then((data) => {
console.log('Successfully set the PEM privateKey.');
return null;
}).catch((err) => {
console.error('There was an error setting your PEM privateKey:', err.message);
throw err;
});
}

10
lib/fileNames.js Normal file
View File

@ -0,0 +1,10 @@
module.exports = {
privkey: {
pem: 'privkey.pem'
, jwk: 'privkey.jwk'
}
, cert: 'cert.pem'
, chain: 'chain.pem'
, fullchain: 'fullchain.pem'
, bundle: 'bundle.pem'
}

0
pathHelper.js → lib/pathHelper.js
View File

0
lib/s3.js Normal file
View File