feat(neuron-ui): check the JSON format before keystore validation

nervosnetwork · Aug 13, 2019 · d5621e5 · d5621e5
1 parent f8a4796
commit d5621e5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/packages/neuron-wallet/src/controllers/wallets/index.ts b/packages/neuron-wallet/src/controllers/wallets/index.ts
@@ -15,6 +15,7 @@ import {
   ServiceHasNoResponse,
   EmptyPassword,
   IncorrectPassword,
+  InvalidJSON,
 } from 'exceptions'
 import i18n from 'utils/i18n'
 import AddressService from 'services/addresses'
@@ -161,6 +162,11 @@ export default class WalletsController {
       throw new IsRequired('Password')
     }
     const keystore = fs.readFileSync(keystorePath, 'utf8')
+    try {
+      JSON.parse(keystore)
+    } catch {
+      throw new InvalidJSON()
+    }
     const keystoreObject = Keystore.fromJson(keystore)
     const masterPrivateKey = keystoreObject.extendedPrivateKey(password)
     const masterKeychain = new Keychain(

diff --git a/packages/neuron-wallet/src/exceptions/common.ts b/packages/neuron-wallet/src/exceptions/common.ts
@@ -40,11 +40,18 @@ export class ShouldBeTypeOf extends Error {
   }
 }
 
+export class InvalidJSON extends Error {
+  constructor() {
+    super(i18n.t('messages.invalid-JSON'))
+  }
+}
+
 export default {
   InvalidName,
   UsedName,
   IsRequired,
   MissingRequiredArgument,
   ServiceHasNoResponse,
   ShouldBeTypeOf,
+  InvalidJSON,
 }
diff --git a/packages/neuron-wallet/src/locales/en.ts b/packages/neuron-wallet/src/locales/en.ts
@@ -93,6 +93,7 @@ export default {
       'capacity-too-small': 'Capacity less than min',
       'should-be-type-of': '{{field}} should be type of {{type}}',
       'invalid-keystore': 'Keystore is invalid',
+      'invalid-JSON': 'Invalid JSON file',
     },
     contextMenu: {
       select: 'Select',

diff --git a/packages/neuron-wallet/src/locales/zh.ts b/packages/neuron-wallet/src/locales/zh.ts
@@ -92,6 +92,7 @@ export default {
       'capacity-too-small': '金额小于最低金额',
       'should-be-type-of': '{{field}} 应该为 {{type}} 类型',
       'invalid-keystore': 'Keystore 格式不正确',
+      'invalid-JSON': 'JSON 文件格式不正确',
     },
     contextMenu: {
       select: '选择',