rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 07:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4317

Browse source 
76f95f05 rpc: allow to pass RPC login via RPC_LOGIN env var (Dusan Klinec)
This commit is contained in:
Riccardo Spagni 2018-09-18 17:36:43 +02:00
commit 3cfa45cc7d
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/daemon/main.cpp
View file

@ -239,11 +239,14 @@ int main(int argc, char const * argv[])
return 1; return 1;
} }
const char *env_rpc_login = nullptr;
const bool has_rpc_arg = command_line::has_arg(vm, arg.rpc_login);
const bool use_rpc_env = !has_rpc_arg && (env_rpc_login = getenv("RPC_LOGIN")) != nullptr && strlen(env_rpc_login) > 0;
boost::optional<tools::login> login{}; boost::optional<tools::login> login{};
if (command_line::has_arg(vm, arg.rpc_login)) if (has_rpc_arg || use_rpc_env)
{ {
login = tools::login::parse( login = tools::login::parse(
command_line::get_arg(vm, arg.rpc_login), false, [](bool verify) { has_rpc_arg ? command_line::get_arg(vm, arg.rpc_login) : std::string(env_rpc_login), false, [](bool verify) {
#ifdef HAVE_READLINE #ifdef HAVE_READLINE
rdln::suspend_readline pause_readline; rdln::suspend_readline pause_readline;
#endif #endif

14
src/rpc/rpc_args.cpp
View file

@ -82,11 +82,17 @@ namespace cryptonote
} }
} }
if (command_line::has_arg(vm, arg.rpc_login)) const char *env_rpc_login = nullptr;
const bool has_rpc_arg = command_line::has_arg(vm, arg.rpc_login);
const bool use_rpc_env = !has_rpc_arg && (env_rpc_login = getenv("RPC_LOGIN")) != nullptr && strlen(env_rpc_login) > 0;
boost::optional<tools::login> login{};
if (has_rpc_arg || use_rpc_env)
{ {
config.login = tools::login::parse(command_line::get_arg(vm, arg.rpc_login), true, [](bool verify) { config.login = tools::login::parse(
return tools::password_container::prompt(verify, "RPC server password"); has_rpc_arg ? command_line::get_arg(vm, arg.rpc_login) : std::string(env_rpc_login), true, [](bool verify) {
}); return tools::password_container::prompt(verify, "RPC server password");
});
if (!config.login) if (!config.login)
return boost::none; return boost::none;