From f919b77a5cc1d737804770690f1e3147bac1e013 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 11 Oct 2017 13:56:13 +0200 Subject: [PATCH] #6707 --- .../components/SignRequest/signRequest.css | 8 +-- .../components/SignRequest/signRequest.js | 70 ++++++++++++------- .../SignRequest/signRequest.spec.js | 24 ++++++- 3 files changed, 73 insertions(+), 29 deletions(-) diff --git a/js/src/views/Signer/components/SignRequest/signRequest.css b/js/src/views/Signer/components/SignRequest/signRequest.css index a8b3ddd6d1d..150f8033f7b 100644 --- a/js/src/views/Signer/components/SignRequest/signRequest.css +++ b/js/src/views/Signer/components/SignRequest/signRequest.css @@ -28,12 +28,12 @@ } .signData { + background: rgba(255,255,255, 0.25); border: 0.25em solid red; - margin-left: 2em; - padding: 0.5em; + font-size: 0.75em; + padding: 0.5rem; overflow: auto; - max-height: 6em; - max-width: calc(100% - 2em); + max-height: 10em; } .signData > p { diff --git a/js/src/views/Signer/components/SignRequest/signRequest.js b/js/src/views/Signer/components/SignRequest/signRequest.js index 705b89965fa..34c19bcf4bd 100644 --- a/js/src/views/Signer/components/SignRequest/signRequest.js +++ b/js/src/views/Signer/components/SignRequest/signRequest.js @@ -18,7 +18,9 @@ import { observer } from 'mobx-react'; import React, { Component, PropTypes } from 'react'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; +import ReactMarkdown from 'react-markdown'; +import { hexToAscii } from '~/api/util/format'; import HardwareStore from '~/mobx/hardwareStore'; import Account from '../Account'; @@ -28,16 +30,39 @@ import RequestOrigin from '../RequestOrigin'; import styles from './signRequest.css'; function isAscii (data) { - for (var i = 2; i < data.length; i += 2) { + for (let i = 2; i < data.length; i += 2) { let n = parseInt(data.substr(i, 2), 16); if (n < 32 || n >= 128) { return false; } } + return true; } +function decodeMarkdown (data) { + return decodeURIComponent(escape(hexToAscii(data))); +} + +export function isMarkdown (data) { + try { + const decoded = decodeMarkdown(data); + + for (let i = 0; i < decoded.length; i++) { + const code = decoded.charCodeAt(i); + + if (code < 32 && code !== 10) { + return false; + } + } + + return decoded.indexOf('#') !== -1 || decoded.indexOf('*') !== -1; + } catch (error) { + return false; + } +} + @observer class SignRequest extends Component { static contextTypes = { @@ -89,29 +114,26 @@ class SignRequest extends Component { ); } - renderAsciiDetails (ascii) { - return ( -
-

{ascii}

-
- ); - } + renderData (data) { + if (isAscii(data)) { + return hexToAscii(data); + } + + if (isMarkdown(data)) { + return ( + + ); + } - renderBinaryDetails (data) { return ( -
-

- -

-
+ ); } renderDetails () { - const { api } = this.context; const { address, data, netVersion, origin, signerStore } = this.props; const { balances, externalLink } = signerStore; @@ -121,6 +143,8 @@ class SignRequest extends Component { return
; } + const hashToSign = this.context.api.util.sha3(data); + return (
@@ -133,18 +157,16 @@ class SignRequest extends Component { />
-
+

- { - isAscii(data) - ? this.renderAsciiDetails(api.util.hexToAscii(data)) - : this.renderBinaryDetails(data) - } +
+

{ this.renderData(data) }

+

{ it('renders', () => { expect(component).to.be.ok; }); + + describe.only('isMarkdown', () => { + it('returns true for markdown', () => { + const testMd = '# this is some\n\n*markdown*'; + const encodedMd = asciiToHex(unescape(encodeURIComponent(testMd))); + + expect(isMarkdown(encodedMd)).to.be.true; + }); + + it('return true with utf-8 markdown', () => { + const testMd = '# header\n\n(n) you are not a citizen of, or resident in, or located in, or incorporated or otherwise established in, the People\'s Republic of China 参与方并非中华人民共和国公民,或不常住中华人民共和国,或不位于中华人民共和国境内,或并非在中华人民共和国设立或以其他方式组建; and'; + const encodedMd = asciiToHex(unescape(encodeURIComponent(testMd))); + + expect(isMarkdown(encodedMd)).to.be.true; + }); + + it('returns false for randow data', () => { + expect(isMarkdown('0x1234')).to.be.false; + }); + }); });