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

LibDNS: Make DNS packet parsing fallible

Browse source 
Previously, a DNS packet containing an invalid name would be returned
with an empty name. With this change, an error is returned if any error
is encountered during parsing.
This commit is contained in:
Tim Ledbetter 2023-11-13 22:36:34 +00:00 • committed by Andreas Kling
parent 95d62822bf
commit 1793f51bc6
8 changed files with 29 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Services/LookupServer/DNSServer.cpp
View file

@ -29,12 +29,7 @@ ErrorOr<void> DNSServer::handle_client()
{
sockaddr_in client_address;
auto buffer = TRY(receive(1024, client_address));
auto optional_request = Packet::from_raw_packet(buffer);
if (!optional_request.has_value()) {
dbgln("Got an invalid DNS packet");
return {};
}
auto& request = optional_request.value();
auto request = TRY(Packet::from_raw_packet(buffer));
if (!request.is_query()) {
dbgln("It's not a request");

6
Userland/Services/LookupServer/LookupServer.cpp
View file

@ -269,11 +269,11 @@ ErrorOr<Vector<Answer>> LookupServer::lookup(Name const& name, DeprecatedString
did_get_response = true;
auto o_response = Packet::from_raw_packet({ response_buffer, nrecv });
if (!o_response.has_value())
auto response_or_error = Packet::from_raw_packet({ response_buffer, nrecv });
if (response_or_error.is_error())
return Vector<Answer> {};
auto& response = o_response.value();
auto response = response_or_error.release_value();
if (response.id() != request.id()) {
dbgln("LookupServer: ID mismatch ({} vs {}) :(", response.id(), request.id());

16
Userland/Services/LookupServer/MulticastDNS.cpp
View file

@ -56,13 +56,7 @@ MulticastDNS::MulticastDNS(Core::EventReceiver* parent)
ErrorOr<void> MulticastDNS::handle_packet()
{
auto buffer = TRY(receive(1024));
auto optional_packet = Packet::from_raw_packet(buffer);
if (!optional_packet.has_value()) {
dbgln("Got an invalid mDNS packet");
return {};
}
auto& packet = optional_packet.value();
auto packet = TRY(Packet::from_raw_packet(buffer));
if (packet.is_query())
handle_query(packet);
return {};
@ -175,12 +169,12 @@ ErrorOr<Vector<Answer>> MulticastDNS::lookup(Name const& name, RecordType record
auto buffer = TRY(receive(1024));
if (buffer.is_empty())
return Vector<Answer> {};
auto optional_packet = Packet::from_raw_packet(buffer);
if (!optional_packet.has_value()) {
dbgln("Got an invalid mDNS packet");
auto packet_or_error = Packet::from_raw_packet(buffer);
if (packet_or_error.is_error()) {
dbgln("Got an invalid mDNS packet: {}", packet_or_error.release_error());
continue;
}
auto& packet = optional_packet.value();
auto packet = packet_or_error.release_value();
if (packet.is_query())
continue;