Compare commits

...

4 Commits

9 changed files with 49 additions and 60 deletions

1
.gitignore vendored
View File

@ -41,3 +41,4 @@ test/test-data/go-ipfs-repo/LOG.old
# while testing npm5 # while testing npm5
package-lock.json package-lock.json
yarn.lock

View File

@ -1,3 +1,13 @@
<a name="0.3.6"></a>
## [0.3.6](https://github.com/libp2p/js-libp2p-keychain/compare/v0.3.5...v0.3.6) (2019-01-10)
### Bug Fixes
* reduce bundle size ([#28](https://github.com/libp2p/js-libp2p-keychain/issues/28)) ([7eeed87](https://github.com/libp2p/js-libp2p-keychain/commit/7eeed87))
<a name="0.3.5"></a> <a name="0.3.5"></a>
## [0.3.5](https://github.com/libp2p/js-libp2p-keychain/compare/v0.3.4...v0.3.5) (2019-01-10) ## [0.3.5](https://github.com/libp2p/js-libp2p-keychain/compare/v0.3.4...v0.3.5) (2019-01-10)

View File

@ -1,29 +0,0 @@
# Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories.
version: "{build}"
environment:
matrix:
- nodejs_version: "6"
- nodejs_version: "8"
matrix:
fast_finish: true
install:
# Install Node.js
- ps: Install-Product node $env:nodejs_version
# Upgrade npm
- npm install -g npm
# Output our current versions for debugging
- node --version
- npm --version
# Install our package dependencies
- npm install
test_script:
- npm run test:node
build: off

View File

@ -1,6 +1,6 @@
{ {
"name": "libp2p-keychain", "name": "libp2p-keychain",
"version": "0.3.5", "version": "0.3.6",
"description": "Key management and cryptographically protected messages", "description": "Key management and cryptographically protected messages",
"leadMaintainer": "Vasco Santos <vasco.santos@moxy.studio>", "leadMaintainer": "Vasco Santos <vasco.santos@moxy.studio>",
"main": "src/index.js", "main": "src/index.js",
@ -44,26 +44,29 @@
"dependencies": { "dependencies": {
"async": "^2.6.1", "async": "^2.6.1",
"interface-datastore": "~0.6.0", "interface-datastore": "~0.6.0",
"libp2p-crypto": "~0.15.0", "libp2p-crypto": "~0.16.0",
"lodash": "^4.17.11", "merge-options": "^1.0.1",
"pull-stream": "^3.6.9", "node-forge": "~0.7.6",
"pull-stream": "^3.6.8",
"sanitize-filename": "^1.6.1" "sanitize-filename": "^1.6.1"
}, },
"devDependencies": { "devDependencies": {
"aegir": "^18.0.2", "aegir": "^18.0.3",
"chai": "^4.2.0", "chai": "^4.2.0",
"chai-string": "^1.5.0", "chai-string": "^1.4.0",
"datastore-fs": "~0.7.0", "datastore-fs": "~0.7.0",
"datastore-level": "~0.10.0", "datastore-level": "~0.10.0",
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"level-js": "^4.0.0", "level-js": "^4.0.0",
"mocha": "^5.2.0", "mocha": "^5.2.0",
"peer-id": "~0.12.1", "multihashes": "~0.4.14",
"peer-id": "~0.12.2",
"rimraf": "^2.6.3" "rimraf": "^2.6.3"
}, },
"contributors": [ "contributors": [
"Alan Shaw <alan.shaw@protocol.ai>", "Alan Shaw <alan.shaw@protocol.ai>",
"David Dias <daviddias.p@gmail.com>", "David Dias <daviddias.p@gmail.com>",
"Hugo Dias <mail@hugodias.me>",
"Maciej Krüger <mkg20001@gmail.com>", "Maciej Krüger <mkg20001@gmail.com>",
"Masahiro Saito <camelmasa@gmail.com>", "Masahiro Saito <camelmasa@gmail.com>",
"Richard Schneider <makaretu@gmail.com>", "Richard Schneider <makaretu@gmail.com>",

View File

@ -1,7 +1,12 @@
'use strict' 'use strict'
const async = require('async') const setImmediate = require('async/setImmediate')
const forge = require('node-forge') const series = require('async/series')
const detect = require('async/detect')
const waterfall = require('async/waterfall')
require('node-forge/lib/pkcs7')
require('node-forge/lib/pbe')
const forge = require('node-forge/lib/forge')
const util = require('./util') const util = require('./util')
/** /**
@ -39,13 +44,13 @@ class CMS {
*/ */
encrypt (name, plain, callback) { encrypt (name, plain, callback) {
const self = this const self = this
const done = (err, result) => async.setImmediate(() => callback(err, result)) const done = (err, result) => setImmediate(() => callback(err, result))
if (!Buffer.isBuffer(plain)) { if (!Buffer.isBuffer(plain)) {
return done(new Error('Plain data must be a Buffer')) return done(new Error('Plain data must be a Buffer'))
} }
async.series([ series([
(cb) => self.keychain.findKeyByName(name, cb), (cb) => self.keychain.findKeyByName(name, cb),
(cb) => self.keychain._getPrivateKey(name, cb) (cb) => self.keychain._getPrivateKey(name, cb)
], (err, results) => { ], (err, results) => {
@ -85,7 +90,7 @@ class CMS {
* @returns {undefined} * @returns {undefined}
*/ */
decrypt (cmsData, callback) { decrypt (cmsData, callback) {
const done = (err, result) => async.setImmediate(() => callback(err, result)) const done = (err, result) => setImmediate(() => callback(err, result))
if (!Buffer.isBuffer(cmsData)) { if (!Buffer.isBuffer(cmsData)) {
return done(new Error('CMS data is required')) return done(new Error('CMS data is required'))
@ -112,7 +117,7 @@ class CMS {
keyId: r.issuer.find(a => a.shortName === 'CN').value keyId: r.issuer.find(a => a.shortName === 'CN').value
} }
}) })
async.detect( detect(
recipients, recipients,
(r, cb) => self.keychain.findKeyById(r.keyId, (err, info) => cb(null, !err && info)), (r, cb) => self.keychain.findKeyById(r.keyId, (err, info) => cb(null, !err && info)),
(err, r) => { (err, r) => {
@ -124,7 +129,7 @@ class CMS {
return done(err) return done(err)
} }
async.waterfall([ waterfall([
(cb) => self.keychain.findKeyById(r.keyId, cb), (cb) => self.keychain.findKeyById(r.keyId, cb),
(key, cb) => self.keychain._getPrivateKey(key.name, cb) (key, cb) => self.keychain._getPrivateKey(key.name, cb)
], (err, pem) => { ], (err, pem) => {

View File

@ -2,12 +2,11 @@
'use strict' 'use strict'
const sanitize = require('sanitize-filename') const sanitize = require('sanitize-filename')
const deepmerge = require('lodash/merge') const mergeOptions = require('merge-options')
const crypto = require('libp2p-crypto') const crypto = require('libp2p-crypto')
const DS = require('interface-datastore') const DS = require('interface-datastore')
const pull = require('pull-stream') const collect = require('pull-stream/sinks/collect')
const isString = require('lodash/isString') const pull = require('pull-stream/pull')
const isSafeInteger = require('lodash/isSafeInteger')
const CMS = require('./cms') const CMS = require('./cms')
const keyPrefix = '/pkcs8/' const keyPrefix = '/pkcs8/'
@ -32,7 +31,7 @@ const defaultOptions = {
function validateKeyName (name) { function validateKeyName (name) {
if (!name) return false if (!name) return false
if (!isString(name)) return false if (typeof name !== 'string') return false
return name === sanitize(name.trim()) return name === sanitize(name.trim())
} }
@ -107,8 +106,7 @@ class Keychain {
} }
this.store = store this.store = store
const opts = {} const opts = mergeOptions(defaultOptions, options)
deepmerge(opts, defaultOptions, options)
// Enforce NIST SP 800-132 // Enforce NIST SP 800-132
if (!opts.passPhrase || opts.passPhrase.length < 20) { if (!opts.passPhrase || opts.passPhrase.length < 20) {
@ -186,11 +184,11 @@ class Keychain {
return _error(callback, `Invalid key name '${name}'`) return _error(callback, `Invalid key name '${name}'`)
} }
if (!isString(type)) { if (typeof type !== 'string') {
return _error(callback, `Invalid key type '${type}'`) return _error(callback, `Invalid key type '${type}'`)
} }
if (!isSafeInteger(size)) { if (!Number.isSafeInteger(size)) {
return _error(callback, `Invalid key size '${size}'`) return _error(callback, `Invalid key size '${size}'`)
} }
@ -246,7 +244,7 @@ class Keychain {
} }
pull( pull(
self.store.query(query), self.store.query(query),
pull.collect((err, res) => { collect((err, res) => {
if (err) return _error(callback, err) if (err) return _error(callback, err)
const info = res.map(r => JSON.parse(r.value)) const info = res.map(r => JSON.parse(r.value))

View File

@ -1,6 +1,7 @@
'use strict' 'use strict'
const forge = require('node-forge') require('node-forge/lib/x509')
const forge = require('node-forge/lib/forge')
const pki = forge.pki const pki = forge.pki
exports = module.exports exports = module.exports

View File

@ -1,7 +1,7 @@
/* eslint-env mocha */ /* eslint-env mocha */
'use strict' 'use strict'
const async = require('async') const series = require('async/series')
const LevelStore = require('datastore-level') const LevelStore = require('datastore-level')
describe('browser', () => { describe('browser', () => {
@ -9,14 +9,14 @@ describe('browser', () => {
const datastore2 = new LevelStore('test-keystore-2', { db: require('level-js') }) const datastore2 = new LevelStore('test-keystore-2', { db: require('level-js') })
before((done) => { before((done) => {
async.series([ series([
(cb) => datastore1.open(cb), (cb) => datastore1.open(cb),
(cb) => datastore2.open(cb) (cb) => datastore2.open(cb)
], done) ], done)
}) })
after((done) => { after((done) => {
async.series([ series([
(cb) => datastore1.close(cb), (cb) => datastore1.close(cb),
(cb) => datastore2.close(cb) (cb) => datastore2.close(cb)
], done) ], done)

View File

@ -4,7 +4,7 @@
const os = require('os') const os = require('os')
const path = require('path') const path = require('path')
const rimraf = require('rimraf') const rimraf = require('rimraf')
const async = require('async') const series = require('async/series')
const FsStore = require('datastore-fs') const FsStore = require('datastore-fs')
describe('node', () => { describe('node', () => {
@ -14,14 +14,14 @@ describe('node', () => {
const datastore2 = new FsStore(store2) const datastore2 = new FsStore(store2)
before((done) => { before((done) => {
async.series([ series([
(cb) => datastore1.open(cb), (cb) => datastore1.open(cb),
(cb) => datastore2.open(cb) (cb) => datastore2.open(cb)
], done) ], done)
}) })
after((done) => { after((done) => {
async.series([ series([
(cb) => datastore1.close(cb), (cb) => datastore1.close(cb),
(cb) => datastore2.close(cb), (cb) => datastore2.close(cb),
(cb) => rimraf(store1, cb), (cb) => rimraf(store1, cb),