fix: add the ability to verify expected peer data

chore: remove non jenkins ci
chore: remove appveyor
chore: update deps
fix: linting

.travis.yml

@@ -1,32 +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.
-sudo: false
-language: node_js
-
-matrix:
-  include:
-  - node_js: 6
-    env: CXX=g++-4.8
-  - node_js: 8
-    env: CXX=g++-4.8
-    #  - node_js: stable
-    #    env: CXX=g++-4.8
-
-script:
-  - npm run lint
-  - npm run test
-  - npm run coverage
-
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-
-after_success:
-  - npm run coverage-publish
-
-addons:
-  firefox: 'latest'
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8

README.md

@@ -19,7 +19,7 @@
 
 ## Description
 
-Identify is a STUN protocol, used by libp2p-swarmin order to broadcast and learn about the `ip:port` pairs a specific peer is available through and to know when a new stream muxer is established, so a conn can be reused.
+Identify is a STUN protocol, used by libp2p-swarm in order to broadcast and learn about the `ip:port` pairs a specific peer is available through and to know when a new stream muxer is established, so a conn can be reused.
 
 ## How does it work
 

appveyor.yml

@@ -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

circle.yml

@@ -1,15 +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.
-machine:
-  node:
-    version: stable
-
-dependencies:
-  pre:
-    - google-chrome --version
-    - curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-    - sudo dpkg -i google-chrome.deb || true
-    - sudo apt-get update
-    - sudo apt-get install -f
-    - sudo apt-get install --only-upgrade lsb-base
-    - sudo dpkg -i google-chrome.deb
-    - google-chrome --version

package.json

@@ -37,7 +37,7 @@
   },
   "homepage": "https://github.com/libp2p/js-libp2p-identify#readme",
   "devDependencies": {
-    "aegir": "^13.1.0",
+    "aegir": "^15.0.0",
     "chai": "^4.1.2",
     "dirty-chai": "^2.0.1",
     "pull-pair": "^1.1.0"

src/dialer.js

@@ -7,7 +7,13 @@ const lp = require('pull-length-prefixed')
 
 const msg = require('./message')
 
-module.exports = (conn, callback) => {
+module.exports = (conn, expectedPeerInfo, callback) => {
+  if (typeof expectedPeerInfo === 'function') {
+    callback = expectedPeerInfo
+    expectedPeerInfo = null
+    console.warn('WARNING: no expected peer info was given, identify will not be able to verify peer integrity')
+  }
+
   pull(
     conn,
     lp.decode(),
@@ -30,6 +36,10 @@ module.exports = (conn, callback) => {
         }
 
         const peerInfo = new PeerInfo(id)
+        if (expectedPeerInfo && expectedPeerInfo.id.toB58String() !== id.toB58String()) {
+          return callback(new Error('invalid peer'))
+        }
+
         try {
           input.listenAddrs
             .map(multiaddr)
@@ -59,7 +69,7 @@ function getObservedAddrs (input) {
 
   let addrs = input.observedAddr
 
-  if (!Array.isArray(input.observedAddr)) {
+  if (!Array.isArray(addrs)) {
     addrs = [addrs]
   }
 

src/index.js

@@ -4,3 +4,4 @@ exports = module.exports
 exports.multicodec = '/ipfs/id/1.0.0'
 exports.listener = require('./listener')
 exports.dialer = require('./dialer')
+exports.message = require('./message')

test/dialer.spec.js

@@ -108,4 +108,34 @@ describe('identify.dialer', () => {
       done()
     })
   })
+
+  it('should return an error with mismatched peerInfo data', (done) => {
+    const p = pair()
+    original.multiaddrs.add(multiaddr('/ip4/127.0.0.1/tcp/5002'))
+    const input = msg.encode({
+      protocolVersion: 'ipfs/0.1.0',
+      agentVersion: 'na',
+      publicKey: original.id.pubKey.bytes,
+      listenAddrs: [multiaddr('/ip4/127.0.0.1/tcp/5002').buffer],
+      observedAddr: multiaddr('/ip4/127.0.0.1/tcp/5001').buffer
+    })
+
+    PeerInfo.create((err, info) => {
+      if (err) {
+        return done(err)
+      }
+
+      pull(
+        pull.values([input]),
+        lp.encode(),
+        p[0]
+      )
+
+      identify.dialer(p[1], info, (err, peerInfo) => {
+        expect(err).to.exist()
+        expect(peerInfo).to.not.exist()
+        done()
+      })
+    })
+  })
 })