42/42_INT_12_webserv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved most request errors check in Client

Browse Source 
+ bugfix of "Bad file descriptor" due to empty operator=() in Client
+ added a condition in _determine_location_COOP_FIX()
+ udpate memo.txt
+ need fix for index/autoindex (location "/list" dont work)
This commit is contained in:
LuckyLaszlo
2022-08-10 07:19:05 +02:00
parent 58f67bf42e
commit 86f7740984
13 changed files with 134 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
srcs/webserv/Webserv.hpp
View File

@@ -84,8 +84,8 @@ class Webserv
void _insert_status_line(Client *client);
void _error_html_response(Client *client);
void _append_body(Client *client, const std::string &body, const std::string &file_extension = "");
ServerConfig *_determine_process_server(Client *client); // cant be const cause of error_pages.operator[]
const LocationConfig *_determine_location(const ServerConfig &server, const std::string &path) const;
// ServerConfig *_determine_process_server(Client *client); // cant be const cause of error_pages.operator[]
// const LocationConfig *_determine_location(const ServerConfig &server, const std::string &path) const;
std::string _determine_file_extension(const std::string &path) const;
// method_get.cpp
void _get(Client *client);

6
srcs/webserv/close.cpp
View File

@@ -21,12 +21,6 @@ void Webserv::_close_client(int fd)
void Webserv::_close_all_clients()
{
/*
** BUG : (since last Hugo changes ? commit 482a389 ? or redirection problem ?)
** sometimes "err close(): Bad file descriptor"
** on fd>0 that should be valid (5, 6, ...)
** I seems to trigger the bug when i request multiples ressources before timeout
*/
while (!_clients.empty())
{
// _epoll_update(_clients.back().fd, 0, EPOLL_CTL_DEL); // normalement superflu, DEBUG

7
srcs/webserv/method_get.cpp
View File

@@ -109,16 +109,15 @@ void Webserv::_get_file(Client *client, const std::string &path)
}
else
{
std::streampos size = ifd.tellg();
// WIP : Chunk or not chunk (if filesize too big)
/* std::streampos size = ifd.tellg();
// WIP Low priority : Chunk or not chunk (if filesize too big)
if (size > MAX_FILESIZE)
{
// Then chunk
client->status = 500; // WIP temp
std::cerr << "File too large for non chunk body\n";
return ;
}
} */
ifd.seekg(0, std::ios::beg);
buf << ifd.rdbuf();

3
srcs/webserv/method_post.cpp
View File

@@ -43,9 +43,6 @@ void Webserv::_post_file(Client *client, const std::string &path)
else
{
// Content-Length useless at this point ?
// Maybe usefull in _read_request() for rejecting too big content.
// Need to _determine_process_server() as soon as possible,
// like in _read_request() for stopping read if body is too big ?
ofd << client->get_rq_body();
if (!ofd)
{

37
srcs/webserv/request.cpp
View File

@@ -1,8 +1,9 @@
#include "Webserv.hpp"
#define BUFSIZE 8192
#define MAX_HEADER_SIZE 42000 // arbitrary
// Arbitrary values
#define BUFSIZE 8192 // (8Ko)
#define MAX_HEADER_SIZE 16384 // (16Ko)
enum read_return
{
@@ -54,28 +55,19 @@ int Webserv::_read_request(Client *client) // Messy, Need refactoring
{
if (client->raw_request.find(CRLF CRLF) != std::string::npos)
{
// std::cerr << "Raw_request :\n|||||||||||||||||||||||||||||\n " << client->raw_request << "\n|||||||||||||||||||||||||||||\n"; // DEBUG
client->header_complete = true;
client->parse_request(); // TODO : split function to avoid useless parsing ?
if (client->status) // WIP, need to change client->parse_request() for status update
client->parse_request(_servers);
std::cerr << client->get_rq_method_str() << " " << client->get_rq_uri() << " " << client->get_rq_version() << "\n"; // DEBUG
if (client->status)
return READ_COMPLETE;
client->assigned_server = _determine_process_server(client);
client->assigned_location = _determine_location(*client->assigned_server, client->get_rq_abs_path());
if (client->get_rq_version().compare(0, sizeof("HTTP/1") - 1, "HTTP/1") != 0)
{ // TODO : move in Client parsing ?
client->status = 505;
if (client->get_rq_headers("Content-Type").empty() && client->get_rq_headers("Content-Length").empty()) // No body case
return READ_COMPLETE;
}
if (!client->get_rq_headers("Content-Length").empty()
&& ::atoi(client->get_rq_headers("Content-Length").c_str()) > (int)client->assigned_server->client_body_limit)
{
client->status = 413;
return READ_COMPLETE;
}
}
else if (client->raw_request.size() > MAX_HEADER_SIZE)
{
client->status = 400;
// 413 or 400 ? 413 seems common among http server, but don't fit perfectly.
client->status = 413;
return READ_COMPLETE;
}
}
@@ -89,17 +81,10 @@ int Webserv::_read_request(Client *client) // Messy, Need refactoring
}
if ((int)client->read_body_size >= ::atoi(client->get_rq_headers("Content-Length").c_str()))
{
client->parse_request(); // reparse for the body
client->parse_request_body();
return READ_COMPLETE;
}
}
if (client->header_complete && client->get_rq_headers("Content-Type").empty() && client->get_rq_headers("Content-Length").empty() )
{
return READ_COMPLETE;
}
return READ_IN_PROGRESS;
}

80
srcs/webserv/response.cpp
View File

@@ -69,22 +69,8 @@ void Webserv::_append_base_headers(Client *client)
void Webserv::_construct_response(Client *client)
{
// TODO : Move this in read(), stop read if content too large
if (client->get_rq_body().size() > client->assigned_server->client_body_limit)
{
client->status = 413;
return;
}
if (client->assigned_location->redirect_status)
{ // Weird behavior. Sometimes, the web browser seems to wait for a complete response until timeout.
// (for codes 301, 302, 303, 307, and 308)
client->status = client->assigned_location->redirect_status;
client->response.append("Location: ");
client->response.append(client->assigned_location->redirect_uri);
client->response.append(CRLF);
client->response.append(CRLF);
return ;
}
/* Switch between normal behavior or CGI here ?
maybe better than in _get(), _post(), ...*/
_process_method(client);
}
@@ -92,30 +78,17 @@ void Webserv::_process_method(Client *client)
{
std::cerr << "assigned_location->path = " << client->assigned_location->path << "\n"; // debug
std::cerr << "allow_methods = " << client->assigned_location->allow_methods << "\n"; // debug
if (client->get_rq_method() == UNKNOWN)
switch (client->get_rq_method())
{
client->status = 501;
}
else if (client->assigned_location->allow_methods & client->get_rq_method())
{
switch (client->get_rq_method())
{
case (GET):
_get(client); break;
case (POST):
_post(client); break;
case (DELETE):
_delete(client); break;
default:
break;
}
}
else
{
client->status = 405;
client->response.append("Allow: ");
client->response.append(::http_methods_to_str(client->assigned_location->allow_methods));
client->response.append(CRLF);
case (GET):
_get(client); break;
case (POST):
_post(client); break;
case (DELETE):
_delete(client); break;
default:
break;
}
}
@@ -165,7 +138,8 @@ void Webserv::_append_body(Client *client, const std::string &body, const std::s
client->response.append(body);
}
ServerConfig *Webserv::_determine_process_server(Client *client)
// Temporary Global Scope. Probably move to Client in the future.
ServerConfig *_determine_process_server(Client *client, std::vector<ServerConfig> &servers)
{
/*
http://nginx.org/en/docs/http/request_processing.html
@@ -174,22 +148,22 @@ ServerConfig *Webserv::_determine_process_server(Client *client)
*/
std::string const &server_name = client->get_rq_headers("Host");
std::vector<ServerConfig>::iterator it = _servers.begin();
std::vector<ServerConfig>::iterator default_server = _servers.end();
std::vector<ServerConfig>::iterator it = servers.begin();
std::vector<ServerConfig>::iterator default_server = servers.end();
while (it != _servers.end())
while (it != servers.end())
{
if (it->host == client->get_cl_lsocket()->host
&& it->port == client->get_cl_lsocket()->port)
{
if ( std::find(it->server_name.begin(), it->server_name.end(), server_name) != it->server_name.end() )
break;
else if (default_server == _servers.end())
else if (default_server == servers.end())
default_server = it;
}
++it;
}
if (it != _servers.end())
if (it != servers.end())
return (&(*it));
else
return (&(*default_server));
@@ -221,16 +195,20 @@ else
std::vector<LocationConfig>::const_iterator it = server.locations.begin();
while (it != server.locations.end())
{
if (it->path.size() > path.size()) // Warning : il faut aussi prendre en compte l'éventuel "/" final
if (it->path.size() > path.size())
{
++it;
continue;
// prendre en compte l'éventuel "/" final si location est un dossier
if (it->path.size()-1 > path.size() || it->path[it->path.size()-1] != '/')
{
++it;
continue;
}
}
if (path.compare(0, it->path.size(), it->path) == 0)
{
if (it->path.size() == path.size())
break;
else if (path[it->path.size() - 1] == '/')
else if (path[it->path.size()-1] == '/')
break;
}
++it;
@@ -241,8 +219,8 @@ else
return (&(server.locations.back()));
}
const LocationConfig *Webserv::_determine_location(const ServerConfig &server, const std::string &path) const
// Temporary Global Scope. Probably move to Client in the future.
const LocationConfig *_determine_location(const ServerConfig &server, const std::string &path)
{
std::cout << "determin location path sent: " << path << '\n';