Merge pull request #987 from liquality/fix/eip-712-validation

bradleySuira · web-flow · commit e7eada569917 · 2023-01-25T20:21:44.000-05:00
fix: fixed permission sign screen for eip 712 and v1
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "liquality-wallet",
-  "version": "0.83.6",
+  "version": "0.83.7",
   "private": true,
   "author": "Liquality <info@liquality.io>",
   "scripts": {
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
@@ -24,7 +24,7 @@
             <h5 class="modal-title" v-else-if="hasSlot('title')">
               <slot name="title"></slot>
             </h5>
-            <ModalClose class="modal-close" @click="close" :id="closeId" />
+            <ModalClose class="modal-close" @click="close" :id="closeId" v-if="showClose" />
           </div>
           <div :class="bodyClass">
             <slot></slot>
@@ -68,6 +68,10 @@ export default {
     closeId: {
       type: String,
       required: false
+    },
+    showClose: {
+      type: Boolean,
+      default: true
     }
   },
   methods: {
diff --git a/src/locales/cb/common.json b/src/locales/cb/common.json
@@ -1,4 +1,6 @@
 {
+    "error": "Error",
+    "warning": "Warning",
     "cancel": "I-kansel",
     "create": "Paghimo",
     "type": "Type",
diff --git a/src/locales/cb/pages.json b/src/locales/cb/pages.json
@@ -221,7 +221,10 @@
     "myWallet": "Imohang Wallet",
     "signTransaction": "Pirmahi ang Transaksyon",
     "requestToSign": "Paghangyo sa Pagpirma",
-    "request": "Request"
+    "request": "Request",
+    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network %{network}",
+    "chainIdErrorRequestedChainId": "Requested chainId %{chainId}",
+    "chainIdErrorRequestedAsset": "Requested asset: %{asset}"
   },
   "send": {
     "sendTo": "Ipadala Sa",
diff --git a/src/locales/en/common.json b/src/locales/en/common.json
@@ -1,4 +1,6 @@
 {
+    "error": "Error",
+    "warning": "Warning",
     "cancel": "Cancel",
     "create": "Create",
     "type": "Type",
diff --git a/src/locales/en/pages.json b/src/locales/en/pages.json
@@ -221,7 +221,10 @@
     "myWallet": "My Wallet",
     "signTransaction": "Sign Transaction",
     "requestToSign": "Request to Sign",
-    "request": "Request"
+    "request": "Request",
+    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network %{network}",
+    "chainIdErrorRequestedChainId": "Requested chainId %{chainId}",
+    "chainIdErrorRequestedAsset": "Requested asset: %{asset}"
   },
   "send": {
     "sendTo": "Send to",
diff --git a/src/locales/es/common.json b/src/locales/es/common.json
@@ -1,4 +1,6 @@
 {
+    "error": "Error",
+    "warning": "Warning",
     "cancel": "Cancelar",
     "create": "Crear",
     "type": "Tipo",
diff --git a/src/locales/es/pages.json b/src/locales/es/pages.json
@@ -221,7 +221,10 @@
     "myWallet": "Mi Cartera",
     "signTransaction": "Firmar Transacción",
     "requestToSign": "Solicitud de Firma",
-    "request": "Solicitud"
+    "request": "Solicitud",
+    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network %{network}",
+    "chainIdErrorRequestedChainId": "Requested chainId %{chainId}",
+    "chainIdErrorRequestedAsset": "Requested asset: %{asset}"
   },
   "send": {
     "sendTo": "Enviar a",
diff --git a/src/locales/ph/common.json b/src/locales/ph/common.json
@@ -1,4 +1,6 @@
 {
+    "error": "Error",
+    "warning": "Warning",
     "cancel": "Kanselahin",
     "create": "Gumawa",
     "type": "Uri",
diff --git a/src/locales/ph/pages.json b/src/locales/ph/pages.json
@@ -221,7 +221,10 @@
     "myWallet": "Aking Wallet",
     "signTransaction": "I-sign ang Transaksyon",
     "requestToSign": "Kahilingan na Pumirma",
-    "request": "Kahilingan"
+    "request": "Kahilingan",
+    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network %{network}",
+    "chainIdErrorRequestedChainId": "Requested chainId %{chainId}",
+    "chainIdErrorRequestedAsset": "Requested asset: %{asset}"
   },
   "send": {
     "sendTo": "Ipadala sa",
diff --git a/src/locales/pt/common.json b/src/locales/pt/common.json
@@ -1,4 +1,6 @@
 {
+    "error": "Error",
+    "warning": "Warning",
     "cancel": "Cancelar",
     "create": "Criar",
     "type": "Tipo",
diff --git a/src/locales/pt/pages.json b/src/locales/pt/pages.json
@@ -221,7 +221,10 @@
     "myWallet": "Minha Carteira",
     "signTransaction": "Assinar Transação",
     "requestToSign": "Solicitação para Assinar",
-    "request": "Solicitar"
+    "request": "Solicitar",
+    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network %{network}",
+    "chainIdErrorRequestedChainId": "Requested chainId %{chainId}",
+    "chainIdErrorRequestedAsset": "Requested asset: %{asset}"
   },
   "send": {
     "sendTo": "Enviar para",
diff --git a/src/locales/zh/common.json b/src/locales/zh/common.json
@@ -1,4 +1,6 @@
 {
+    "error": "Error",
+    "warning": "Warning",
     "cancel": "取消",
     "create": "创建",
     "type": "类别",
diff --git a/src/locales/zh/pages.json b/src/locales/zh/pages.json
@@ -221,7 +221,10 @@
     "myWallet": "我的钱包",
     "signTransaction": "签署交易",
     "requestToSign": "请求签名",
-    "request": "请求"
+    "request": "请求",
+    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network %{network}",
+    "chainIdErrorRequestedChainId": "Requested chainId %{chainId}",
+    "chainIdErrorRequestedAsset": "Requested asset: %{asset}"
   },
   "send": {
     "sendTo": "发送到",
diff --git a/src/manifest.json b/src/manifest.json
@@ -1,6 +1,6 @@
 {
   "manifest_version": 2,
-  "version": "0.83.6",
+  "version": "0.83.7",
   "name": "__MSG_appName__",
   "description": "__MSG_appDesc__",
   "default_locale": "en",
diff --git a/src/views/PermissionSign.vue b/src/views/PermissionSign.vue
@@ -5,6 +5,53 @@
     </div>
     <div class="permission-sign wrapper text-center">
       <LedgerSignRequestModal :open="signRequestModalOpen" @close="closeSignRequestModal" />
+      <Modal v-if="showErrorModal" :show-close="false">
+        <template>
+          <h5 class="modal-title text-danger">
+            {{ $t('common.warning') }}
+          </h5>
+          <div class="row" v-if="error">
+            <div class="col">
+              {{ error }}
+            </div>
+          </div>
+          <template v-else>
+            <div class="row">
+              <div class="col">
+                {{
+                  $t('pages.permission.chainIdErrorNetwork', {
+                    network: requestedChain ? requestedChain.name : 'UNKNOWN',
+                    origin: request.origin
+                  })
+                }}
+              </div>
+            </div>
+            <div class="row mt-3">
+              <div class="col">
+                <p>
+                  {{
+                    $t('pages.permission.chainIdErrorRequestedChainId', {
+                      chainId: requestedChainId
+                    })
+                  }}
+                </p>
+                <p>
+                  {{
+                    $t('pages.permission.chainIdErrorRequestedAsset', {
+                      asset
+                    })
+                  }}
+                </p>
+              </div>
+            </div>
+          </template>
+        </template>
+        <template #footer>
+          <button class="btn btn-light btn-outline-primary btn-lg" @click="closeErrorModal">
+            {{ $t('common.ok') }}
+          </button>
+        </template>
+      </Modal>
       <div class="wrapper_top form">
         <h2>{{ $t('pages.permission.requestToSign') }}</h2>
         <img :src="getAssetIcon(asset)" class="permission-sign_icon mt-4 mb-2" />
@@ -32,7 +79,7 @@
           <button
             class="btn btn-primary btn-lg btn-icon"
             @click.stop="reply(true)"
-            :disabled="loading"
+            :disabled="loading || error"
           >
             <SpinnerIcon class="btn-loading" v-if="loading" />
             <template v-else>{{ $t('common.sign') }}</template>
@@ -52,11 +99,9 @@ import LogoWallet from '@/assets/icons/logo_wallet.svg?inline'
 import SpinnerIcon from '@/assets/icons/spinner.svg'
 import { isAddress } from 'ethers/lib/utils'
 import LedgerSignRequestModal from '@/components/LedgerSignRequestModal'
+import Modal from '@/components/Modal'
 import { ledgerConnectMixin } from '@/utils/hardware-wallet'
-import {
-  createInternalError,
-  CUSTOM_ERRORS
-} from '@liquality/error-parser/dist/src/LiqualityErrors'
+import { getChain, getAllSupportedChains } from '@liquality/cryptoassets'
 
 const signTypedDataMethodToVersion = {
   eth_signTypedData: 'V1',
@@ -83,16 +128,21 @@ function hexToAscii(hex) {
 export default {
   components: {
     SpinnerIcon,
+    Modal,
     LedgerSignRequestModal
   },
   mixins: [ledgerConnectMixin],
   data() {
     return {
       loading: false,
       replied: false,
+      error: null,
       messageToDisplay: '',
       messageToSign: '',
-      signRequestModalOpen: false
+      signRequestModalOpen: false,
+      showErrorModal: false,
+      requestedChainId: null,
+      requestedChain: null
     }
   },
   methods: {
@@ -128,10 +178,13 @@ export default {
         this.signRequestModalOpen = false
         this.loading = false
       }
+    },
+    closeErrorModal() {
+      this.showErrorModal = false
     }
   },
   computed: {
-    ...mapState(['activeNetwork', 'activeWalletId']),
+    ...mapState(['activeNetwork', 'activeWalletId', 'externalConnections']),
     ...mapGetters(['accountItem']),
     logo() {
       return LogoWallet
@@ -140,7 +193,7 @@ export default {
       return this.request.asset
     },
     address() {
-      return this.request.args[1] || this.request.args[0].params[0]
+      return this.messageToSign?.from || ''
     },
     request() {
       return {
@@ -150,15 +203,22 @@ export default {
     },
     account() {
       return this.accountItem(this.request?.accountId)
+    },
+    dappConnections() {
+      return this.externalConnections[this.activeWalletId] || {}
     }
   },
   created() {
     if (this.request.method === 'wallet.signTypedData') {
       const { method, params } = this.request.args[0]
-
       const first = params[0]
       const second = params[1]
-      const msgParams = { version: signTypedDataMethodToVersion[method] }
+      const msgParams = {
+        version: signTypedDataMethodToVersion[method],
+        from: null,
+        data: {}
+      }
+
       const extra = params[2] || {}
       try {
         if (isAddress(first)) {
@@ -169,11 +229,39 @@ export default {
           msgParams.data = JSON.parse(first)
         }
       } catch (err) {
-        throw createInternalError(CUSTOM_ERRORS.Invalid.Json(err)) // Error(`Invalid JSON: ${err}`)
+        this.error = `Invalid JSON: ${err}`
+        console.error(err)
       }
-
       this.messageToDisplay = Object.entries(msgParams.data)
       this.messageToSign = { ...msgParams, ...extra }
+
+      /**
+       ***** Validations for EIP-712
+       **/
+      this.requestedChainId = `${msgParams.data?.domain?.chainId}`.trim()
+      // the requested chainId can be an integer, string or hex so we should convert it to int if we get an hex
+      const chainIdToValidate = isHex(this.requestedChainId)
+        ? parseInt(this.requestedChainId, 16)
+        : this.requestedChainId
+
+      // We shuold try to get the chain details from the requested chainId if it's valid
+      const supportedChains = getAllSupportedChains()[this.activeNetwork] || {}
+      console.log(supportedChains)
+      this.requestedChain = Object.keys(supportedChains).find(
+        (chain) => supportedChains[chain]?.network?.chainId == chainIdToValidate
+      )
+
+      // We get the chains inside the dapp permissions, the chain name should be inside the list
+      const chains = Object.keys(this.dappConnections[this.request.origin] || {})
+        .map((chainName) => getChain(this.activeNetwork, chainName))
+        .filter((i) => i)
+      if (chains.findIndex((chain) => chain.network.chainId == chainIdToValidate) < 0) {
+        console.error(
+          `The request chainId is not matching with the asset chainId and stored permissions, RequestChainId: ${msgParams.data?.domain?.chainId}`,
+          this.request
+        )
+        this.showErrorModal = true
+      }
     }
     // Handle wallet.signMessage
     else {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "liquality-wallet",`
`3`		`- "version": "0.83.6",`
	`3`	`+ "version": "0.83.7",`
`4`	`4`	`"private": true,`
`5`	`5`	`"author": "Liquality <info@liquality.io>",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`{`
	`2`	`+ "error": "Error",`
	`3`	`+ "warning": "Warning",`
`2`	`4`	`"cancel": "I-kansel",`
`3`	`5`	`"create": "Paghimo",`
`4`	`6`	`"type": "Type",`