Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-09 05:02:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

monero-wallet-rpc: Prevent --password-file from being used with --wallet-dir

Browse source
This commit is contained in:
Kermit Alexander II 2021-07-31 04:23:03 -05:00
parent 56f7609643
commit 24d3d65d42
4 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/wallet/wallet_rpc_server.cpp
View file

@ -4502,10 +4502,12 @@ public:
const auto arg_wallet_file = wallet_args::arg_wallet_file();
const auto arg_from_json = wallet_args::arg_generate_from_json();
const auto arg_rpc_client_secret_key = wallet_args::arg_rpc_client_secret_key();
const auto arg_password_file = wallet_args::arg_password_file();
const auto wallet_file = command_line::get_arg(vm, arg_wallet_file);
const auto from_json = command_line::get_arg(vm, arg_from_json);
const auto wallet_dir = command_line::get_arg(vm, arg_wallet_dir);
const auto password_file = command_line::get_arg(vm, arg_password_file);
const auto prompt_for_password = command_line::get_arg(vm, arg_prompt_for_password);
const auto password_prompt = prompt_for_password ? password_prompter : nullptr;
@ -4515,6 +4517,12 @@ public:
return false;
}
if(!wallet_dir.empty() && !password_file.empty())
{
LOG_ERROR(tools::wallet_rpc_server::tr("--password-file is not allowed in combination with --wallet-dir"));
return false;
}
if (!wallet_dir.empty())
{
wal = NULL;