aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGiel van Schijndel <me@mortis.eu>2011-06-24 19:26:47 +0200
committerGiel van Schijndel <me@mortis.eu>2011-06-26 21:07:59 +0200
commitc9e70d4c0a0585a253708a3c01fe4cee50057a63 (patch)
tree4bc87e4c984b82ca289043c0fd535ca82f2caee8 /src
parentd0d80170a2ca73004e08fb85007fe055cbf4e411 (diff)
rpc server: send '403 Forbidden' to rejected clients
In order to be a proper HTTP implementation clients that aren't allowed to connect to the RPC server (using -rpcallowip), should receive a proper HTTP response. So instead of closing the connection on them send a '403 Forbidden' status. Signed-off-by: Giel van Schijndel <me@mortis.eu>
Diffstat (limited to 'src')
-rw-r--r--src/rpc.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rpc.cpp b/src/rpc.cpp
index dabd99d075..7e0f05c6da 100644
--- a/src/rpc.cpp
+++ b/src/rpc.cpp
@@ -1532,7 +1532,7 @@ string rfc1123Time()
return string(buffer);
}
-string HTTPReply(int nStatus, const string& strMsg)
+static string HTTPReply(int nStatus, const string& strMsg)
{
if (nStatus == 401)
return strprintf("HTTP/1.0 401 Authorization Required\r\n"
@@ -1554,6 +1554,7 @@ string HTTPReply(int nStatus, const string& strMsg)
string strStatus;
if (nStatus == 200) strStatus = "OK";
else if (nStatus == 400) strStatus = "Bad Request";
+ else if (nStatus == 403) strStatus = "Forbidden";
else if (nStatus == 404) strStatus = "Not Found";
else if (nStatus == 500) strStatus = "Internal Server Error";
return strprintf(
@@ -1887,7 +1888,10 @@ void ThreadRPCServer2(void* parg)
// Restrict callers by IP
if (!ClientAllowed(peer.address().to_string()))
+ {
+ stream << HTTPReply(403, "") << std::flush;
continue;
+ }
map<string, string> mapHeaders;
string strRequest;