RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-29 20:35:13 +00:00
Code Issues Activity Actions

LibHTTP+RequestServer: Recognize more HTTP methods

Browse source 
Previously it would default to GET for all of these and cause the
Discord API to return Method Not Allowed errors for certain endpoints.
This commit is contained in:
Luke Wilde 2022-06-27 21:39:03 +01:00 • committed by Linus Groh
parent 1ceba560f4
commit cd9864bbf1
3 changed files with 45 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Userland/Libraries/LibHTTP/HttpRequest.cpp
View file

@ -21,6 +21,18 @@ String HttpRequest::method_name() const
return "HEAD"; return "HEAD";
case Method::POST: case Method::POST:
return "POST"; return "POST";
case Method::DELETE:
return "DELETE";
case Method::PATCH:
return "PATCH";
case Method::OPTIONS:
return "OPTIONS";
case Method::TRACE:
return "TRACE";
case Method::CONNECT:
return "CONNECT";
case Method::PUT:
return "PUT";
default: default:
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
@ -155,6 +167,18 @@ Optional<HttpRequest> HttpRequest::from_raw_request(ReadonlyBytes raw_request)
request.m_method = Method::HEAD; request.m_method = Method::HEAD;
else if (method == "POST") else if (method == "POST")
request.m_method = Method::POST; request.m_method = Method::POST;
else if (method == "DELETE")
request.set_method(HTTP::HttpRequest::Method::DELETE);
else if (method == "PATCH")
request.set_method(HTTP::HttpRequest::Method::PATCH);
else if (method == "OPTIONS")
request.set_method(HTTP::HttpRequest::Method::OPTIONS);
else if (method == "TRACE")
request.set_method(HTTP::HttpRequest::Method::TRACE);
else if (method == "CONNECT")
request.set_method(HTTP::HttpRequest::Method::CONNECT);
else if (method == "PUT")
request.set_method(HTTP::HttpRequest::Method::PUT);
else else
return {}; return {};

8
Userland/Libraries/LibHTTP/HttpRequest.h
View file

@ -22,7 +22,13 @@ public:
Invalid, Invalid,
HEAD, HEAD,
GET, GET,
POST POST,
DELETE,
PATCH,
OPTIONS,
TRACE,
CONNECT,
PUT,
}; };
struct Header { struct Header {

14
Userland/Services/RequestServer/HttpCommon.h
View file

@ -73,6 +73,20 @@ OwnPtr<Request> start_request(TBadgedProtocol&& protocol, ConnectionFromClient&
HTTP::HttpRequest request; HTTP::HttpRequest request;
if (method.equals_ignoring_case("post")) if (method.equals_ignoring_case("post"))
request.set_method(HTTP::HttpRequest::Method::POST); request.set_method(HTTP::HttpRequest::Method::POST);
else if (method.equals_ignoring_case("head"))
request.set_method(HTTP::HttpRequest::Method::HEAD);
else if (method.equals_ignoring_case("delete"))
request.set_method(HTTP::HttpRequest::Method::DELETE);
else if (method.equals_ignoring_case("patch"))
request.set_method(HTTP::HttpRequest::Method::PATCH);
else if (method.equals_ignoring_case("options"))
request.set_method(HTTP::HttpRequest::Method::OPTIONS);
else if (method.equals_ignoring_case("trace"))
request.set_method(HTTP::HttpRequest::Method::TRACE);
else if (method.equals_ignoring_case("connect"))
request.set_method(HTTP::HttpRequest::Method::CONNECT);
else if (method.equals_ignoring_case("put"))
request.set_method(HTTP::HttpRequest::Method::PUT);
else else
request.set_method(HTTP::HttpRequest::Method::GET); request.set_method(HTTP::HttpRequest::Method::GET);
request.set_url(url); request.set_url(url);