Uplift of #13125 (squashed) to beta

brave · Apr 22, 2022 · b30a557 · b30a557
1 parent 973fe14
commit b30a557
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 6 deletions.
diff --git a/browser/brave_wallet/external_wallets_importer.cc b/browser/brave_wallet/external_wallets_importer.cc
@@ -391,7 +391,7 @@ void ExternalWalletsImporter::GetMnemonic(bool is_legacy_crypto_wallets,
     return;
   }
 
-  const std::string* mnemonic = nullptr;
+  absl::optional<std::string> mnemonic = absl::nullopt;
   absl::optional<int> number_of_accounts = absl::nullopt;
   for (const auto& keyring : keyrings->GetList()) {
     DCHECK(keyring.is_dict());
@@ -403,11 +403,29 @@ void ExternalWalletsImporter::GetMnemonic(bool is_legacy_crypto_wallets,
     }
     if (*type != "HD Key Tree")
       continue;
-    mnemonic = keyring.FindStringPath("data.mnemonic");
-    if (!mnemonic) {
-      VLOG(0) << "keyring.data.menmonic is missing";
-      std::move(callback).Run(false, ImportInfo(), ImportError::kJsonError);
-      return;
+    const std::string* str_mnemonic = keyring.FindStringPath("data.mnemonic");
+    // data.mnemonic is not string, try utf8 encoded byte array
+    if (!str_mnemonic) {
+      const auto& dict = keyring.GetDict();
+      const auto* list = dict.FindListByDottedPath("data.mnemonic");
+      std::vector<uint8_t> utf8_encoded_mnemonic;
+      if (list) {
+        for (const auto& item : *list) {
+          if (!item.is_int())
+            break;
+          utf8_encoded_mnemonic.push_back(item.GetInt());
+        }
+      }
+      if (utf8_encoded_mnemonic.empty()) {
+        VLOG(0) << "keyring.data.menmonic is missing";
+
+        std::move(callback).Run(false, ImportInfo(), ImportError::kJsonError);
+        return;
+      }
+      mnemonic = std::string(utf8_encoded_mnemonic.begin(),
+                             utf8_encoded_mnemonic.end());
+    } else {
+      mnemonic = *str_mnemonic;
     }
     number_of_accounts = keyring.FindIntPath("data.numberOfAccounts");
     break;

diff --git a/browser/brave_wallet/external_wallets_importer_unittest.cc b/browser/brave_wallet/external_wallets_importer_unittest.cc
@@ -30,6 +30,25 @@ const char* valid_data =
     "\\\",\\\"iv\\\":\\\"fOHBjjQcsi1KmaeQ7xA7Aw==\\\", "
     "\\\"salt\\\":\\\"z1bTZtBY33d2l6CfiFs5V/eRQLS6Qsq5UtAQOIfaIps=\\\"}\"}}}";
 
+const char* valid_data_with_utf8_mnemonic =
+    "{\"data\": {\"KeyringController\": {\"vault\": "
+    "\"{\\\"data\\\":\\\"Q27H35GCkppku8PtVmiPsNJNfe5wjSWgjD5JGa3jtTlmwaTBffWJL+"
+    "cadVr5X8c0JnPToVUwbJXcIdmKxT8vAWZWQqRoeiTXOl6iF9SaoqhhnOIX1+"
+    "FPEPyHV4bu3GUpUVokgdYA1eryw39sQxFm5gLyl44VfF8hmuG+"
+    "2c4nEmPbK7XBDMSwif4Q1jas4CkhHBKGL3j6x7jpyMBtku4FK5LpFC5+G+A/"
+    "OOOUPFQWUpct5JidweZWFoABHz0WIRGnZXWeFE/BoO+/"
+    "JaHN08k9jQH4TMw6TylVODgqxVk1EqsYOvJfVZIRIjP7no0c94ZlyukcUOmtuFWE2N4swndqUB"
+    "TPBobISrSyBIK/SbgMJRcK/VwYlXRAjDCKJ8WIhVezPm8pZap2e6SM/"
+    "cKs0ScKe7Ngjw25UHKRB1QAoVgCbeJiv+"
+    "UqpuGpcFAbrZ1tYcJyqJkguw8fMMWiehtmYubzFx4plXzcz7h4ZHbnkzR7BNHUCemmFhsXxTpe"
+    "UtvH3kcDKtSu4H0JwUMMh7a8gCp/MYZxMxGo2aSKKLBkpW0l/mt/"
+    "IWgChfXq1h7Ch3hCxGdG+mNx/mZ8xkXakzJzPw20MNdejx5gqF/pUp/"
+    "jRGbSaPCaVhkT2a0rXnj8YFjMJbGuPnOn8hmSanIOOK1ETwkQolA+"
+    "jo8qyNXFtmsCmyrbdSPfEFLZGC0MyUD4viNN2aRoIDa8339YF4C8qkg3U0Zh6z0gmbgnNDMAjn"
+    "BmFl5sCGtRolu9pT+EJAE9XGDh5cvSCA7YMeLQTvLrhDn8o8kXc8J92yjw\\\",\\\"iv\\\":"
+    "\\\"mmSwsbEsytQDfdNBP6WwOw==\\\",\\\"salt\\\":"
+    "\\\"ZNDNQqgIaLswCtSH72AwaaymPQqmO6VCgpbfAmAuw5s=\\\"}\"}}}";
+
 const char* valid_legacy_mnemonic =
     "cushion pitch impact album daring marine much annual budget social "
     "clarify "
@@ -208,6 +227,19 @@ TEST_F(ExternalWalletsImporterUnitTest, OnGetImportInfo) {
   EXPECT_EQ(info.number_of_accounts, 1u);
 }
 
+TEST_F(ExternalWalletsImporterUnitTest, OnGetImportInfo_UTF8Mnemonic) {
+  bool result = false;
+  ImportInfo info;
+  ImportError error;
+  SimulateGetImportInfo("brave4ever", valid_data_with_utf8_mnemonic, &result,
+                        &info, &error);
+  EXPECT_TRUE(result);
+  EXPECT_EQ(error, ImportError::kNone);
+  EXPECT_EQ(info.mnemonic, valid_mnemonic);
+  EXPECT_FALSE(info.is_legacy_crypto_wallets);
+  EXPECT_EQ(info.number_of_accounts, 1u);
+}
+
 TEST_F(ExternalWalletsImporterUnitTest, ImportLegacyWalletError) {
   bool result = true;
   // argonParams is not a dict