Mirrors
/
wownero
mirror of https://git.wownero.com/wownero/wownero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8145 

fb5b2b3 support authentication in monero-wallet-rpc set_daemon (woodser)
This commit is contained in:
luigi1111 2022-03-02 18:53:34 -05:00
parent abae63c37d fb5b2b352a
commit 27f1d43547
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wallet/wallet_rpc_server.cpp
View File

@ -4380,7 +4380,11 @@ namespace tools
return false;
}
if (!m_wallet->set_daemon(req.address, boost::none, req.trusted, std::move(ssl_options)))
boost::optional<epee::net_utils::http::login> daemon_login{};
if (!req.username.empty() || !req.password.empty())
daemon_login.emplace(req.username, req.password);
if (!m_wallet->set_daemon(req.address, daemon_login, req.trusted, std::move(ssl_options)))
{
er.code = WALLET_RPC_ERROR_CODE_NO_DAEMON_CONNECTION;
er.message = std::string("Unable to set daemon");

4
src/wallet/wallet_rpc_server_commands_defs.h
View File

@ -2657,6 +2657,8 @@ namespace wallet_rpc
struct request_t
{
std::string address;
std::string username;
std::string password;
bool trusted;
std::string ssl_support; // disabled, enabled, autodetect
std::string ssl_private_key_path;
@ -2667,6 +2669,8 @@ namespace wallet_rpc
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(address)
KV_SERIALIZE(username)
KV_SERIALIZE(password)
KV_SERIALIZE_OPT(trusted, false)
KV_SERIALIZE_OPT(ssl_support, (std::string)"autodetect")
KV_SERIALIZE(ssl_private_key_path)