willem/webserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: improve error handling for size directive and chunked body parsing

Browse Source
This commit is contained in:
whaffman 2025-10-16 01:14:54 +02:00
parent 67ab96f9da
commit 377ff71e1e
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
webserv/config/directive/SizeDirective.cpp
View File

@ -25,7 +25,14 @@ void SizeDirective::parse(const std::string &value)
{ {
throw std::invalid_argument("Invalid size directive: " + value); throw std::invalid_argument("Invalid size directive: " + value);
} }
value_ = std::stoul(number, &idx); try
{
value_ = std::stoul(number, &idx);
}
catch (const std::exception &e)
{
throw std::invalid_argument("Invalid size directive: " + value + " - " + e.what());
}
if (idx == number.size()) if (idx == number.size())
{ {
return; return;
@ -33,15 +40,15 @@ void SizeDirective::parse(const std::string &value)
std::string suffix = number.substr(idx); std::string suffix = number.substr(idx);
if (suffix == "k") if (suffix == "k")
{ {
multiplier = 1024; multiplier = 1024UL;
} }
else if (suffix == "m") else if (suffix == "m")
{ {
multiplier = 1024 * 1024; multiplier = 1024UL * 1024UL;
} }
else if (suffix == "g") else if (suffix == "g")
{ {
multiplier = 1024 * 1024 * 1024; multiplier = 1024UL * 1024UL * 1024UL;
} }
else else
{ {

2
webserv/http/HttpHeaders.cpp
View File

@ -7,7 +7,7 @@
#include <cctype> // for tolower #include <cctype> // for tolower
#include <utility> // for pair #include <utility> // for pair
std::optional<size_t> HttpHeaders::getContentLength() const noexcept std::optional<size_t> HttpHeaders::getContentLength() const
{ {
const auto &value = this->get("Content-Length"); const auto &value = this->get("Content-Length");
if (value.empty()) if (value.empty())

2
webserv/http/HttpHeaders.hpp
View File

@ -26,7 +26,7 @@ class HttpHeaders
void remove(const std::string &name) noexcept; void remove(const std::string &name) noexcept;
[[nodiscard]] std::string toString() const noexcept; [[nodiscard]] std::string toString() const noexcept;
[[nodiscard]] std::optional<size_t> getContentLength() const noexcept; [[nodiscard]] std::optional<size_t> getContentLength() const;
[[nodiscard]] std::optional<std::string> getContentType() const noexcept; [[nodiscard]] std::optional<std::string> getContentType() const noexcept;
[[nodiscard]] std::optional<std::string> getHost() const noexcept; [[nodiscard]] std::optional<std::string> getHost() const noexcept;

13
webserv/http/HttpRequest.cpp
View File

@ -182,8 +182,17 @@ bool HttpRequest::parseBufferforChunkedBody()
} }
std::string chunkSizeStr = buffer_.substr(0, pos); std::string chunkSizeStr = buffer_.substr(0, pos);
Log::debug("Chunk size string: " + chunkSizeStr); Log::debug("Chunk size string: " + chunkSizeStr);
size_t chunkSize = utils::stoul(chunkSizeStr, 16); size_t chunkSize = 0;
Log::warning("Invalid chunk size: " + chunkSizeStr); try
{
chunkSize = utils::stoul(chunkSizeStr, 16);
}
catch (const std::exception &e)
{
Log::warning("Invalid chunk size: " + chunkSizeStr + " - " + e.what());
setState(State::ParseError);
return false;
}
if (chunkSize == 0) if (chunkSize == 0)
{ {
setState(State::Complete); // Last chunk setState(State::Complete); // Last chunk