ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass IPAddress in getAdminRole

Browse Source
This commit is contained in:
NATTSiM
2014-01-27 12:51:15 -08:00
committed by Vinnie Falco
parent f295bb20a1
commit bac8d41954
8 changed files with 69 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ripple_app/main/RPCHTTPServer.cpp
View File

@@ -153,7 +153,7 @@ public:
void processSession (Job& job, HTTP::Session& session)
{
session.write (m_deprecatedHandler.processRequest (
session.content(), session.remoteAddress().withPort(0).to_string()));
session.content(), session.remoteAddress().withPort(0)));
session.close();
}
@@ -172,7 +172,7 @@ public:
}
// Stolen directly from RPCServerHandler
std::string processRequest (std::string const& request, std::string const& remoteAddress)
std::string processRequest (std::string const& request, IPAddress const& remoteIPAddress)
{
Json::Value jvRequest;
{
@@ -187,14 +187,14 @@ public:
}
}
Config::Role const role (getConfig ().getAdminRole (jvRequest, remoteAddress));
Config::Role const role (getConfig ().getAdminRole (jvRequest, remoteIPAddress));
Resource::Consumer usage;
if (role == Config::ADMIN)
usage = m_resourceManager.newAdminEndpoint(remoteAddress);
usage = m_resourceManager.newAdminEndpoint (remoteIPAddress.to_string());
else
usage = m_resourceManager.newInboundEndpoint(IPAddress::from_string(remoteAddress));
usage = m_resourceManager.newInboundEndpoint(remoteIPAddress);
if (usage.disconnect ())
return createResponse (503, "Server is overloaded");

10
src/ripple_app/rpc/RPCServerHandler.cpp
View File

@@ -36,7 +36,7 @@ bool RPCServerHandler::isAuthorized (
return HTTPAuthorized (headers);
}
std::string RPCServerHandler::processRequest (std::string const& request, std::string const& remoteAddress)
std::string RPCServerHandler::processRequest (std::string const& request, IPAddress const& remoteIPAddress)
{
Json::Value jvRequest;
{
@@ -50,15 +50,15 @@ std::string RPCServerHandler::processRequest (std::string const& request, std::s
return createResponse (400, "Unable to parse request");
}
}
Config::Role const role (getConfig ().getAdminRole (jvRequest, remoteAddress));
Config::Role const role (getConfig ().getAdminRole (jvRequest, remoteIPAddress));
Resource::Consumer usage;
if (role == Config::ADMIN)
usage = m_resourceManager.newAdminEndpoint (remoteAddress);
usage = m_resourceManager.newAdminEndpoint (remoteIPAddress.to_string());
else
usage = m_resourceManager.newInboundEndpoint (IPAddress::from_string (remoteAddress));
usage = m_resourceManager.newInboundEndpoint (remoteIPAddress);
if (usage.disconnect ())
return createResponse (503, "Server is overloaded");

2
src/ripple_app/rpc/RPCServerHandler.h
View File

@@ -33,7 +33,7 @@ public:
bool isAuthorized (std::map <std::string, std::string> const& headers);
std::string processRequest (std::string const& request, std::string const& remoteAddress);
std::string processRequest (std::string const& request, IPAddress const& remoteIPAddress);
private:
NetworkOPs& m_networkOPs;

2
src/ripple_app/websocket/WSConnection.cpp
View File

@@ -139,7 +139,7 @@ Json::Value WSConnection::invokeCommand (Json::Value& jvRequest)
Config::Role const role = m_isPublic
? Config::GUEST // Don't check on the public interface.
: getConfig ().getAdminRole (
jvRequest, m_remoteAddress.withPort(0).to_string());
jvRequest, m_remoteAddress.withPort(0));
if (Config::FORBID == role)
{