42_adjoly/webserv
1
0
Fork 0
mirror of https://github.com/KeyZox71/webserv.git synced 2025-07-15 22:56:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

「✨」 feat: added timeout to cgi

Browse Source
This commit is contained in:
Adam JOLY
2025-07-02 13:04:00 +02:00
parent f1a1001846
commit 954574b43a
8 changed files with 68 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
includes/server/Cgi.hpp
View File

@ -6,14 +6,17 @@
/* By: gadelbes <gadelbes@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/24 13:46:34 by gadelbes #+# #+# */
/* Updated: 2025/07/01 11:21:31 by adjoly ### ########.fr */
/* Updated: 2025/07/02 12:50:20 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
#pragma once
#include "server/PfdManager.hpp"
#include <config/default.hpp>
#include <cstddef>
#include <cstdio>
#include <ctime>
#include <server/AResource.hpp>
#include <exception>
@ -23,6 +26,8 @@
#include <sstream>
#include <string>
#include <unistd.h>
#include <wait.h>
namespace webserv {
namespace http {
class Get;
@ -62,16 +67,25 @@ class Cgi : public server::AClientResource {
}
if (static_cast<CgiIn *>(ResourceManager::get(_stdin_pipe[PIPE_WRITE]))
->isProcessed() == true) {
std::cout << "in "
<< ResourceManager::get(_stdin_pipe[PIPE_WRITE])->getId()
<< std::endl;
std::cout << ResourceManager::get(_stdin_pipe[PIPE_WRITE])->type() << std::endl;
_log->debug("CGIIII post readyyy");
return true;
}
return false;
}
bool isTimedout(void) const {
if (!isProcessed() && isReady()) {
return false;
}
if (std::difftime(std::time(NULL), _start_time) >= 1) {
kill(_forkPid, SIGKILL);
waitpid(_forkPid, NULL, 0);
_log->warn("Cgi close due to timeout >= 1s");
return true;
}
return false;
}
protected:
private:
bool _is_post;
@ -99,6 +113,9 @@ class Cgi : public server::AClientResource {
int _stdin_pipe[2]; // The pipefd for the stdin of the cgi in the case of a
// post
int _stdout_pipe[2]; // The pipefd for the stdout of the cgi
std::time_t _start_time; // To use for timeout
pid_t _forkPid; // Can be used to kill the process
};
}; // namespace server

3
includes/server/CgiIn.hpp
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/13 18:14:45 by adjoly #+# #+# */
/* Updated: 2025/07/02 11:35:04 by adjoly ### ########.fr */
/* Updated: 2025/07/02 11:56:36 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -35,7 +35,6 @@ class CgiIn : public AClientResource {
~CgiIn(void) { log("➖", "CgiIn", "destructor called"); }
void process(void) {
std::cout << "process" << std::endl;
_processed = true;
ssize_t bytes_written = write(_fd, _body.c_str(), _body.size());
_log->debug("writting body : " + _body);