From 120a73f585fc13acc1f35d3a53aea850c1501d18 Mon Sep 17 00:00:00 2001
From: Ana G <40721795+Bitcoinera@users.noreply.github.com>
Date: Wed, 8 Jan 2020 20:34:32 +0100
Subject: [PATCH] Ana/add better validation for cosmos addresses (#3371)

* add better validation for cosmos addresses

* changelog

* change blacklisting to whitelisting

* minor fix
---
 ...a_improve-cosmos-address-signin-validation |  1 +
 src/components/common/TmSessionExplore.vue    | 25 +++++++++++++++++--
 .../common/TmSessionExplore.spec.js           |  9 +++++++
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 changes/ana_improve-cosmos-address-signin-validation

diff --git a/changes/ana_improve-cosmos-address-signin-validation b/changes/ana_improve-cosmos-address-signin-validation
new file mode 100644
index 0000000000..8b5770c008
--- /dev/null
+++ b/changes/ana_improve-cosmos-address-signin-validation
@@ -0,0 +1 @@
+[Changed] [#3371](https://github.com/cosmos/lunie/pull/3371) Strengthen the validation for cosmos addresses signin @Bitcoinera
\ No newline at end of file
diff --git a/src/components/common/TmSessionExplore.vue b/src/components/common/TmSessionExplore.vue
index ba942495d1..aeb897dd07 100644
--- a/src/components/common/TmSessionExplore.vue
+++ b/src/components/common/TmSessionExplore.vue
@@ -56,6 +56,13 @@
             name="You can't sign in with a validator address"
             type="custom"
           />
+          <TmFormMsg
+            v-else-if="
+              $v.address.$error && !$v.address.isAWhitelistedBech32Prefix
+            "
+            name="You can only sign in with a regular address"
+            type="custom"
+          />
         </TmFormGroup>
       </div>
       <div class="session-footer">
@@ -128,6 +135,19 @@ export default {
         return false
       }
     },
+    isAWhitelistedBech32Prefix(param) {
+      if (
+        param.substring(0, 7) === "cosmos1" ||
+        param.substring(0, 6) === "terra1" ||
+        param.substring(0, 5) === "xrn:1" ||
+        param.substring(0, 7) === "emoney1" ||
+        param.substring(0, 2) === "0x"
+      ) {
+        return true
+      } else {
+        return false
+      }
+    },
     getAddressIcon(addressType) {
       if (addressType === "explore") return `language`
       if (addressType === "ledger") return `vpn_key`
@@ -155,8 +175,9 @@ export default {
     return {
       address: {
         required,
-        addressValidate: this.addressValidate,
-        isNotAValidatorAddress: this.isNotAValidatorAddress
+        addressValidate: this.addressValidate,        
+        isNotAValidatorAddress: this.isNotAValidatorAddress,
+        isAWhitelistedBech32Prefix: this.isAWhitelistedBech32Prefix
       }
     }
   }
diff --git a/tests/unit/specs/components/common/TmSessionExplore.spec.js b/tests/unit/specs/components/common/TmSessionExplore.spec.js
index b497b70253..eb4c4e705f 100644
--- a/tests/unit/specs/components/common/TmSessionExplore.spec.js
+++ b/tests/unit/specs/components/common/TmSessionExplore.spec.js
@@ -88,6 +88,15 @@ describe(`TmSessionExplore`, () => {
     expect(wrapper.find(`.tm-form-msg-error`)).toBeDefined()
   })
 
+  it(`should show error if address is a "cosmospub" address`, () => {
+    wrapper.setData({
+      address: `cosmospub1addwnpepqgadvwk7ev0kk2x0tua0hrt056p8tqpv35r0mwydz45ytxp3wfaz5e7nxun`
+    })
+    wrapper.vm.onSubmit()
+    expect($store.commit.mock.calls[1]).toBeUndefined()
+    expect(wrapper.find(`.tm-form-msg-error`)).toBeDefined()
+  })
+
   it(`should show the last account used`, () => {
     localStorage.setItem(`prevAddress`, `cosmos1xxx`)