monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-01-08 03:49:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

electrum-words: fix language list being defined in two places; api/wallet: validate language

Browse source
This commit is contained in:
eversinc33 2022-04-17 01:52:01 +02:00
parent f49fc9b487
commit 3eb96c9499
2 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/mnemonics/electrum-words.cpp
View file

@ -91,29 +91,17 @@ namespace
bool find_seed_language(const std::vector<epee::wipeable_string> &seed,
bool has_checksum, std::vector<uint32_t> &matched_indices, Language::Base **language)
{
// If there's a new language added, add an instance of it here.
std::vector<Language::Base*> language_instances({
Language::Singleton<Language::Chinese_Simplified>::instance(),
Language::Singleton<Language::English>::instance(),
Language::Singleton<Language::Dutch>::instance(),
Language::Singleton<Language::French>::instance(),
Language::Singleton<Language::Spanish>::instance(),
Language::Singleton<Language::German>::instance(),
Language::Singleton<Language::Italian>::instance(),
Language::Singleton<Language::Portuguese>::instance(),
Language::Singleton<Language::Japanese>::instance(),
Language::Singleton<Language::Russian>::instance(),
Language::Singleton<Language::Esperanto>::instance(),
Language::Singleton<Language::Lojban>::instance(),
Language::Singleton<Language::EnglishOld>::instance()
});
std::vector<const Language::Base*> language_instances = crypto::ElectrumWords::get_language_list();
Language::Base *fallback = NULL;
// Add the deprecated OldEnglish language to ensure backwards compatibility
language_instances.push_back(Language::Singleton<Language::EnglishOld>::instance());
std::vector<epee::wipeable_string>::const_iterator it2;
matched_indices.reserve(seed.size());
// Iterate through all the languages and find a match
for (std::vector<Language::Base*>::iterator it1 = language_instances.begin();
for (std::vector<const Language::Base*>::iterator it1 = language_instances.begin();
it1 != language_instances.end(); it1++)
{
const std::unordered_map<epee::wipeable_string, uint32_t, Language::WordHash, Language::WordEqual> &word_map = (*it1)->get_word_map();
@ -153,13 +141,13 @@ namespace
if (has_checksum)
if (!checksum_test(seed, *it1))
{
fallback = *it1;
fallback = const_cast<Language::Base*>(*it1);
full_match = false;
}
}
if (full_match)
{
*language = *it1;
*language = const_cast<Language::Base*>(*it1);
MINFO("Full match for language " << (*language)->get_english_language_name());
return true;
}
@ -436,6 +424,7 @@ namespace crypto
std::vector<const Language::Base*> get_language_list()
{
// If there's a new language added, add an instance of it here.
static const std::vector<const Language::Base*> language_instances({
Language::Singleton<Language::German>::instance(),
Language::Singleton<Language::English>::instance(),

21
src/wallet/api/wallet.cpp
View file

@ -484,8 +484,15 @@ bool WalletImpl::create(const std::string &path, const std::string &password, co
setStatusCritical(error);
return false;
}
// TODO: validate language
m_wallet->set_seed_language(language);
// validate language
if (!crypto::ElectrumWords::is_valid_language(language)) {
std::string error = "failed to validate language.";
LOG_ERROR(error);
setStatusError(error);
return false;
}
crypto::secret_key recovery_val, secret_key;
try {
recovery_val = m_wallet->generate(path, password, secret_key, false, false);
@ -522,8 +529,14 @@ bool WalletImpl::createWatchOnly(const std::string &path, const std::string &pas
setStatusError(error);
return false;
}
// TODO: validate language
view_wallet->set_seed_language(language);
// validate language
if (!crypto::ElectrumWords::is_valid_language(language)) {
std::string error = "failed to validate language.";
LOG_ERROR(error);
setStatusError(error);
return false;
}
const crypto::secret_key viewkey = m_wallet->get_account().get_keys().m_view_secret_key;
const cryptonote::account_public_address address = m_wallet->get_account().get_keys().m_account_address;