feat(@general): lower case password

src/app_service/common/string_utils.nim

@@ -1,4 +0,0 @@
-import nimcrypto
-
-proc hashString*(text: string): string =
-  result = "0x" & $keccak_256.digest(text)

src/app_service/common/utils.nim

@@ -10,8 +10,18 @@ const ETH_DOMAIN* = ".eth"
 proc arrayContains*[T](arr: seq[T], value: T): bool = 
   return arr.any(x => x == value)
 
-proc hashPassword*(password: string): string =
-  result = "0x" & $keccak_256.digest(password)
+proc hashPassword*(password: string, lower: bool = true): string =
+  let hashed = "0x" & $keccak_256.digest(password)
+  
+  if lower:
+    return hashed.toLowerAscii()
+
+  return hashed
+
+proc prefix*(methodName: string, isExt:bool = true): string =
+  result = "waku"
+  result = result & (if isExt: "ext_" else: "_")
+  result = result & methodName
 
 proc generateSigningPhrase*(count: int): string =
   let now = getTime()

src/app_service/service/accounts/service.nim

@@ -7,12 +7,13 @@ import ./dto/generated_accounts as dto_generated_accounts
 from ../keycard/service import KeycardEvent, KeyDetails 
 import ../../../backend/general as status_general
 import ../../../backend/core as status_core
+import ../../../backend/privacy as status_privacy
 
 import ../../../app/core/eventemitter
 import ../../../app/core/signals/types
 import ../../../app/core/tasks/[qt, threadpool]
 import ../../../app/core/fleets/fleet_configuration
-import ../../common/[account_constants, network_constants, utils, string_utils]
+import ../../common/[account_constants, network_constants, utils]
 import ../../../constants as main_constants
 
 import ../settings/dto/settings as settings
@@ -377,7 +378,7 @@ QtObject:
         error "error: ", procName="setupAccount", errDesription = description
         return description
 
-      let hashedPassword = hashString(password)
+      let hashedPassword = hashPassword(password)
       discard self.storeAccount(accountId, hashedPassword)
       discard self.storeDerivedAccounts(accountId, hashedPassword, PATHS)
       self.loggedInAccount = self.saveAccountAndLogin(hashedPassword, 
@@ -549,9 +550,35 @@ QtObject:
       error "error: ", procName="importMnemonic", errName = e.name, errDesription = e.msg
       return e.msg
 
+  proc verifyAccountPassword*(self: Service, account: string, password: string): bool =
+    try:
+      let response = status_account.verifyAccountPassword(account, password, self.keyStoreDir)
+      if(response.result.contains("error")):
+        let errMsg = response.result["error"].getStr
+        if(errMsg.len == 0):
+          return true
+        else:
+          error "error: ", procName="verifyAccountPassword", errDesription = errMsg
+      return false
+    except Exception as e:
+      error "error: ", procName="verifyAccountPassword", errName = e.name, errDesription = e.msg
+
+  proc verifyDatabasePassword*(self: Service, keyuid: string, hashedPassword: string): bool =
+    try:
+      let response = status_account.verifyDatabasePassword(keyuid, hashedPassword)
+      if(response.result.contains("error")):
+        let errMsg = response.result["error"].getStr
+        if(errMsg.len == 0):
+          return true
+        else:
+          error "error: ", procName="verifyDatabasePassword", errDesription = errMsg
+      return false
+    except Exception as e:
+      error "error: ", procName="verifyDatabasePassword", errName = e.name, errDesription = e.msg
+
   proc login*(self: Service, account: AccountDto, password: string): string =
     try:
-      let hashedPassword = hashString(password)
+      let hashedPassword = hashPassword(password)
       var thumbnailImage: string
       var largeImage: string
       for img in account.images:
@@ -615,17 +642,21 @@ QtObject:
           "DiscV5BootstrapNodes": @[]
         }
 
-      let response = status_account.login(account.name, account.keyUid, account.kdfIterations, hashedPassword, thumbnailImage,
-        largeImage, $nodeCfg)
-      var error = "response doesn't contain \"error\""
-      if(response.result.contains("error")):
-        error = response.result["error"].getStr
-        if error == "":
-          debug "Account logged in"
-          self.loggedInAccount = account
-          self.setLocalAccountSettingsFile()
 
-      return error
+      let isOldHashPassword = self.verifyDatabasePassword(account.keyUid, hashPassword(password, lower=false))
+      if isOldHashPassword:
+        discard status_privacy.lowerDatabasePassword(account.keyUid, password)
+      
+      let response = status_account.login(
+        account.name, account.keyUid, account.kdfIterations, hashedPassword, thumbnailImage, largeImage, $nodeCfg
+      )
+      if response.result{"error"}.getStr == "":
+        debug "Account logged in"
+        self.loggedInAccount = account
+        self.setLocalAccountSettingsFile()
+        return ""
+
+      return response.result{"error"}.getStr
 
     except Exception as e:
       error "error: ", procName="login", errName = e.name, errDesription = e.msg
@@ -661,20 +692,6 @@ QtObject:
       error "error: ", procName="loginAccountKeycard", errName = e.name, errDesription = e.msg
       return e.msg
 
-  proc verifyAccountPassword*(self: Service, account: string, password: string): bool =
-    try:
-      let response = status_account.verifyAccountPassword(account, password, self.keyStoreDir)
-      if(response.result.contains("error")):
-        let errMsg = response.result["error"].getStr
-        if(errMsg.len == 0):
-          return true
-        else:
-          error "error: ", procName="verifyAccountPassword", errDesription = errMsg
-      return false
-    except Exception as e:
-      error "error: ", procName="verifyAccountPassword", errName = e.name, errDesription = e.msg
-
-
   proc convertToKeycardAccount*(self: Service, currentPassword: string, newPassword: string) = 
     var accountDataJson = %* {
       "key-uid": self.getLoggedInAccount().keyUid,
@@ -689,7 +706,7 @@ QtObject:
       error "error: ", procName="convertToKeycardAccount", errDesription = description
       return
 
-    let hashedCurrentPassword = hashString(currentPassword)
+    let hashedCurrentPassword = hashPassword(currentPassword)
     let arg = ConvertToKeycardAccountTaskArg(
       tptr: cast[ByteAddress](convertToKeycardAccountTask),
       vptr: cast[ByteAddress](self.vptr),
@@ -718,7 +735,7 @@ QtObject:
     self.events.emit(SIGNAL_CONVERTING_PROFILE_KEYPAIR, ResultArgs(success: result))
 
   proc convertToRegularAccount*(self: Service, mnemonic: string, currentPassword: string, newPassword: string): string = 
-    let hashedPassword = hashString(newPassword)
+    let hashedPassword = hashPassword(newPassword)
     try:
       let response = status_account.convertToRegularAccount(mnemonic, currentPassword, hashedPassword)
       var errMsg = ""
@@ -733,7 +750,7 @@ QtObject:
 
   proc verifyPassword*(self: Service, password: string): bool =
     try:
-      let hashedPassword = hashString(password)
+      let hashedPassword = hashPassword(password)
       let response = status_account.verifyPassword(hashedPassword)
       return response.result.getBool
     except Exception as e:

src/app_service/service/wallet_account/service.nim

@@ -6,7 +6,7 @@ import ../settings/service as settings_service
 import ../accounts/service as accounts_service
 import ../token/service as token_service
 import ../network/service as network_service
-import ../../common/[account_constants, string_utils]
+import ../../common/[account_constants, utils]
 import ../../../app/global/global_singleton
 
 import dto, derived_address, key_pair_dto
@@ -317,7 +317,7 @@ QtObject:
           derivedFrom)
       else:
         discard backend.generateAccountWithDerivedPath(
-          hashPassword(password),
+          utils.hashPassword(password),
           accountName,
           color,
           emoji,
@@ -341,7 +341,7 @@ QtObject:
       else:
         discard backend.addAccountWithPrivateKey(
           privateKey,
-          hashPassword(password),
+          utils.hashPassword(password),
           accountName,
           color,
           emoji)
@@ -365,7 +365,7 @@ QtObject:
       else:
         discard backend.addAccountWithMnemonicAndPath(
           mnemonic,
-          hashPassword(password),
+          utils.hashPassword(password),
           accountName,
           color,
           emoji,
@@ -393,7 +393,7 @@ QtObject:
     try:
       var hashedPassword = ""
       if password.len > 0:
-        hashedPassword = hashString(password)
+        hashedPassword = utils.hashPassword(password)
       discard status_go_accounts.deleteAccount(address, hashedPassword)
       let accountDeleted = self.removeAccount(address)
       self.events.emit(SIGNAL_WALLET_ACCOUNT_DELETED, AccountDeleted(account: accountDeleted))
@@ -433,7 +433,7 @@ QtObject:
 
   proc getDerivedAddress*(self: Service, password: string, derivedFrom: string, path: string, hashPassword: bool)=
     let arg = GetDerivedAddressTaskArg(
-      password: if hashPassword: hashPassword(password) else: password,
+      password: if hashPassword: utils.hashPassword(password) else: password,
       derivedFrom: derivedFrom,
       path: path,
       tptr: cast[ByteAddress](getDerivedAddressTask),
@@ -444,7 +444,7 @@ QtObject:
 
   proc getDerivedAddressList*(self: Service, password: string, derivedFrom: string, path: string, pageSize: int, pageNumber: int, hashPassword: bool)=
     let arg = GetDerivedAddressesTaskArg(
-      password: if hashPassword: hashPassword(password) else: password,
+      password: if hashPassword: utils.hashPassword(password) else: password,
       derivedFrom: derivedFrom,
       path: path,
       pageSize: pageSize,
@@ -604,7 +604,7 @@ QtObject:
     # in some contexts we just need to add keypair to the db, so password is not needed.
     var hashedPassword = ""
     if password.len > 0:
-      hashedPassword = hashString(password)
+      hashedPassword = utils.hashPassword(password)
     let arg = AddMigratedKeyPairTaskArg(
       tptr: cast[ByteAddress](addMigratedKeyPairTask),
       vptr: cast[ByteAddress](self.vptr),

src/backend/accounts.nim

@@ -1,5 +1,5 @@
 import json, json_serialization, chronicles, strutils
-import ./core, ./utils
+import ./core, ../app_service/common/utils
 import ./response_type
 
 import status_go
@@ -300,6 +300,16 @@ proc verifyAccountPassword*(address: string, password: string, keystoreDir: stri
     error "error doing rpc request", methodName = "verifyAccountPassword", exception=e.msg
     raise newException(RpcException, e.msg)
 
+proc verifyDatabasePassword*(keyuid: string, hashedPassword: string):
+  RpcResponse[JsonNode] {.raises: [Exception].} =
+  try:
+    let response = status_go.verifyDatabasePassword(keyuid, hashedPassword)
+    result.result = Json.decode(response, JsonNode)
+
+  except RpcException as e:
+    error "error doing rpc request", methodName = "verifyDatabasePassword", exception=e.msg
+    raise newException(RpcException, e.msg)
+
 proc storeIdentityImage*(keyUID: string, imagePath: string, aX, aY, bX, bY: int):
   RpcResponse[JsonNode] {.raises: [Exception].} =
   let payload = %* [keyUID, imagePath, aX, aY, bX, bY]

src/backend/browser.nim

@@ -1,5 +1,5 @@
 import json
-import core, utils
+import core, ../app_service/common/utils
 import response_type
 import ./backend
 

src/backend/chat.nim

@@ -1,5 +1,5 @@
 import json, sequtils, sugar, strutils
-import core, utils
+import core, ../app_service/common/utils
 import response_type
 import interpret/cropped_image
 

src/backend/chatCommands.nim

@@ -1,5 +1,5 @@
 import json
-import core, utils
+import core, ../app_service/common/utils
 import response_type
 
 proc acceptRequestAddressForTransaction*(messageId: string, address: string): RpcResponse[JsonNode] {.raises: [Exception].} =

src/backend/communities.nim

@@ -1,5 +1,5 @@
 import json, strutils
-import core, utils
+import core, ../app_service/common/utils
 import response_type
 
 import interpret/cropped_image

src/backend/community_tokens.nim

@@ -1,6 +1,6 @@
 import json
 import ./eth
-import ./utils
+import ../app_service/common/utils
 import ./core, ./response_type
 
 proc deployCollectibles*(chainId: int, deploymentParams: JsonNode, txData: JsonNode, password: string): RpcResponse[JsonNode] {.raises: [Exception].} =

src/backend/contacts.nim

@@ -1,5 +1,5 @@
 import json, strmisc
-import core, utils
+import core, ../app_service/common/utils
 import response_type
 
 export response_type

src/backend/ens.nim

@@ -1,6 +1,6 @@
 import json
 import ./core, ./response_type
-import ./utils
+import ../app_service/common/utils
 export response_type
 
 proc getEnsUsernames*(): RpcResponse[JsonNode] {.raises: [Exception].} =

src/backend/general.nim

@@ -1,5 +1,5 @@
 import json, strutils, json_serialization, chronicles
-import core, utils
+import core, ../app_service/common/utils
 import response_type
 
 import status_go

src/backend/installations.nim

@@ -1,5 +1,5 @@
 import json
-import core, utils
+import core, ../app_service/common/utils
 import response_type
 
 export response_type

src/backend/mailservers.nim

@@ -1,5 +1,5 @@
 import json, chronicles
-import core, utils
+import core, ../app_service/common/utils
 import response_type
 
 export response_type

src/backend/messages.nim

@@ -1,5 +1,5 @@
 import json
-import core, utils
+import core, ../app_service/common/utils
 import response_type
 
 export response_type

src/backend/node.nim

@@ -1,5 +1,5 @@
 import json
-import core, utils
+import core, ../app_service/common/utils
 import response_type
 
 export response_type

src/backend/node_config.nim

@@ -1,7 +1,7 @@
 import json, json_serialization, chronicles
 import ./core
 import ./response_type
-import utils
+import ../app_service/common/utils
 
 import status_go
 

src/backend/privacy.nim

@@ -1,5 +1,5 @@
 import json, json_serialization, chronicles
-import core, utils
+import core, ../app_service/common/utils
 import response_type
 
 import status_go
@@ -20,6 +20,18 @@ proc changeDatabasePassword*(keyUID: string, password: string, newPassword: stri
     error "error", methodName = "changeDatabasePassword", exception=e.msg
     raise newException(RpcException, e.msg)
 
+proc lowerDatabasePassword*(keyUID: string, password: string): RpcResponse[JsonNode]
+  {.raises: [Exception].} =
+  try:
+    let hashedPassword = hashPassword(password, lower=false)
+    let hashedNewPassword = hashPassword(password)
+    let response = status_go.changeDatabasePassword(keyUID, hashedPassword, hashedNewPassword)
+    result.result = Json.decode(response, JsonNode)
+  except RpcException as e:
+    error "error", methodName = "lowerDatabasePassword", exception=e.msg
+    raise newException(RpcException, e.msg)
+
+
 proc getLinkPreviewWhitelist*(): RpcResponse[JsonNode] {.raises: [Exception].} =
   let payload = %* []
   result = callPrivateRPC("getLinkPreviewWhitelist".prefix, payload)

src/backend/provider.nim

@@ -1,5 +1,5 @@
 import json, json_serialization, chronicles
-import ./utils
+import ../app_service/common/utils
 import ./core
 
 logScope:

src/backend/stickers.nim

@@ -1,6 +1,6 @@
 import json
 import ./eth
-import ./utils
+import ../app_service/common/utils
 import ./core, ./response_type
 import web3/[ethtypes, conversions]
 

src/backend/utils.nim

@@ -1,12 +0,0 @@
-import nimcrypto
-
-proc isWakuEnabled(): bool =
-  true # TODO:
-
-proc prefix*(methodName: string, isExt:bool = true): string =
-  result = if isWakuEnabled(): "waku" else: "shh"
-  result = result & (if isExt: "ext_" else: "_")
-  result = result & methodName
-
-proc hashPassword*(password: string): string =
-  result = "0x" & $keccak_256.digest(password)

vendor/nim-status-go

@@ -1 +1 @@
-Subproject commit 8fed87fe272c4b49008cd7cc5950a96cd0751966
+Subproject commit 4d2d359aec6a9db5fb684c97ebd52b82065d60f3

vendor/status-go

@@ -1 +1 @@
-Subproject commit 1d1a95091df0197199ea502aae24c823faf9b989
+Subproject commit c786528965e4537dcf1fd7deea773bd9f3d99bbd