highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-09-12 21:52:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

define HTTP request methods at module level outside of class

Browse Source 
This is a refactor to prepare for matching the API of HTTPRequest
definitions in both namespaces http_bitcoin and http_libevent. In
particular, to provide a consistent return type for GetRequestMethod()
in both classes.
This commit is contained in:
Matthew Zipkin
2024-12-11 13:21:31 -05:00
parent 7ee7df988e
commit dd11b5e01b
5 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/httpserver.cpp
View File

@@ -183,19 +183,15 @@ static bool InitHTTPAllowList()
}
/** HTTP request method as string - use for logging only */
std::string RequestMethodString(HTTPRequest::RequestMethod m)
std::string_view RequestMethodString(HTTPRequestMethod m)
{
switch (m) {
case HTTPRequest::GET:
return "GET";
case HTTPRequest::POST:
return "POST";
case HTTPRequest::HEAD:
return "HEAD";
case HTTPRequest::PUT:
return "PUT";
case HTTPRequest::UNKNOWN:
return "unknown";
using enum HTTPRequestMethod;
case GET: return "GET";
case POST: return "POST";
case HEAD: return "HEAD";
case PUT: return "PUT";
case UNKNOWN: return "unknown";
} // no default case, so the compiler can warn about missing cases
assert(false);
}
@@ -237,7 +233,7 @@ static void http_request_cb(struct evhttp_request* req, void* arg)
}
// Early reject unknown HTTP methods
if (hreq->GetRequestMethod() == HTTPRequest::UNKNOWN) {
if (hreq->GetRequestMethod() == HTTPRequestMethod::UNKNOWN) {
LogDebug(BCLog::HTTP, "HTTP request from %s rejected: Unknown HTTP request method\n",
hreq->GetPeer().ToStringAddrPort());
hreq->WriteReply(HTTP_BAD_METHOD);
@@ -655,19 +651,19 @@ std::string HTTPRequest::GetURI() const
return evhttp_request_get_uri(req);
}
HTTPRequest::RequestMethod HTTPRequest::GetRequestMethod() const
HTTPRequestMethod HTTPRequest::GetRequestMethod() const
{
switch (evhttp_request_get_command(req)) {
case EVHTTP_REQ_GET:
return GET;
return HTTPRequestMethod::GET;
case EVHTTP_REQ_POST:
return POST;
return HTTPRequestMethod::POST;
case EVHTTP_REQ_HEAD:
return HEAD;
return HTTPRequestMethod::HEAD;
case EVHTTP_REQ_PUT:
return PUT;
return HTTPRequestMethod::PUT;
default:
return UNKNOWN;
return HTTPRequestMethod::UNKNOWN;
}
}
@@ -849,7 +845,19 @@ bool HTTPRequest::LoadControlData(LineReader& reader)
const std::vector<std::string_view> parts{Split<std::string_view>(request_line, " ")};
if (parts.size() != 3) throw std::runtime_error("HTTP request line malformed");
m_method = parts[0];
if (parts[0] == "GET") {
m_method = HTTPRequestMethod::GET;
} else if (parts[0] == "POST") {
m_method = HTTPRequestMethod::POST;
} else if (parts[0] == "HEAD") {
m_method = HTTPRequestMethod::HEAD;
} else if (parts[0] == "PUT") {
m_method = HTTPRequestMethod::PUT;
} else {
m_method = HTTPRequestMethod::UNKNOWN;
}
m_target = parts[1];
if (parts[2].rfind("HTTP/") != 0) throw std::runtime_error("HTTP request line malformed");
@@ -1411,7 +1419,7 @@ void HTTPServer::MaybeDispatchRequestsFromClient(const std::shared_ptr<HTTPRemot
LogDebug(
BCLog::HTTP,
"Received a %s request for %s from %s (id=%llu)",
req->m_method,
RequestMethodString(req->m_method),
req->m_target,
client->m_origin,
client->m_id);