diff options
author | Dusan Klinec <dusan.klinec@gmail.com> | 2018-08-30 13:35:05 +0200 |
---|---|---|
committer | Dusan Klinec <dusan.klinec@gmail.com> | 2018-08-31 15:51:59 +0200 |
commit | 76f95f052e4ab7f6074464f11b436a7374017b52 (patch) | |
tree | 20412b6189a48708e1116906f15a5c56ae1c8cbd /src/rpc/rpc_args.cpp | |
parent | Merge pull request #4223 (diff) | |
download | monero-76f95f052e4ab7f6074464f11b436a7374017b52.tar.xz |
rpc: allow to pass RPC login via RPC_LOGIN env var
- passing by parameter is insecure as it is shown in the process list
Diffstat (limited to 'src/rpc/rpc_args.cpp')
-rw-r--r-- | src/rpc/rpc_args.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/rpc/rpc_args.cpp b/src/rpc/rpc_args.cpp index d4044d11b..60c78480a 100644 --- a/src/rpc/rpc_args.cpp +++ b/src/rpc/rpc_args.cpp @@ -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) { - return tools::password_container::prompt(verify, "RPC server password"); - }); + config.login = tools::login::parse( + 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) return boost::none; |