roman/webserv
1
0
Fork 0
mirror of https://github.com/3lswear/webserv.git synced 2025-10-28 21:07:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

add error handling for 400 and 414 error-code

Browse Source
This commit is contained in:
Talyx
2022-02-22 19:51:54 +03:00
parent 5a2cbaefe3
commit 3f24c3f7eb
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Client/Request.cpp
View File

@@ -235,6 +235,9 @@ void Request::splitData(std::string &data)
_head = tmp; _head = tmp;
_head_ok = true; _head_ok = true;
parseHeader(); parseHeader();
if (_URI.size() > 100)
_ret = 414;
// else if (_row > 20)
if ((_contentLength == 0 && !_chunked) || (_method == "GET" if ((_contentLength == 0 && !_chunked) || (_method == "GET"
|| _method == "DELETE" || _method == "HEAD")) || _method == "DELETE" || _method == "HEAD"))
_body_ok = true; _body_ok = true;
@@ -243,7 +246,10 @@ void Request::splitData(std::string &data)
} }
} }
if (badCode(_ret)) if (badCode(_ret))
{
_body_ok = true;
return ; return ;
}
else if (_chunked && !_body_ok) else if (_chunked && !_body_ok)
{ {
_body->insert(_body->end(), str.begin(), str.end()); _body->insert(_body->end(), str.begin(), str.end());
@@ -281,18 +287,23 @@ void Request::splitData(std::string &data)
int Request::parseClientfield(std::string str) int Request::parseClientfield(std::string str)
{ {
int distance; int distance;
int sp;
std::string key; std::string key;
std::string value; std::string value;
distance = str.find(":"); distance = str.find(":");
sp = str.find(" ");
if (distance < 0 && str != "\r") if (distance < 0 && str != "\r")
return 200; return 200;
if (sp < distance)
return 400;
key = str.substr(0, distance); key = str.substr(0, distance);
std::transform(key.begin(), key.end(), key.begin(), ::tolower); std::transform(key.begin(), key.end(), key.begin(), ::tolower);
value = str.erase(0, distance + 1); value = str.erase(0, distance + 1);
if (_headerField.find(key) != _headerField.end()) if (_headerField.find(key) != _headerField.end())
{ {
std::cout << RED << "ERROR: double Client-field" << ZERO_C << std::endl; DBOUT << WARNING << getDebugTime() << FAIL << " [Pars-error] : [double header-field: " << key << " ] [method: "
<< _method << " ]" << " [target: " << _URI << " ]" << ENDL;
} }
else else
{ {