From dd4aaa5f427704de6543b7140515beb5278c53ea Mon Sep 17 00:00:00 2001 From: Lars Gierth Date: Wed, 27 Jul 2016 15:39:33 +0100 Subject: [PATCH 1/2] Add security@ipfs.io GPG key --- src/init-files/init-docs/security-notes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/init-files/init-docs/security-notes b/src/init-files/init-docs/security-notes index da55ea71c4..00b70b6deb 100644 --- a/src/init-files/init-docs/security-notes +++ b/src/init-files/init-docs/security-notes @@ -14,6 +14,10 @@ Please note the following: user provided data. But please point any problems out to us in a github issue, or email security@ipfs.io privately. +- security@ipfs.io GPG key: + - 4B9665FB 92636D17 7C7A86D3 50AAE8A9 59B13AF3 + - https://pgp.mit.edu/pks/lookup?op=get&search=0x50AAE8A959B13AF3 + - ipfs uses encryption for all communication, but it's NOT PROVEN SECURE YET! It may be totally broken. For now, the code is included to make sure we benchmark our operations with encryption in mind. In the future, From 65001031002eddca14cefdc8f41b03bf125360f1 Mon Sep 17 00:00:00 2001 From: David Dias Date: Tue, 21 Mar 2017 18:54:25 +0000 Subject: [PATCH 2/2] test: fix tests --- src/core/components/init-assets.js | 2 +- src/core/components/init.js | 2 ++ test/core/init.spec.js | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/components/init-assets.js b/src/core/components/init-assets.js index dd71341b3a..33778a50ef 100644 --- a/src/core/components/init-assets.js +++ b/src/core/components/init-assets.js @@ -35,11 +35,11 @@ module.exports = function addDefaultAssets (self, log, callback) { importer(self._ipldResolver), pull.through((el) => { if (el.path === 'files/init-docs/docs') { - // const hash = mh.toB58String(el.multihash) log('to get started, enter:') log() log(`\t jsipfs files cat /ipfs/QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB`) // TODO when we support pathing in unixfs-engine + // const hash = mh.toB58String(el.multihash) // log(`\t jsipfs files cat /ipfs/${hash}/readme`) log() } diff --git a/src/core/components/init.js b/src/core/components/init.js index 5fcfcca428..34ebe29de8 100644 --- a/src/core/components/init.js +++ b/src/core/components/init.js @@ -59,6 +59,8 @@ module.exports = function init (self) { ] if (typeof addDefaultAssets === 'function') { + console.log('init assets') + tasks.push((cb) => addDefaultAssets(self, opts.log, cb)) } diff --git a/test/core/init.spec.js b/test/core/init.spec.js index dc604d9adf..20822bf98b 100644 --- a/test/core/init.spec.js +++ b/test/core/init.spec.js @@ -68,9 +68,9 @@ describe('init', () => { it('init docs are written', (done) => { ipfs.init({ bits: 1024 }, (err) => { expect(err).to.not.exist() - const multihash = new Buffer('12205e7c3ce237f936c76faf625e90f7751a9f5eeb048f59873303c215e9cce87599', 'hex') + const multihash = 'QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB' - ipfs.object.get(multihash, {}, (err, node) => { + ipfs.object.get(multihash, { enc: 'base58' }, (err, node) => { expect(err).to.not.exist() expect(node.links).to.exist() done()