From af3cb84ff9229f85a8ea4a8c9c71511912ea0947 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 24 May 2017 18:06:58 +0200 Subject: Add isSignatureValid method and tests for it --- test/0x.js.ts | 50 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/0x.js.ts b/test/0x.js.ts index 65475bf32..7216ed34f 100644 --- a/test/0x.js.ts +++ b/test/0x.js.ts @@ -3,10 +3,52 @@ import {expect} from 'chai'; import 'mocha'; describe('ZeroEx library', () => { - describe('#verifySignature', () => { - it('should return undefined', () => { - const zeroEx = new ZeroEx(); - expect(zeroEx.verifySignature()).to.be.undefined; + describe('#isValidSignature', () => { + const data = '0xdeadbeaf'; + const signature = { + v: 27, + r: '0xa3f20717a250c2b0b729b7e5becbff67fdaef7e0699da4de7ca5895b02a170a1', + s: '0x2d887fd3b17bfdce3481f10bea41f45ba9f709d39ce8325427b57afcfc994cee', + }; + const address = '0x9b2055d370f73ec7d8a03e965129118dc8f5bf83'; + describe('should return false for malformed signature', () => { + it('malformed v', () => { + const malformedSignature = { + v: 34, + r: signature.r, + s: signature.s, + }; + const isValid = ZeroEx.isValidSignature(data, malformedSignature, address); + expect(isValid).to.be.false; + }); + it('malformed r', () => { + const malformedSignature = { + v: signature.v, + r: signature.r.replace('0x', ''), + s: signature.s, + }; + const isValid = ZeroEx.isValidSignature(data, malformedSignature, address); + expect(isValid).to.be.false; + }); + }); + describe('should return false for invalid signature', () => { + it('wrong data', () => { + const isValid = ZeroEx.isValidSignature('wrong data', signature, address); + expect(isValid).to.be.false; + }); + it('wrong signer', () => { + const isValid = ZeroEx.isValidSignature(data, signature, '0xIamWrong'); + expect(isValid).to.be.false; + }); + it('wrong signature', () => { + const wrongSignature = Object.assign({}, signature, {v: 28}); + const isValid = ZeroEx.isValidSignature(data, wrongSignature, address); + expect(isValid).to.be.false; + }); + }); + it('should return true for valid signature', () => { + const isValid = ZeroEx.isValidSignature(data, signature, address); + expect(isValid).to.be.true; }); }); }); -- cgit v1.2.3 From 7a566c6988d48cbfffb5a8946751ea0a644c5c6a Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 24 May 2017 18:50:14 +0200 Subject: Add test vector source --- test/0x.js.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'test') diff --git a/test/0x.js.ts b/test/0x.js.ts index 7216ed34f..9783e69b7 100644 --- a/test/0x.js.ts +++ b/test/0x.js.ts @@ -4,6 +4,7 @@ import 'mocha'; describe('ZeroEx library', () => { describe('#isValidSignature', () => { + // Source: https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_sign const data = '0xdeadbeaf'; const signature = { v: 27, -- cgit v1.2.3 From 522300c0ab05b6f8f4c2874b2d0a690196715165 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 24 May 2017 18:58:31 +0200 Subject: change tests descriptions --- test/0x.js.ts | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) (limited to 'test') diff --git a/test/0x.js.ts b/test/0x.js.ts index 9783e69b7..651407af3 100644 --- a/test/0x.js.ts +++ b/test/0x.js.ts @@ -22,31 +22,40 @@ describe('ZeroEx library', () => { const isValid = ZeroEx.isValidSignature(data, malformedSignature, address); expect(isValid).to.be.false; }); - it('malformed r', () => { + it('r lacks 0x prefix', () => { + const malformedR = signature.r.replace('0x', ''); const malformedSignature = { v: signature.v, - r: signature.r.replace('0x', ''), + r: malformedR, s: signature.s, }; const isValid = ZeroEx.isValidSignature(data, malformedSignature, address); expect(isValid).to.be.false; }); - }); - describe('should return false for invalid signature', () => { - it('wrong data', () => { - const isValid = ZeroEx.isValidSignature('wrong data', signature, address); - expect(isValid).to.be.false; - }); - it('wrong signer', () => { - const isValid = ZeroEx.isValidSignature(data, signature, '0xIamWrong'); - expect(isValid).to.be.false; - }); - it('wrong signature', () => { - const wrongSignature = Object.assign({}, signature, {v: 28}); - const isValid = ZeroEx.isValidSignature(data, wrongSignature, address); + it('r is too short', () => { + const malformedR = signature.r.substr(10); + const malformedSignature = { + v: signature.v, + r: malformedR, + s: signature.s, + }; + const isValid = ZeroEx.isValidSignature(data, malformedSignature, address); expect(isValid).to.be.false; }); }); + it('should return false if the data doesn\'t pertain to the signature & address', () => { + const isValid = ZeroEx.isValidSignature('wrong data', signature, address); + expect(isValid).to.be.false; + }); + it('should return false if the address doesn\'t pertain to the signature & data', () => { + const isValid = ZeroEx.isValidSignature(data, signature, '0xIamWrong'); + expect(isValid).to.be.false; + }); + it('should return false if the signature doesn\'t pertain to the data & address', () => { + const wrongSignature = Object.assign({}, signature, {v: 28}); + const isValid = ZeroEx.isValidSignature(data, wrongSignature, address); + expect(isValid).to.be.false; + }); it('should return true for valid signature', () => { const isValid = ZeroEx.isValidSignature(data, signature, address); expect(isValid).to.be.true; -- cgit v1.2.3 From 762db7961e3592faa277b60f25173a6a7874d5c4 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 24 May 2017 19:01:19 +0200 Subject: Add test for malformed s --- test/0x.js.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'test') diff --git a/test/0x.js.ts b/test/0x.js.ts index 651407af3..3d9a7a810 100644 --- a/test/0x.js.ts +++ b/test/0x.js.ts @@ -42,6 +42,16 @@ describe('ZeroEx library', () => { const isValid = ZeroEx.isValidSignature(data, malformedSignature, address); expect(isValid).to.be.false; }); + it('s is not hex', () => { + const malformedS = signature.s.replace('0', 'z'); + const malformedSignature = { + v: signature.v, + r: signature.r, + s: malformedS, + }; + const isValid = ZeroEx.isValidSignature(data, malformedSignature, address); + expect(isValid).to.be.false; + }); }); it('should return false if the data doesn\'t pertain to the signature & address', () => { const isValid = ZeroEx.isValidSignature('wrong data', signature, address); -- cgit v1.2.3 From 945a583e895dfd9488aecdfab1bec22449bf7878 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 24 May 2017 19:23:35 +0200 Subject: Address feedback --- test/0x.js.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/0x.js.ts b/test/0x.js.ts index 3d9a7a810..d59df8894 100644 --- a/test/0x.js.ts +++ b/test/0x.js.ts @@ -4,6 +4,7 @@ import 'mocha'; describe('ZeroEx library', () => { describe('#isValidSignature', () => { + // This test data was borrowed from the JSON RPC documentation // Source: https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_sign const data = '0xdeadbeaf'; const signature = { @@ -66,7 +67,7 @@ describe('ZeroEx library', () => { const isValid = ZeroEx.isValidSignature(data, wrongSignature, address); expect(isValid).to.be.false; }); - it('should return true for valid signature', () => { + it('should return true if the signature does pertain to the data & address', () => { const isValid = ZeroEx.isValidSignature(data, signature, address); expect(isValid).to.be.true; }); -- cgit v1.2.3