RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 06:58:11 +00:00
Code Issues Activity Actions

LibHTTP: Make HTTPRequest::from_raw_request() take a ReadonlyBytes

Browse source 
This allows us to get rid of some ByteBuffer::wrap() usage.
This commit is contained in:
Andreas Kling 2020-12-19 17:38:33 +01:00
parent e517505e35
commit 48d74c5356
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibHTTP/HttpRequest.cpp
View file

@ -79,7 +79,7 @@ ByteBuffer HttpRequest::to_raw_request() const
return builder.to_byte_buffer(); return builder.to_byte_buffer();
} }
Optional<HttpRequest> HttpRequest::from_raw_request(const ByteBuffer& raw_request) Optional<HttpRequest> HttpRequest::from_raw_request(ReadonlyBytes raw_request)
{ {
enum class State { enum class State {
InMethod, InMethod,

2
Libraries/LibHTTP/HttpRequest.h
View file

@ -69,7 +69,7 @@ public:
void set_headers(const HashMap<String, String>&); void set_headers(const HashMap<String, String>&);
static Optional<HttpRequest> from_raw_request(const ByteBuffer&); static Optional<HttpRequest> from_raw_request(ReadonlyBytes);
private: private:
URL m_url; URL m_url;

2
Meta/Lagom/Fuzzers/FuzzHttpRequest.cpp
View file

@ -30,7 +30,7 @@
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
{ {
auto request_wrapper = HTTP::HttpRequest::from_raw_request(ByteBuffer::wrap(const_cast<u8*>(data), size)); auto request_wrapper = HTTP::HttpRequest::from_raw_request(ReadonlyBytes { data, size });
if (!request_wrapper.has_value()) if (!request_wrapper.has_value())
return 1; return 1;

4
Services/WebServer/Client.cpp
View file

@ -65,12 +65,12 @@ void Client::start()
dbg() << "Got raw request: '" << String::copy(raw_request) << "'"; dbg() << "Got raw request: '" << String::copy(raw_request) << "'";
handle_request(move(raw_request)); handle_request(raw_request.bytes());
die(); die();
}; };
} }
void Client::handle_request(ByteBuffer raw_request) void Client::handle_request(ReadonlyBytes raw_request)
{ {
auto request_or_error = HTTP::HttpRequest::from_raw_request(raw_request); auto request_or_error = HTTP::HttpRequest::from_raw_request(raw_request);
if (!request_or_error.has_value()) if (!request_or_error.has_value())

2
Services/WebServer/Client.h
View file

@ -41,7 +41,7 @@ public:
private: private:
Client(NonnullRefPtr<Core::TCPSocket>, const String&, Core::Object* parent); Client(NonnullRefPtr<Core::TCPSocket>, const String&, Core::Object* parent);
void handle_request(ByteBuffer); void handle_request(ReadonlyBytes);
void send_response(StringView, const HTTP::HttpRequest&, const String& content_type); void send_response(StringView, const HTTP::HttpRequest&, const String& content_type);
void send_redirect(StringView redirect, const HTTP::HttpRequest& request); void send_redirect(StringView redirect, const HTTP::HttpRequest& request);
void send_error_response(unsigned code, const StringView& message, const HTTP::HttpRequest&); void send_error_response(unsigned code, const StringView& message, const HTTP::HttpRequest&);