From bbf29df6965a5d479386e27690d189f6a9cadd4f Mon Sep 17 00:00:00 2001 From: Tarmo Date: Sat, 19 Sep 2020 20:36:37 +0300 Subject: [PATCH 01/18] request to sign message --- public/views/correspondentDevice.html | 5 +++++ src/js/controllers/correspondentDevice.js | 7 +++++++ src/js/services/correspondentListService.js | 10 +++------- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/public/views/correspondentDevice.html b/public/views/correspondentDevice.html index 33964dd95..4d87bc2ac 100644 --- a/public/views/correspondentDevice.html +++ b/public/views/correspondentDevice.html @@ -410,6 +410,11 @@

) +
  • + + Request to sign message + +
  • diff --git a/src/js/controllers/correspondentDevice.js b/src/js/controllers/correspondentDevice.js index 61478fcfe..cd5a896a8 100644 --- a/src/js/controllers/correspondentDevice.js +++ b/src/js/controllers/correspondentDevice.js @@ -138,6 +138,13 @@ angular.module('copayApp.controllers').controller('correspondentDeviceController // issueNextAddressIfNecessary(showRequestPaymentModal); }; + $scope.requestToSignMessage = function(message){ + if (!message || !String(message).trim()) + return $rootScope.$emit('Local/ShowErrorAlert', "Enter a text message first"); + chatScope.message = '[...](sign-message-request:'+ message.trim() +')'; + chatScope.send(); + }; + $scope.sendPayment = function(address, amount, asset, device_address, base64data, from_address, single_address){ console.log("will send payment to "+address); if (asset && $scope.index.arrBalances.filter(function(balance){ return (balance.asset === asset); }).length === 0){ diff --git a/src/js/services/correspondentListService.js b/src/js/services/correspondentListService.js index 55f0eeecf..0620664b1 100644 --- a/src/js/services/correspondentListService.js +++ b/src/js/services/correspondentListService.js @@ -226,14 +226,12 @@ angular.module('copayApp.services').factory('correspondentListService', function return '[invalid signed message]'; var objSignedMessage = info.objSignedMessage; var displayed_signed_message = (typeof objSignedMessage.signed_message === 'string') ? objSignedMessage.signed_message : JSON.stringify(objSignedMessage.signed_message, null, '\t'); - var text = 'Message signed by '+objSignedMessage.authors[0].address+': '+escapeHtml(displayed_signed_message); + var text = 'Message signed by '+objSignedMessage.authors[0].address+': '+escapeHtmlAndInsertBr(displayed_signed_message); if (info.bValid) text += " (valid)"; else if (info.bValid === false) text += " (invalid)"; - else - text += ' (verify)'; - return toDelayedReplacement('['+text+']'); + return toDelayedReplacement('['+text+']'); }).replace(url_regexp, function(str){ param_index++; params[param_index] = str; @@ -457,9 +455,7 @@ angular.module('copayApp.services').factory('correspondentListService', function text += " (valid)"; else if (info.bValid === false) text += " (invalid)"; - else - text += ' (verify)'; - return toDelayedReplacement('['+text+']'); + return toDelayedReplacement('['+text+']'); }).replace(url_regexp, function(str){ param_index++; params[param_index] = str; From 957f45277029144c8f1f395c07d891a4023d7196 Mon Sep 17 00:00:00 2001 From: Tarmo Date: Sat, 19 Sep 2020 20:55:44 +0300 Subject: [PATCH 02/18] string --- src/js/controllers/correspondentDevice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/controllers/correspondentDevice.js b/src/js/controllers/correspondentDevice.js index cd5a896a8..6bdf84c4a 100644 --- a/src/js/controllers/correspondentDevice.js +++ b/src/js/controllers/correspondentDevice.js @@ -141,7 +141,7 @@ angular.module('copayApp.controllers').controller('correspondentDeviceController $scope.requestToSignMessage = function(message){ if (!message || !String(message).trim()) return $rootScope.$emit('Local/ShowErrorAlert', "Enter a text message first"); - chatScope.message = '[...](sign-message-request:'+ message.trim() +')'; + chatScope.message = '[...](sign-message-request:'+ String(message).trim() +')'; chatScope.send(); }; From e9439d2ecf29265d74f3da1ed024bd33d3576139 Mon Sep 17 00:00:00 2001 From: Tarmo Date: Sat, 19 Sep 2020 23:10:50 +0300 Subject: [PATCH 03/18] clear --- public/views/correspondentDevice.html | 1 + 1 file changed, 1 insertion(+) diff --git a/public/views/correspondentDevice.html b/public/views/correspondentDevice.html index 4d87bc2ac..a9c168d91 100644 --- a/public/views/correspondentDevice.html +++ b/public/views/correspondentDevice.html @@ -410,6 +410,7 @@

    )

    • +
  • Request to sign message From e921ed449c08bd8b5abf3d4350f5a7e011f88823 Mon Sep 17 00:00:00 2001 From: Tarmo Date: Sun, 20 Sep 2020 05:37:57 +0300 Subject: [PATCH 04/18] better UX --- public/views/modals/sign-message.html | 10 ++++++++-- public/views/modals/signed-message.html | 8 +++++++- src/js/controllers/correspondentDevice.js | 12 ++++++++++-- src/js/controllers/preferencesInformation.js | 10 +++++++++- src/js/services/correspondentListService.js | 9 ++++----- 5 files changed, 38 insertions(+), 11 deletions(-) diff --git a/public/views/modals/sign-message.html b/public/views/modals/sign-message.html index 61cb35813..3384081c0 100644 --- a/public/views/modals/sign-message.html +++ b/public/views/modals/sign-message.html @@ -15,11 +15,17 @@

    Message:

    -
    +
    + +
      +
    • + {{key}}:
      +
      • +

    Signing address:

    -
    +
    {{address}}
    diff --git a/public/views/modals/signed-message.html b/public/views/modals/signed-message.html index c06eceac8..a84fbb176 100644 --- a/public/views/modals/signed-message.html +++ b/public/views/modals/signed-message.html @@ -15,7 +15,13 @@

    Message:

    -
    +
    + +
      +
    • + {{key}}:
      +
      • +

    Signing address:

    diff --git a/src/js/controllers/correspondentDevice.js b/src/js/controllers/correspondentDevice.js index 6bdf84c4a..9e56139b0 100644 --- a/src/js/controllers/correspondentDevice.js +++ b/src/js/controllers/correspondentDevice.js @@ -89,6 +89,14 @@ angular.module('copayApp.controllers').controller('correspondentDeviceController removeNewMessagesDelim(); }); + $scope.isString = function(variable) { + return typeof variable === 'string'; + }; + + $scope.escapeHtmlAndInsertBr = function(variable) { + return correspondentListService.escapeHtmlAndInsertBr($scope.isString(variable) ? variable : JSON.stringify(variable, null, '\t')); + }; + $scope.send = function() { $scope.error = null; if (!$scope.message) @@ -1025,7 +1033,7 @@ angular.module('copayApp.controllers').controller('correspondentDeviceController var ModalInstanceCtrl = function($scope, $modalInstance) { $scope.color = fc.backgroundColor; $scope.bDisabled = true; - $scope.message_to_sign = correspondentListService.escapeHtmlAndInsertBr(object_to_sign ? JSON.stringify(object_to_sign, null, '\t') : message_to_sign); + $scope.message_to_sign = object_to_sign ? object_to_sign : message_to_sign; readMyPaymentAddress(fc, function(address){ $scope.address = address; var arrAddreses = (object_to_sign ? json : message_to_sign).match(/\b[2-7A-Z]{32}\b/g) || []; @@ -1116,7 +1124,7 @@ angular.module('copayApp.controllers').controller('correspondentDeviceController var ModalInstanceCtrl = function($scope, $modalInstance) { $scope.color = fc.backgroundColor; - $scope.signed_message = correspondentListService.escapeHtmlAndInsertBr(typeof objSignedMessage.signed_message === 'string' ? objSignedMessage.signed_message : JSON.stringify(objSignedMessage.signed_message, null, '\t')); + $scope.signed_message = objSignedMessage.signed_message; $scope.address = objSignedMessage.authors[0].address; $scope.signature = signedMessageBase64; var validation = require('ocore/validation.js'); diff --git a/src/js/controllers/preferencesInformation.js b/src/js/controllers/preferencesInformation.js index 0bd14f725..5ec14a2d1 100644 --- a/src/js/controllers/preferencesInformation.js +++ b/src/js/controllers/preferencesInformation.js @@ -83,7 +83,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation', var ModalInstanceCtrl = function($scope, $modalInstance) { $scope.color = fc.backgroundColor; - $scope.signed_message = correspondentListService.escapeHtmlAndInsertBr(typeof objSignedMessage.signed_message === 'string' ? objSignedMessage.signed_message : JSON.stringify(objSignedMessage.signed_message, null, '\t')); + $scope.signed_message = objSignedMessage.signed_message; $scope.address = objSignedMessage.authors[0].address; $scope.signature = signedMessageBase64; var validation = require('ocore/validation.js'); @@ -126,6 +126,14 @@ angular.module('copayApp.controllers').controller('preferencesInformation', }; // verifySignedMessage + $scope.isString = function(variable) { + return typeof variable === 'string'; + }; + + $scope.escapeHtmlAndInsertBr = function(variable) { + return correspondentListService.escapeHtmlAndInsertBr($scope.isString(variable) ? variable : JSON.stringify(variable, null, '\t')); + }; + $scope.hasListOfBalances = function() { return !!Object.keys($scope.assocListOfBalances || {}).length; }; diff --git a/src/js/services/correspondentListService.js b/src/js/services/correspondentListService.js index 0620664b1..ff4936f48 100644 --- a/src/js/services/correspondentListService.js +++ b/src/js/services/correspondentListService.js @@ -225,8 +225,7 @@ angular.module('copayApp.services').factory('correspondentListService', function if (!info) return '[invalid signed message]'; var objSignedMessage = info.objSignedMessage; - var displayed_signed_message = (typeof objSignedMessage.signed_message === 'string') ? objSignedMessage.signed_message : JSON.stringify(objSignedMessage.signed_message, null, '\t'); - var text = 'Message signed by '+objSignedMessage.authors[0].address+': '+escapeHtmlAndInsertBr(displayed_signed_message); + var text = 'Message signed by '+objSignedMessage.authors[0].address; if (info.bValid) text += " (valid)"; else if (info.bValid === false) @@ -379,7 +378,8 @@ angular.module('copayApp.services').factory('correspondentListService', function catch(e){ return str; // it is already escapeHtml'd } - return escapeHtml(JSON.stringify(obj, null, '\t')); + //return escapeHtml(JSON.stringify(obj, null, '\t')); + return escapeHtml(JSON.stringify(obj)); } function getPaymentsByAsset(objMultiPaymentRequest){ @@ -449,8 +449,7 @@ angular.module('copayApp.services').factory('correspondentListService', function if (!info) return '[invalid signed message]'; var objSignedMessage = info.objSignedMessage; - var displayed_signed_message = (typeof objSignedMessage.signed_message === 'string') ? objSignedMessage.signed_message : JSON.stringify(objSignedMessage.signed_message, null, '\t'); - var text = 'Message signed by '+objSignedMessage.authors[0].address+': '+escapeHtmlAndInsertBr(displayed_signed_message); + var text = 'Message signed by '+objSignedMessage.authors[0].address; if (info.bValid) text += " (valid)"; else if (info.bValid === false) From 5df0df49044840580a36647e78a5b9dd44d38086 Mon Sep 17 00:00:00 2001 From: Tarmo Date: Mon, 21 Sep 2020 17:51:07 +0300 Subject: [PATCH 05/18] clearer name --- public/views/modals/sign-message.html | 4 ++-- public/views/modals/signed-message.html | 4 ++-- src/js/controllers/correspondentDevice.js | 2 +- src/js/controllers/preferencesInformation.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/views/modals/sign-message.html b/public/views/modals/sign-message.html index 3384081c0..2aea32bb6 100644 --- a/public/views/modals/sign-message.html +++ b/public/views/modals/sign-message.html @@ -16,10 +16,10 @@

    Message:

    - +
    • - {{key}}:
      + {{key}}:
    diff --git a/public/views/modals/signed-message.html b/public/views/modals/signed-message.html index a84fbb176..bb36a4434 100644 --- a/public/views/modals/signed-message.html +++ b/public/views/modals/signed-message.html @@ -16,10 +16,10 @@

    Message:

    - +
    • - {{key}}:
      + {{key}}:
    diff --git a/src/js/controllers/correspondentDevice.js b/src/js/controllers/correspondentDevice.js index 9e56139b0..c2629be92 100644 --- a/src/js/controllers/correspondentDevice.js +++ b/src/js/controllers/correspondentDevice.js @@ -93,7 +93,7 @@ angular.module('copayApp.controllers').controller('correspondentDeviceController return typeof variable === 'string'; }; - $scope.escapeHtmlAndInsertBr = function(variable) { + $scope.escapeJSONAndInsertBr = function(variable) { return correspondentListService.escapeHtmlAndInsertBr($scope.isString(variable) ? variable : JSON.stringify(variable, null, '\t')); }; diff --git a/src/js/controllers/preferencesInformation.js b/src/js/controllers/preferencesInformation.js index 5ec14a2d1..0d237821c 100644 --- a/src/js/controllers/preferencesInformation.js +++ b/src/js/controllers/preferencesInformation.js @@ -130,7 +130,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation', return typeof variable === 'string'; }; - $scope.escapeHtmlAndInsertBr = function(variable) { + $scope.escapeJSONAndInsertBr = function(variable) { return correspondentListService.escapeHtmlAndInsertBr($scope.isString(variable) ? variable : JSON.stringify(variable, null, '\t')); }; From 0e8a70c8d70a8aa8adaabd1038ae437f8a6c64d0 Mon Sep 17 00:00:00 2001 From: Tarmo Date: Mon, 21 Sep 2020 18:43:19 +0300 Subject: [PATCH 06/18] pretty print without dynamic --- public/views/modals/sign-message.html | 4 ++-- public/views/modals/signed-message.html | 4 ++-- src/js/controllers/correspondentDevice.js | 4 ++-- src/js/controllers/preferencesInformation.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/public/views/modals/sign-message.html b/public/views/modals/sign-message.html index 2aea32bb6..f55321383 100644 --- a/public/views/modals/sign-message.html +++ b/public/views/modals/sign-message.html @@ -16,10 +16,10 @@

    Message:

    - + {{prettyPrint(message_to_sign)}}
    • - {{key}}:
      + {{key}}: {{prettyPrint(value)}}
    diff --git a/public/views/modals/signed-message.html b/public/views/modals/signed-message.html index bb36a4434..3c33bfad5 100644 --- a/public/views/modals/signed-message.html +++ b/public/views/modals/signed-message.html @@ -16,10 +16,10 @@

    Message:

    - + {{prettyPrint(signed_message)}}
    • - {{key}}:
      + {{key}}: {{prettyPrint(value)}}
    diff --git a/src/js/controllers/correspondentDevice.js b/src/js/controllers/correspondentDevice.js index c2629be92..2abdd3cc1 100644 --- a/src/js/controllers/correspondentDevice.js +++ b/src/js/controllers/correspondentDevice.js @@ -93,8 +93,8 @@ angular.module('copayApp.controllers').controller('correspondentDeviceController return typeof variable === 'string'; }; - $scope.escapeJSONAndInsertBr = function(variable) { - return correspondentListService.escapeHtmlAndInsertBr($scope.isString(variable) ? variable : JSON.stringify(variable, null, '\t')); + $scope.prettyPrint = function(variable) { + return $scope.isString(variable) ? variable : JSON.stringify(variable, null, '\t'); }; $scope.send = function() { diff --git a/src/js/controllers/preferencesInformation.js b/src/js/controllers/preferencesInformation.js index 0d237821c..f48a7a546 100644 --- a/src/js/controllers/preferencesInformation.js +++ b/src/js/controllers/preferencesInformation.js @@ -130,8 +130,8 @@ angular.module('copayApp.controllers').controller('preferencesInformation', return typeof variable === 'string'; }; - $scope.escapeJSONAndInsertBr = function(variable) { - return correspondentListService.escapeHtmlAndInsertBr($scope.isString(variable) ? variable : JSON.stringify(variable, null, '\t')); + $scope.prettyPrint = function(variable) { + return $scope.isString(variable) ? variable : JSON.stringify(variable, null, '\t'); }; $scope.hasListOfBalances = function() { From 7bcfd4f0638b2133383b5a9c0ba9ced985bb678f Mon Sep 17 00:00:00 2001 From: Tarmo Date: Mon, 21 Sep 2020 19:17:49 +0300 Subject: [PATCH 07/18] fix --- src/js/controllers/correspondentDevice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/controllers/correspondentDevice.js b/src/js/controllers/correspondentDevice.js index 2abdd3cc1..4270fe10a 100644 --- a/src/js/controllers/correspondentDevice.js +++ b/src/js/controllers/correspondentDevice.js @@ -149,7 +149,7 @@ angular.module('copayApp.controllers').controller('correspondentDeviceController $scope.requestToSignMessage = function(message){ if (!message || !String(message).trim()) return $rootScope.$emit('Local/ShowErrorAlert', "Enter a text message first"); - chatScope.message = '[...](sign-message-request:'+ String(message).trim() +')'; + chatScope.message = '[...](sign-message-request:'+ String(message).replace(/\n/g, ' ').trim() +')'; chatScope.send(); }; From f6daac81c584337aee5d8e6b0eec5437429c2f29 Mon Sep 17 00:00:00 2001 From: Tarmo Date: Mon, 21 Sep 2020 19:51:16 +0300 Subject: [PATCH 08/18] sign objects --- src/js/controllers/correspondentDevice.js | 15 ++++++++++++--- src/js/services/correspondentListService.js | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/js/controllers/correspondentDevice.js b/src/js/controllers/correspondentDevice.js index 4270fe10a..63a079ef0 100644 --- a/src/js/controllers/correspondentDevice.js +++ b/src/js/controllers/correspondentDevice.js @@ -146,10 +146,19 @@ angular.module('copayApp.controllers').controller('correspondentDeviceController // issueNextAddressIfNecessary(showRequestPaymentModal); }; - $scope.requestToSignMessage = function(message){ - if (!message || !String(message).trim()) + $scope.requestToSignMessage = function(message_to_sign){ + if (!message_to_sign || !String(message_to_sign).trim()) return $rootScope.$emit('Local/ShowErrorAlert', "Enter a text message first"); - chatScope.message = '[...](sign-message-request:'+ String(message).replace(/\n/g, ' ').trim() +')'; + try{ + var object_to_sign = JSON.parse(message_to_sign); + if (typeof object_to_sign !== 'object') throw Error("not object"); + message_to_sign = Buffer.from(JSON.stringify(object_to_sign), 'utf8').toString('base64'); + console.log("signing object", object_to_sign); + } + catch(e){ + console.log("signing a string"); + } + chatScope.message = '[message](sign-message-request:'+ String(message_to_sign).replace(/\n/g, ' ').trim() +')'; chatScope.send(); }; diff --git a/src/js/services/correspondentListService.js b/src/js/services/correspondentListService.js index ff4936f48..5b436ea55 100644 --- a/src/js/services/correspondentListService.js +++ b/src/js/services/correspondentListService.js @@ -443,7 +443,7 @@ angular.module('copayApp.services').factory('correspondentListService', function }).replace(/\[(.+?)\]\(profile-request:([\w,]+?)\)/g, function(str, description, fields_list){ return toDelayedReplacement('[Request for profile fields '+fields_list+']'); }).replace(/\[(.+?)\]\(sign-message-request:(.+?)\)/g, function(str, description, message_to_sign){ - return toDelayedReplacement('[Request to sign message: '+message_to_sign+']'); + return toDelayedReplacement('[Request to sign message: '+tryParseBase64(message_to_sign)+']'); }).replace(/\[(.+?)\]\(signed-message:([\w\/+=]+?)\)/g, function(str, description, signedMessageBase64){ var info = getSignedMessageInfoFromJsonBase64(signedMessageBase64); if (!info) From faa4826df10b2fa68f57020e49ce2c03d4f68013 Mon Sep 17 00:00:00 2001 From: Tarmo Date: Mon, 21 Sep 2020 19:57:10 +0300 Subject: [PATCH 09/18] better explanation --- src/js/controllers/correspondentDevice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/controllers/correspondentDevice.js b/src/js/controllers/correspondentDevice.js index 63a079ef0..6a2ea17cb 100644 --- a/src/js/controllers/correspondentDevice.js +++ b/src/js/controllers/correspondentDevice.js @@ -151,7 +151,7 @@ angular.module('copayApp.controllers').controller('correspondentDeviceController return $rootScope.$emit('Local/ShowErrorAlert', "Enter a text message first"); try{ var object_to_sign = JSON.parse(message_to_sign); - if (typeof object_to_sign !== 'object') throw Error("not object"); + if (typeof object_to_sign !== 'object') throw Error("value is number or boolean"); message_to_sign = Buffer.from(JSON.stringify(object_to_sign), 'utf8').toString('base64'); console.log("signing object", object_to_sign); } From 048aeffcce74f354973f41bf2c9e893bbb534bf8 Mon Sep 17 00:00:00 2001 From: Tarmo Date: Mon, 21 Sep 2020 20:55:29 +0300 Subject: [PATCH 10/18] not needed --- public/views/modals/sign-message.html | 2 +- public/views/modals/signed-message.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/views/modals/sign-message.html b/public/views/modals/sign-message.html index f55321383..42737e36c 100644 --- a/public/views/modals/sign-message.html +++ b/public/views/modals/sign-message.html @@ -16,7 +16,7 @@

    Message:

    - {{prettyPrint(message_to_sign)}} + {{message_to_sign}}