RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 01:37:35 +00:00
Code Issues Activity Actions

LibHTTP+WebDriver+WebServer: Return error from HTTP request parser

Browse source
This commit is contained in:
Aliaksandr Kalenik 2023-03-23 02:52:06 +03:00 • committed by Andreas Kling
parent 5b31d1208f
commit 9220cdc285
6 changed files with 35 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Libraries/LibWeb/WebDriver/Client.cpp
View file

@ -182,6 +182,9 @@ Client::Client(NonnullOwnPtr<Core::BufferedTCPSocket> socket, Core::Object* pare
[](AK::Error const& error) {
warnln("Internal error: {}", error);
},
[](HTTP::HttpRequest::ParseError const& error) {
warnln("HTTP request parsing error: {}", HTTP::HttpRequest::parse_error_to_string(error));
},
[this](WebDriver::Error const& error) {
if (send_error_response(error).is_error())
warnln("Could not send error response");
@ -221,9 +224,7 @@ ErrorOr<void, Client::WrappedError> Client::on_ready_to_read()
break;
}
m_request = HTTP::HttpRequest::from_raw_request(TRY(builder.to_byte_buffer()));
if (!m_request.has_value())
return {};
m_request = TRY(HTTP::HttpRequest::from_raw_request(TRY(builder.to_byte_buffer())));
auto body = TRY(read_body_as_json());
TRY(handle_request(move(body)));

2
Userland/Libraries/LibWeb/WebDriver/Client.h
View file

@ -109,7 +109,7 @@ protected:
Client(NonnullOwnPtr<Core::BufferedTCPSocket>, Core::Object* parent);
private:
using WrappedError = Variant<AK::Error, WebDriver::Error>;
using WrappedError = Variant<AK::Error, HTTP::HttpRequest::ParseError, WebDriver::Error>;
void die();
ErrorOr<void, WrappedError> on_ready_to_read();