From a2edd657966182ceaeba3012f1e5a2ebab1289a0 Mon Sep 17 00:00:00 2001 From: Oliver Beddows Date: Mon, 8 May 2017 15:12:23 +0200 Subject: [PATCH 1/4] Updating lisk-js --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index 5364dfc7c..d0a0fb576 100644 --- a/src/package.json +++ b/src/package.json @@ -26,7 +26,7 @@ "bitcore-mnemonic": "=1.1.1", "debug": "=2.2.0", "jquery": "=2.2.4", - "lisk-js": "=0.4.0", + "lisk-js": "=0.4.1", "lodash": "=4.16.4", "moment": "=2.15.1", "ng-infinite-scroll": "=1.3.0", From b958f72aae162f3ec10afd7b873b418ff3eece04 Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Mon, 8 May 2017 16:19:34 +0200 Subject: [PATCH 2/4] Update sign-message test to lisk-js 0.4.1 --- src/test/components/sign-verify/sign-message.spec.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/components/sign-verify/sign-message.spec.js b/src/test/components/sign-verify/sign-message.spec.js index 8427fac32..7ec2aaad9 100644 --- a/src/test/components/sign-verify/sign-message.spec.js +++ b/src/test/components/sign-verify/sign-message.spec.js @@ -35,9 +35,11 @@ describe('Sign message component', () => { const message = 'Hello world'; const result = '-----BEGIN LISK SIGNED MESSAGE-----\n' + + '-----MESSAGE-----\n' + 'Hello world\n' + - '-----BEGIN SIGNATURE-----\n' + + '-----PUBLIC KEY-----\n' + '9d3058175acab969f41ad9b86f7a2926c74258670fe56b37c429c01fca9f2f0f\n' + + '-----SIGNATURE-----\n' + 'dd01775ec30225b24a74ee2ff9578ed3515371ddf32ba50540dc79a5dab66252081d0a345be3ad5d' + 'fcb939f018d3dd911d9eacfe8998784879cc37fdfde1200448656c6c6f20776f726c64\n' + '-----END LISK SIGNED MESSAGE-----'; From d0b362eaaa6c542383087608419425cc4f9a1708 Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Mon, 8 May 2017 16:20:27 +0200 Subject: [PATCH 3/4] Update verify-message to lisk-js 0.4.1 error messages --- src/app/components/sign-verify/verify-message.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/components/sign-verify/verify-message.js b/src/app/components/sign-verify/verify-message.js index 748df90f9..d7069413f 100644 --- a/src/app/components/sign-verify/verify-message.js +++ b/src/app/components/sign-verify/verify-message.js @@ -27,11 +27,12 @@ app.component('verifyMessage', { this.result = lisk.crypto.verifyMessageWithPublicKey( this.signature.value, this.publicKey.value); } catch (e) { - if (e.message.substring(0, 4) === 'nacl' && this.publicKey.value) { + if (e.message.indexOf('Invalid publicKey') !== -1 && this.publicKey.value) { this.publicKey.error.invalid = true; - } else if (e.message.indexOf('length') !== -1 && this.signature.value) { + } else if (e.message.indexOf('Invalid signature') !== -1 && this.signature.value) { this.signature.error.invalid = true; } + this.result = ''; } } }, From 1edd820ca57d1366ac51bb1bdbd099c7e9969c2e Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Mon, 8 May 2017 16:21:00 +0200 Subject: [PATCH 4/4] Temporary fix for verifyMessageWithPublicKey Once verifyMessageWithPublicKey in lisk-js is updated to "throw" errors instead of "return"-ing then, this commit can be reverted --- src/app/components/sign-verify/verify-message.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/components/sign-verify/verify-message.js b/src/app/components/sign-verify/verify-message.js index d7069413f..da217bd86 100644 --- a/src/app/components/sign-verify/verify-message.js +++ b/src/app/components/sign-verify/verify-message.js @@ -26,6 +26,9 @@ app.component('verifyMessage', { try { this.result = lisk.crypto.verifyMessageWithPublicKey( this.signature.value, this.publicKey.value); + if (this.result && this.result.message) { + throw this.result; + } } catch (e) { if (e.message.indexOf('Invalid publicKey') !== -1 && this.publicKey.value) { this.publicKey.error.invalid = true;