BTCPrivate
/
bitcore-wallet-service
mirror of https://github.com/BTCPrivate/bitcore-wallet-service.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #320 from isocolsky/fix/newer_txps 

Disallow signing newer txs from legacy clients
This commit is contained in:
Gustavo Maximiliano Cortez 2015-08-11 16:20:19 -03:00
parent a93e5afd05 af9dd5b3fe
commit 48bfa24859
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/server.js
View File

@ -1202,6 +1202,12 @@ WalletService.prototype.signTx = function(opts, cb) {
}, function(err, txp) {
if (err) return cb(err);
if (!self.clientVersion || /^bw.-0\.0\./.test(self.clientVersion)) {
if (!_.startsWith(txp.version, '1.')) {
return cb(new ClientError(Errors.codes.UPGRADE_NEEDED, 'This spend proposal was created using a newer version of the client app'));
}
}
var action = _.find(txp.actions, {
copayerId: self.copayerId
});
@ -1366,14 +1372,6 @@ WalletService.prototype.getPendingTxs = function(opts, cb) {
self.storage.fetchPendingTxs(self.walletId, function(err, txps) {
if (err) return cb(err);
if (!self.clientVersion || /^bw.-0\.0\./.test(self.clientVersion)) {
var allLegacy = _.all(txps, function(txp) {
return _.startsWith(txp.version, '1.');
});
if (!allLegacy) return cb(new ClientError(Errors.codes.UPGRADE_NEEDED, 'Some spend proposals were created using a newer version of the client app'));
}
_.each(txps, function(txp) {
txp.deleteLockTime = self.getRemainingDeleteLockTime(txp);
});

36
test/integration/server.js
View File

@ -4286,7 +4286,8 @@ describe('Wallet service', function() {
});
});
});
it('should return error when fetching new txps from legacy (bwc-0.0.*) client', function(done) {
it('should not return error when fetching new txps from legacy (bwc-0.0.*) client', function(done) {
helpers.stubUtxos(server, wallet, [100, 200], function() {
var txOpts = helpers.createSimpleProposalOpts('18PzpUFkFZE8zKWUPvfykkTxmB9oMR8qP7', 80, 'some message', TestData.copayers[0].privKey_1H_0);
server.createTx(txOpts, function(err, tx) {
@ -4301,12 +4302,41 @@ describe('Wallet service', function() {
signature: 'dummy',
clientVersion: 'bwc-0.0.40',
}, function(err, server) {
verifyStub.restore();
should.not.exist(err);
should.exist(server);
verifyStub.restore();
server.getPendingTxs({}, function(err, txps) {
should.not.exist(err);
should.exist(txps);
done();
});
});
});
});
});
it('should fail to sign tx from legacy (bwc-0.0.*) client', function(done) {
helpers.stubUtxos(server, wallet, [100, 200], function() {
var txOpts = helpers.createSimpleProposalOpts('18PzpUFkFZE8zKWUPvfykkTxmB9oMR8qP7', 80, 'some message', TestData.copayers[0].privKey_1H_0);
server.createTx(txOpts, function(err, tx) {
should.not.exist(err);
should.exist(tx);
_.startsWith(tx.version, '1.').should.be.false;
var verifyStub = sinon.stub(WalletService.prototype, '_verifySignature');
verifyStub.returns(true);
WalletService.getInstanceWithAuth({
copayerId: wallet.copayers[0].id,
message: 'dummy',
signature: 'dummy',
clientVersion: 'bwc-0.0.40',
}, function(err, server) {
var signatures = helpers.clientSign(tx, TestData.copayers[0].xPrivKey);
server.signTx({
txProposalId: tx.id,
signatures: signatures,
}, function(err) {
verifyStub.restore();
should.exist(err);
should.not.exist(txps);
err.code.should.equal('UPGRADE_NEEDED');
err.message.should.contain('newer version');
done();