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

Fixed big problem with CGI handling

Browse Source 
+ remains somes minors problems
This commit is contained in:
lperrey
2022-08-17 01:11:20 +02:00
parent 4dc70373f8
commit ccc542f52b
9 changed files with 96 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
srcs/webserv/run_loop.cpp
View File

@@ -4,104 +4,94 @@
#define MAX_EVENTS 42 // arbitrary
#define TIMEOUT 3000
// TODO: temp to move in own file
bool operator==(const cgi_pipe_rfd& lhs, int fd)
{ return lhs.fd == fd; }
bool operator==(int fd, const cgi_pipe_rfd& rhs)
{ return fd == rhs.fd; }
#define BUFSIZE 8192 // (8Ko)
#define STATUS_500 std::string("Status: 500" CRLF CRLF);
void Webserv::_read_cgi_output(cgi_pipe_rfd &cgi_fd)
void Webserv::_read_cgi_output(Client *client)
{
char buf[BUFSIZE];
ssize_t ret;
pid_t wait_ret;
std::cerr << "_read_cgi_output()" << "\n";
std::cerr << "cgi_pid = " << cgi_fd.cgi_pid << "\n";
std::cerr << "client fd = " << cgi_fd.client->get_cl_fd() << "\n";
std::cerr << "cgi fd = " << cgi_fd.fd << "\n";
std::cerr << "cgi_pid = " << client->cgi_pid << "\n";
std::cerr << "client fd = " << client->get_cl_fd() << "\n";
std::cerr << "cgi fd = " << client->cgi_pipe_rfd << "\n";
ret = ::read(cgi_fd.fd, buf, BUFSIZE);
ret = ::read(client->cgi_pipe_rfd, buf, BUFSIZE);
std::cerr << "cgi read ret = " << ret << "\n";
if (ret == -1)
{
std::perror("err read(cgi_fd)");
cgi_fd.client->cgi_output = STATUS_500;
client->cgi_output = STATUS_500;
}
else if (ret == 0)
{
std::cerr << "cgi read 0 :o" << "\n";
}
std::cerr << "Madame s'il vous plait, du Ketchup pour mon hamburger" << " (AKA:ret=0)" << "\n";
else
{
cgi_fd.client->cgi_output.append(buf, ret);
}
wait_ret = ::waitpid(cgi_fd.cgi_pid, NULL, WNOHANG);
std::cerr << "cgi waitpid ret = " << wait_ret << "\n";
if (wait_ret == 0 && ret == -1)
{
_epoll_update(cgi_fd.client->get_cl_fd(), EPOLLOUT, EPOLL_CTL_ADD);
_close_cgi_pipe_rfd(cgi_fd.fd);
// TODO: kill the child :)
}
else if (wait_ret == cgi_fd.cgi_pid)
{
_epoll_update(cgi_fd.client->get_cl_fd(), EPOLLOUT, EPOLL_CTL_ADD);
_close_cgi_pipe_rfd(cgi_fd.fd);
}
return;
client->cgi_output.append(buf, ret);
}
void Webserv::_handle_epoll_error_cgi_fd(uint32_t events, std::vector<cgi_pipe_rfd>::iterator it)
void Webserv::_handle_epoll_error_cgi_fd(uint32_t events, Client *client)
{
(void)events;
std::cerr << "cgi EPOLLERR" << "\n";
std::cerr << "cgi_pid = " << it->cgi_pid << "\n";
std::cerr << "client fd = " << it->client->get_cl_fd() << "\n";
std::cerr << "cgi fd = " << it->fd << "\n";
std::cerr << "cgi_pid = " << client->cgi_pid << "\n";
std::cerr << "client fd = " << client->get_cl_fd() << "\n";
std::cerr << "cgi fd = " << client->cgi_pipe_rfd << "\n";
pid_t wait_ret;
wait_ret = ::waitpid(it->cgi_pid, NULL, WNOHANG);
wait_ret = ::waitpid(client->cgi_pid, NULL, WNOHANG);
std::cerr << "cgi EPOLLHUP waitpid ret = " << wait_ret << "\n";
if (wait_ret == 0)
{
_epoll_update(it->client->get_cl_fd(), EPOLLOUT, EPOLL_CTL_ADD);
_close_cgi_pipe_rfd(it->fd);
_epoll_update(client->get_cl_fd(), EPOLLOUT, EPOLL_CTL_ADD);
if (::close(client->cgi_pipe_rfd) == -1)
std::perror("err close()");
// TODO: kill the child :)
}
else if (wait_ret == it->cgi_pid)
else if (wait_ret == client->cgi_pid)
{
_epoll_update(it->client->get_cl_fd(), EPOLLOUT, EPOLL_CTL_ADD);
_close_cgi_pipe_rfd(it->fd);
_epoll_update(client->get_cl_fd(), EPOLLOUT, EPOLL_CTL_ADD);
if (::close(client->cgi_pipe_rfd) == -1)
std::perror("err close()");
}
}
void Webserv::_cgi_epollhup(uint32_t events, std::vector<cgi_pipe_rfd>::iterator it)
void Webserv::_cgi_epollhup(uint32_t events, Client *client)
{
(void)events;
(void)client;
std::cerr << "cgi EPOLLHUP" << "\n";
std::cerr << "cgi_pid = " << it->cgi_pid << "\n";
std::cerr << "client fd = " << it->client->get_cl_fd() << "\n";
std::cerr << "cgi fd = " << it->fd << "\n";
std::cerr << "cgi_pid = " << client->cgi_pid << "\n";
std::cerr << "client fd = " << client->get_cl_fd() << "\n";
std::cerr << "cgi fd = " << client->cgi_pipe_rfd << "\n";
if (client->cgi_pipe_rfd)
{
if (::close(client->cgi_pipe_rfd) == -1)
std::perror("err close()");
}
client->cgi_pipe_rfd = 0;
pid_t wait_ret;
wait_ret = ::waitpid(it->cgi_pid, NULL, WNOHANG);
wait_ret = ::waitpid(client->cgi_pid, NULL, WNOHANG);
std::cerr << "cgi EPOLLHUP waitpid ret = " << wait_ret << "\n";
if (wait_ret == 0)
if (wait_ret == client->cgi_pid)
{
_epoll_update(it->client->get_cl_fd(), EPOLLOUT, EPOLL_CTL_ADD);
_close_cgi_pipe_rfd(it->fd);
// TODO: kill the child :)
_epoll_update(client->get_cl_fd(), EPOLLOUT, EPOLL_CTL_ADD);
}
else if (wait_ret == it->cgi_pid)
}
Client *Webserv::_find_cgi_fd(int cgi_fd)
{
std::vector<Client>::iterator it = _clients.begin();
std::vector<Client>::iterator it_end = _clients.end();
while (it != it_end)
{
_epoll_update(it->client->get_cl_fd(), EPOLLOUT, EPOLL_CTL_ADD);
_close_cgi_pipe_rfd(it->fd);
}
if (it->cgi_pipe_rfd == cgi_fd)
return (&(*it));
++it;
}
return (NULL);
}
void Webserv::run()
@@ -112,7 +102,7 @@ void Webserv::run()
int i;
int count_loop = 0;
std::vector<listen_socket>::iterator it_lsocket;
std::vector<cgi_pipe_rfd>::iterator it_cgi_fd;
Client *client_cgi = NULL;
g_run = true;
while (g_run)
@@ -135,7 +125,7 @@ void Webserv::run()
{
try {
it_lsocket = std::find(_listen_sockets.begin(), _listen_sockets.end(), events[i].data.fd);
it_cgi_fd = std::find(_cgi_pipe_rfds.begin(), _cgi_pipe_rfds.end(), events[i].data.fd); // Could be moved in the loop to avoid useless find() call
client_cgi = _find_cgi_fd(events[i].data.fd);
if (it_lsocket != _listen_sockets.end())
{
if (events[i].events & EPOLLERR || events[i].events & EPOLLHUP)
@@ -143,14 +133,14 @@ void Webserv::run()
else if (events[i].events & EPOLLIN)
_accept_connection(*it_lsocket);
}
else if (it_cgi_fd != _cgi_pipe_rfds.end())
else if (client_cgi)
{
if (events[i].events & EPOLLERR)
_handle_epoll_error_cgi_fd(events[i].events, it_cgi_fd);
else if (events[i].events & EPOLLHUP)
_cgi_epollhup(events[i].events, it_cgi_fd);
_handle_epoll_error_cgi_fd(events[i].events, client_cgi);
else if (events[i].events & EPOLLIN)
_read_cgi_output(*it_cgi_fd);
_read_cgi_output(client_cgi);
else if ( (events[i].events & EPOLLHUP) && !(events[i].events & EPOLLIN) )
_cgi_epollhup(events[i].events, client_cgi);
}
else
{