Merge pull request #376 from ipfs/security-gpg

feat: Add security@ipfs.io GPG key
ipfs · Mar 21, 2017 · 7107d4f · 7107d4f
2 parents f876171 + 6500103
commit 7107d4f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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/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,

diff --git 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()