anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix test 9

Browse source
This commit is contained in:
Manuel Araoz 2014-08-19 15:08:10 -04:00
commit 302bc4bf7e
2 changed files with 38 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

17
js/models/network/Async.js
View file

@ -206,24 +206,22 @@ Network.prototype._onMessage = function(enc) {
return; return;
} }
// TODO
/*
if (!this.copayerForPeer[sender] || (isInbound && !this.isInboundPeerAuth[sender])) {
this._deletePeer(sender);
return;
}
*/
//console.log('receiving ' + JSON.stringify(payload)); //console.log('receiving ' + JSON.stringify(payload));
var self = this; var self = this;
switch (payload.type) { switch (payload.type) {
case 'hello': case 'hello':
// if we locked allowed copayers, check if it belongs
if (this.allowedCopayerIds && !this.allowedCopayerIds[payload.copayerId]) { if (this.allowedCopayerIds && !this.allowedCopayerIds[payload.copayerId]) {
this._deletePeer(sender); this._deletePeer(sender);
return; return;
} }
//ensure claimed public key is actually the public key of the peer
//e.g., their public key should hash to be their peerId
if (enc.pubkey !== this.peerFromCopayer(payload.copayerId)) {
this._deletePeer(enc.pubkey, 'incorrect pubkey for peerId');
return;
}
this._addConnectedCopayer(payload.copayerId); this._addConnectedCopayer(payload.copayerId);
break; break;
default: default:
@ -379,6 +377,7 @@ Network.prototype.encode = function(copayerId, payload) {
}; };
var copayerIdBuf = new Buffer(copayerId, 'hex'); var copayerIdBuf = new Buffer(copayerId, 'hex');
var message = AuthMessage.encode(copayerIdBuf, this.getKey(), payload, opts); var message = AuthMessage.encode(copayerIdBuf, this.getKey(), payload, opts);
return message;
}; };
Network.prototype.isOnline = function() { Network.prototype.isOnline = function() {

69
test/test.network.Async.js
View file

@ -11,15 +11,17 @@ var EventEmitter = require('events').EventEmitter;
describe('Network / Async', function() { describe('Network / Async', function() {
var createN = function() { var createN = function(pk) {
var n = new Async(); var n = new Async();
var fakeSocket = new EventEmitter(); var fakeSocket = {};
fakeSocket.emit = function() {};
fakeSocket.on = function() {};
n.createSocket = function() { n.createSocket = function() {
return fakeSocket; return fakeSocket;
}; };
var opts = { var opts = {
copayerId: '03b51d01d798522cf61211b4dfcdd6db219ee33cf166e1cb7f43d836ab00ccddee', copayerId: '03b51d01d798522cf61211b4dfcdd6db219ee33cf166e1cb7f43d836ab00ccddee',
privkey: '31701118abde096d166607115ed00ce74a2231f68f43144406c863f5ebf06c32', privkey: pk || '31701118abde096d166607115ed00ce74a2231f68f43144406c863f5ebf06c32',
lastTimestamp: 1, lastTimestamp: 1,
}; };
n.start(opts); n.start(opts);
@ -59,10 +61,11 @@ describe('Network / Async', function() {
it('should call _sendToOne for a copayer', function(done) { it('should call _sendToOne for a copayer', function(done) {
var n = createN(); var n = createN();
n.privkey = bitcore.util.sha256('test'); n.privkey = bitcore.util.sha256('test');
n.key = null;
var data = new bitcore.Buffer('my data to send'); var data = new bitcore.Buffer('my data to send');
var copayerId = '03b51d01d798522cf61211b4dfcdd6db219ee33cf166e1cb7f43d836abc5c18b23'; var copayerId = '03b51d01d798522cf61211b4dfcdd6d01020304cf166e1cb7f43d836abc5c18b23';
n._sendToOne = function(a, b, cb) { n._sendToOne = function(a, b, cb) {
cb(); cb();
}; };
@ -74,10 +77,11 @@ describe('Network / Async', function() {
it('should call _sendToOne with encrypted data for a copayer', function(done) { it('should call _sendToOne with encrypted data for a copayer', function(done) {
var n = createN(); var n = createN();
n.privkey = bitcore.util.sha256('test'); n.privkey = bitcore.util.sha256('test');
n.key = null;
var data = new bitcore.Buffer('my data to send'); var data = new bitcore.Buffer('my data to send');
var copayerId = '03b51d01d798522cf61211b4dfcdd6db219ee33cf166e1cb7f43d836abc5c18b23'; var copayerId = '03b51d01d798522cf61001b4dfcdd6db219ee33cf166e1cb7f43d836abc5c18b23';
n._sendToOne = function(a1, enc, cb) { n._sendToOne = function(a1, enc, cb) {
var encPayload = JSON.parse(enc.toString()); var encPayload = JSON.parse(enc.toString());
encPayload.sig.length.should.be.greaterThan(0); encPayload.sig.length.should.be.greaterThan(0);
@ -107,7 +111,7 @@ describe('Network / Async', function() {
}); });
}); });
describe('#_onData', function() { describe('#_onMessage', function() {
var privkey1 = bitcore.util.sha256('test privkey 1'); var privkey1 = bitcore.util.sha256('test privkey 1');
var privkey2 = bitcore.util.sha256('test privkey 2'); var privkey2 = bitcore.util.sha256('test privkey 2');
var privkey3 = bitcore.util.sha256('test privkey 2'); var privkey3 = bitcore.util.sha256('test privkey 2');
@ -115,62 +119,49 @@ describe('Network / Async', function() {
var key1 = new bitcore.Key(); var key1 = new bitcore.Key();
key1.private = privkey1; key1.private = privkey1;
key1.regenerateSync(); key1.regenerateSync();
var pk1 = key1.private.toString('hex');
var cid1 = key1.public.toString('hex');
var key2 = new bitcore.Key(); var key2 = new bitcore.Key();
key2.private = privkey2; key2.private = privkey2;
key2.regenerateSync(); key2.regenerateSync();
var pk2 = key2.private.toString('hex');
var cid2 = key2.public.toString('hex');
var key3 = new bitcore.Key(); var key3 = new bitcore.Key();
key3.private = privkey3; key3.private = privkey3;
key3.regenerateSync(); key3.regenerateSync();
var pk3 = key3.private.toString('hex');
var cid3 = key3.public.toString('hex');
it('should not reject data sent from a peer with hijacked pubkey', function() { it('should not reject data sent from a peer with hijacked pubkey', function() {
var n = createN(); var n = createN(pk2);
n.privkey = key2.private.toString('hex');
n.key = null;
var message = { var message = {
type: 'hello', type: 'hello',
copayerId: key1.public.toString('hex') copayerId: cid1
}; };
var messagestr = JSON.stringify(message); var enc = n.encode(cid2, message);
var messagebuf = new Buffer(messagestr);
var encoded = n._encode(key2.public, key1, messagebuf);
var encodedstr = JSON.stringify(encoded);
var encodeduint = new Buffer(encodedstr);
var isInbound = true;
var peerId = new bitcore.SIN(key1.public);
n._deletePeer = sinon.spy(); n._deletePeer = sinon.spy();
n._onData(encodeduint, isInbound, peerId); n._onMessage(enc);
n._deletePeer.calledOnce.should.equal(false); n._deletePeer.calledOnce.should.equal(false);
}); });
it('should reject data sent from a peer with hijacked pubkey', function() { it('should reject data sent from a peer with hijacked pubkey', function() {
var n = createN(); var n = createN(pk2);
n.privkey = key2.private.toString('hex');
n.key = null;
var message = { var message = {
type: 'hello', type: 'hello',
copayerId: key3.public.toString('hex') //MITM pubkey 3 copayerId: cid3 // MITM
}; };
var messagestr = JSON.stringify(message);
var messagebuf = new Buffer(messagestr); var enc = n.encode(cid2, message);
var encoded = n._encode(key2.public, key1, messagebuf);
var encodedstr = JSON.stringify(encoded);
var encodeduint = new Buffer(encodedstr);
var isInbound = true;
var peerId = new bitcore.SIN(key1.public);
n._deletePeer = sinon.spy(); n._deletePeer = sinon.spy();
n._onData(encodeduint, isInbound, peerId); n._onMessage(enc);
n._deletePeer.calledOnce.should.equal(true); n._deletePeer.calledOnce.should.equal(true);
n._deletePeer.getCall(0).args[0].should.equal(peerId); n._deletePeer.getCall(0).args[0].should.equal(peerId);
n._deletePeer.getCall(0).args[1].should.equal('incorrect pubkey for peerId'); n._deletePeer.getCall(0).args[1].should.equal('incorrect pubkey for peerId');
@ -200,7 +191,7 @@ describe('Network / Async', function() {
n._deletePeer = sinon.spy(); n._deletePeer = sinon.spy();
n._onData(encodeduint, isInbound, peerId); n._onMessage(encodeduint, isInbound, peerId);
n._deletePeer.calledOnce.should.equal(false); n._deletePeer.calledOnce.should.equal(false);
n.getHexNonces()[(new bitcore.SIN(key1.public)).toString()].toString('hex').should.equal('0000000000000001'); n.getHexNonces()[(new bitcore.SIN(key1.public)).toString()].toString('hex').should.equal('0000000000000001');
}); });
@ -231,7 +222,7 @@ describe('Network / Async', function() {
n._deletePeer = sinon.spy(); n._deletePeer = sinon.spy();
n._onData(encodeduint, isInbound, peerId); n._onMessage(encodeduint, isInbound, peerId);
n._deletePeer.calledOnce.should.equal(false); n._deletePeer.calledOnce.should.equal(false);
}); });
@ -261,7 +252,7 @@ describe('Network / Async', function() {
n._deletePeer = sinon.spy(); n._deletePeer = sinon.spy();
n._onData(encodeduint, isInbound, peerId); n._onMessage(encodeduint, isInbound, peerId);
n._deletePeer.calledOnce.should.equal(false); n._deletePeer.calledOnce.should.equal(false);
}); });
@ -291,7 +282,7 @@ describe('Network / Async', function() {
n._deletePeer = sinon.spy(); n._deletePeer = sinon.spy();
n._onData(encodeduint, isInbound, peerId); n._onMessage(encodeduint, isInbound, peerId);
n._deletePeer.calledOnce.should.equal(true); n._deletePeer.calledOnce.should.equal(true);
}); });
@ -321,7 +312,7 @@ describe('Network / Async', function() {
n._deletePeer = sinon.spy(); n._deletePeer = sinon.spy();
n._onData(encodeduint, isInbound, peerId); n._onMessage(encodeduint, isInbound, peerId);
n._deletePeer.calledOnce.should.equal(true); n._deletePeer.calledOnce.should.equal(true);
}); });