Merge pull request #78 from UnUniFi/feature/wrong-privkey

fix: private key validation
UnUniFi · Apr 19, 2022 · 8a100bf · 8a100bf
2 parents f3097bb + 318cd1d
commit 8a100bf
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 30 deletions.
diff --git a/projects/portal/src/app/models/cosmos/bank.application.service.ts b/projects/portal/src/app/models/cosmos/bank.application.service.ts
@@ -39,18 +39,17 @@ export class BankApplicationService {
       return;
     }
 
-    if (!validatePrivateStoredWallet(privateWallet)) {
-      this.snackBar.open('Invalid Wallet info!', 'Close');
-      return;
-    }
-
     const privateKey = convertHexStringToUint8Array(privateWallet.privateKey);
-
     if (!privateKey) {
       this.snackBar.open('Invalid PrivateKey!', 'Close');
       return;
     }
 
+    if (!validatePrivateStoredWallet(privateWallet)) {
+      this.snackBar.open('Invalid Wallet info!', 'Close');
+      return;
+    }
+
     // simulate
     let simulatedResultData: SimulatedTxResultResponse;
     let gas: proto.cosmos.base.v1beta1.ICoin;

diff --git a/projects/portal/src/app/utils/converter.ts b/projects/portal/src/app/utils/converter.ts
@@ -5,6 +5,9 @@ export const convertHexStringToUint8Array = (hexString: string): Uint8Array | un
     const hexStringWithNoWhitespace = hexString.replace(/\s+/g, '');
     const buffer = Buffer.from(hexStringWithNoWhitespace, 'hex');
     const uint8Array = Uint8Array.from(buffer);
+    if (uint8Array.length == 0) {
+      return undefined;
+    }
     return uint8Array;
   } catch (error) {
     console.error(error);

diff --git a/projects/portal/src/app/utils/validater.ts b/projects/portal/src/app/utils/validater.ts
@@ -5,30 +5,35 @@ import { cosmosclient } from '@cosmos-client/core';
 export const validatePrivateStoredWallet = (
   privateStoredWallet: StoredWallet & { privateKey: string },
 ): boolean => {
-  const cosmosPrivateKey = createCosmosPrivateKeyFromString(
-    privateStoredWallet.key_type,
-    privateStoredWallet.privateKey,
-  );
-  if (!cosmosPrivateKey) {
+  try {
+    const cosmosPrivateKey = createCosmosPrivateKeyFromString(
+      privateStoredWallet.key_type,
+      privateStoredWallet.privateKey,
+    );
+    if (!cosmosPrivateKey) {
+      return false;
+    }
+    const cosmosPublicKey = createCosmosPublicKeyFromString(
+      privateStoredWallet.key_type,
+      privateStoredWallet.public_key,
+    );
+    if (!cosmosPublicKey) {
+      return false;
+    }
+    const matchPrivateKeyAndPublicKey =
+      cosmosPrivateKey.pubKey().bytes().toString() !== cosmosPublicKey.bytes().toString();
+    if (matchPrivateKeyAndPublicKey) {
+      return false;
+    }
+    const matchPublicKeyAndAddress =
+      cosmosclient.AccAddress.fromPublicKey(cosmosPublicKey).toAccAddress().toString() !==
+      privateStoredWallet.address;
+    if (matchPublicKeyAndAddress) {
+      return false;
+    }
+    return true;
+  } catch (error) {
+    console.error(error);
     return false;
   }
-  const cosmosPublicKey = createCosmosPublicKeyFromString(
-    privateStoredWallet.key_type,
-    privateStoredWallet.public_key,
-  );
-  if (!cosmosPublicKey) {
-    return false;
-  }
-  const matchPrivateKeyAndPublicKey =
-    cosmosPrivateKey.pubKey().bytes().toString() !== cosmosPublicKey.bytes().toString();
-  if (matchPrivateKeyAndPublicKey) {
-    return false;
-  }
-  const matchPublicKeyAndAddress =
-    cosmosclient.AccAddress.fromPublicKey(cosmosPublicKey).toAccAddress().toString() !==
-    privateStoredWallet.address;
-  if (matchPublicKeyAndAddress) {
-    return false;
-  }
-  return true;
 };