Browse Source

[RPC] pass HTTP basic authentication username to the JSONRequest object

tags/v0.15.1
Jonas Schnelli 4 years ago
parent
commit
e7156ad61b
No account linked to committer's email address
3 changed files with 10 additions and 5 deletions
  1. 7
    4
      src/httprpc.cpp
  2. 1
    0
      src/rest.cpp
  3. 2
    1
      src/rpc/server.h

+ 7
- 4
src/httprpc.cpp View File

@@ -127,7 +127,7 @@ static bool multiUserAuthorized(std::string strUserPass)
return false;
}

static bool RPCAuthorized(const std::string& strAuth)
static bool RPCAuthorized(const std::string& strAuth, std::string& strAuthUsernameOut)
{
if (strRPCUserColonPass.empty()) // Belt-and-suspenders measure if InitRPCAuthentication was not called
return false;
@@ -136,7 +136,10 @@ static bool RPCAuthorized(const std::string& strAuth)
std::string strUserPass64 = strAuth.substr(6);
boost::trim(strUserPass64);
std::string strUserPass = DecodeBase64(strUserPass64);

if (strUserPass.find(":") != std::string::npos)
strAuthUsernameOut = strUserPass.substr(0, strUserPass.find(":"));

//Check if authorized under single-user field
if (TimingResistantEqual(strUserPass, strRPCUserColonPass)) {
return true;
@@ -159,7 +162,8 @@ static bool HTTPReq_JSONRPC(HTTPRequest* req, const std::string &)
return false;
}

if (!RPCAuthorized(authHeader.second)) {
JSONRPCRequest jreq;
if (!RPCAuthorized(authHeader.second, jreq.authUser)) {
LogPrintf("ThreadRPCServer incorrect password attempt from %s\n", req->GetPeer().ToString());

/* Deter brute-forcing
@@ -172,7 +176,6 @@ static bool HTTPReq_JSONRPC(HTTPRequest* req, const std::string &)
return false;
}

JSONRPCRequest jreq;
try {
// Parse request
UniValue valRequest;

+ 1
- 0
src/rest.cpp View File

@@ -286,6 +286,7 @@ static bool rest_chaininfo(HTTPRequest* req, const std::string& strURIPart)
switch (rf) {
case RF_JSON: {
JSONRPCRequest jsonRequest;
jsonRequest.params = UniValue(UniValue::VARR);
UniValue chainInfoObject = getblockchaininfo(jsonRequest);
string strJSON = chainInfoObject.write() + "\n";
req->WriteHeader("Content-Type", "application/json");

+ 2
- 1
src/rpc/server.h View File

@@ -49,8 +49,9 @@ public:
UniValue params;
bool fHelp;
std::string URI;
std::string authUser;

JSONRPCRequest() { id = NullUniValue; }
JSONRPCRequest() { id = NullUniValue; params = NullUniValue; fHelp = false; }
void parse(const UniValue& valRequest);
};


Loading…
Cancel
Save