diff options
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/core_rpc_server.cpp | 26 | ||||
| -rw-r--r-- | src/rpc/core_rpc_server.h | 7 |
2 files changed, 26 insertions, 7 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 6e7fb7e8e..1a5e928a8 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -68,7 +68,9 @@ namespace cryptonote void core_rpc_server::init_options(boost::program_options::options_description& desc) { command_line::add_arg(desc, arg_rpc_bind_port); + command_line::add_arg(desc, arg_rpc_restricted_bind_port); command_line::add_arg(desc, arg_testnet_rpc_bind_port); + command_line::add_arg(desc, arg_testnet_rpc_restricted_bind_port); command_line::add_arg(desc, arg_restricted_rpc); cryptonote::rpc_args::init_options(desc); } @@ -83,21 +85,21 @@ namespace cryptonote //------------------------------------------------------------------------------------------------------------------------------ bool core_rpc_server::init( const boost::program_options::variables_map& vm + , const bool restricted + , const bool testnet + , const std::string& port ) { - m_testnet = command_line::get_arg(vm, cryptonote::arg_testnet_on); + m_restricted = restricted; + m_testnet = testnet; m_net_server.set_threads_prefix("RPC"); - auto p2p_bind_arg = m_testnet ? arg_testnet_rpc_bind_port : arg_rpc_bind_port; - auto rpc_config = cryptonote::rpc_args::process(vm); if (!rpc_config) return false; - m_restricted = command_line::get_arg(vm, arg_restricted_rpc); - boost::optional<epee::net_utils::http::login> http_login{}; - std::string port = command_line::get_arg(vm, p2p_bind_arg); + if (rpc_config->login) http_login.emplace(std::move(rpc_config->login->username), std::move(rpc_config->login->password).password()); @@ -1780,12 +1782,24 @@ namespace cryptonote , std::to_string(config::RPC_DEFAULT_PORT) }; + const command_line::arg_descriptor<std::string> core_rpc_server::arg_rpc_restricted_bind_port = { + "rpc-restricted-bind-port" + , "Port for restricted RPC server" + , "" + }; + const command_line::arg_descriptor<std::string> core_rpc_server::arg_testnet_rpc_bind_port = { "testnet-rpc-bind-port" , "Port for testnet RPC server" , std::to_string(config::testnet::RPC_DEFAULT_PORT) }; + const command_line::arg_descriptor<std::string> core_rpc_server::arg_testnet_rpc_restricted_bind_port = { + "testnet-rpc-restricted-bind-port" + , "Port for testnet restricted RPC server" + , "" + }; + const command_line::arg_descriptor<bool> core_rpc_server::arg_restricted_rpc = { "restricted-rpc" , "Restrict RPC to view only commands and do not return privacy sensitive data in RPC calls" diff --git a/src/rpc/core_rpc_server.h b/src/rpc/core_rpc_server.h index 7f252258c..bf4371a4e 100644 --- a/src/rpc/core_rpc_server.h +++ b/src/rpc/core_rpc_server.h @@ -53,7 +53,9 @@ namespace cryptonote public: static const command_line::arg_descriptor<std::string> arg_rpc_bind_port; + static const command_line::arg_descriptor<std::string> arg_rpc_restricted_bind_port; static const command_line::arg_descriptor<std::string> arg_testnet_rpc_bind_port; + static const command_line::arg_descriptor<std::string> arg_testnet_rpc_restricted_bind_port; static const command_line::arg_descriptor<bool> arg_restricted_rpc; typedef epee::net_utils::connection_context_base connection_context; @@ -65,7 +67,10 @@ namespace cryptonote static void init_options(boost::program_options::options_description& desc); bool init( - const boost::program_options::variables_map& vm + const boost::program_options::variables_map& vm, + const bool restricted, + const bool testnet, + const std::string& port ); bool is_testnet() const { return m_testnet; } |