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

tmp: stash commit

Browse Source
This commit is contained in:
Quinten 2025-11-06 15:42:39 +01:00
parent b0ce1fb3c8
commit a52f27d6b7
16 changed files with 652 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
config/default.conf
View File

@ -8,6 +8,20 @@ error_page 500 ./htdocs/error_pages/500.html;
error_page 502 ./htdocs/error_pages/502.html;
error_page 504 ./htdocs/error_pages/504.html;
server {
listen 8085;
host 0.0.0.0;
server_name localhost;
default;
root htdocs/site-4/παράδειγμα;
location / {
autoindex on;
index index.html index.htm;
allowed_methods GET POST DELETE;
}
}
server {
listen 8080;
host 0.0.0.0;
@ -26,7 +40,7 @@ server {
error_page 502 ./htdocs/error_pages/502.html;
error_page 504 ./htdocs/error_pages/504.html;
client_max_body_size 1M;
# client_max_body_size 1M;
location / {
autoindex off;
@ -51,9 +65,10 @@ server {
location /test {
root ./htdocs/site-1/tester;
autoindex off;
index index.html;
index test.html;
allowed_methods GET;
}
location /redirect {
redirect 301 http://localhost:8081/;
allowed_methods GET POST;
@ -66,8 +81,9 @@ server {
index index2.html;
}
# cgi_enabled yes;
# cgi_handler .php /usr/bin/php-cgi;
cgi_enabled yes;
cgi_handler .php /usr/bin/php-cgi;
client_max_body_size 10M;
}
server {

38
htdocs/site-1/error_log.txt Executable file
View File

@ -0,0 +1,38 @@
[06-Nov-2025 15:22:10 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:22:10 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:22:39 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:22:39 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:24:46 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:24:46 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:25:28 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:25:28 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:28:55 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:28:55 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:30:00 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:30:00 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:32:31 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:32:31 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:32:59 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:32:59 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:33:15 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:33:15 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:33:47 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:33:47 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:33:54 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:33:54 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:34:02 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:34:02 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:34:08 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:34:08 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:36:24 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:36:24 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:36:44 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:36:44 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:37:34 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:37:34 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:37:57 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:37:57 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:38:21 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:38:21 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24
[06-Nov-2025 15:40:56 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 21
[06-Nov-2025 15:40:56 Europe/Berlin] PHP Warning: Array to string conversion in /home/qmennen/Documents/webserv/htdocs/site-1/upload.php on line 24

27
htdocs/site-1/upload.html Normal file
View File

@ -0,0 +1,27 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Upload</title>
</head>
<body>
<h1>Upload File</h1>
<form action="/upload.php" method="POST" enctype="multipart/form-data">
<div class="form-group">
<label for="fileToUpload">Choose file to upload:</label>
<input type="file" id="fileToUpload" name="fileToUpload" required>
<div class="file-info">
No file selected
</div>
</div>
<div class="form-group">
<input type="submit" value="Upload File">
</div>
</form>
</body>
</html>

39
htdocs/site-1/upload.php Normal file
View File

@ -0,0 +1,39 @@
<pre>
<?php
error_reporting(E_ALL);
ini_set('display_errors', 1);
ini_set('log_errors', 1);
ini_set('error_log', __DIR__ . '/error_log.txt');
$target_dir = "uploads/";
$target_file = $target_dir . basename($_FILES["fileToUpload"]["name"]);
$uploadOk = 1;
$imageFileType = strtolower(pathinfo($target_file,PATHINFO_EXTENSION));
// add debugging output to help trace issues
echo "\n=== POST Data ===\n";
$input = file_get_contents('php://input');
echo "Raw input length: " . strlen($input) . "\n";
echo "Raw input (first 200 chars): " . substr($input, 0, 200) . "\n";
echo "\n=== $_FILES ===\n";
var_dump($_FILES);
echo "\n=== $_POST ===\n";
var_dump($_POST);
// Check if $uploadOk is set to 0 by an error
if ($uploadOk == 0) {
echo "Sorry, your file was not uploaded.";
// if everything is ok, try to upload file
} else {
if (move_uploaded_file($_FILES["fileToUpload"]["tmp_name"], $target_file)) {
echo "The file ". htmlspecialchars( basename( $_FILES["fileToUpload"]["name"])). " has been uploaded.";
} else {
echo "Sorry, there was an error uploading your file.";
var_dump(error_get_last());
}
}
?>

11
htdocs/site-4/παράδειγμα/index.html Normal file
View File

@ -0,0 +1,11 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
</head>
<body>
iadijfaf
</body>
</html>

BIN
test_700kb.bin Normal file
View File

Binary file not shown.

4
webserv/client/Client.hpp
View File

@ -63,6 +63,6 @@ class Client
std::unordered_map<int, ASocket *> sockets_;
Server &server_;
void writeToCgi();
void readFromCgi();
// void writeToCgi();
// void readFromCgi();
};

4
webserv/handler/CgiEnvironment.cpp
View File

@ -10,6 +10,7 @@
#include <cstring> // for strcpy, size_t
#include <optional> // for optional
#include <utility> // for pair
#include <sys/stat.h>
CgiEnvironment::CgiEnvironment(const URI &uri, const HttpRequest &request)
{
@ -55,6 +56,9 @@ CgiEnvironment::CgiEnvironment(const URI &uri, const HttpRequest &request)
env_["HTTP_ACCEPT_LANGUAGE"] = headers.get("Accept-Language");
env_["HTTP_ACCEPT_ENCODING"] = headers.get("Accept-Encoding");
env_["UPLOAD_TMP_DIR"] = "./htdocs/tmp"; // Example upload directory, adjust as needed
env_["TMP_DIR"] = "./htdocs/tmp"; // Example temp directory, adjust as needed
appendCustomHeaders(headers);
}

244
webserv/handler/CgiHandler.cpp
View File

@ -2,18 +2,22 @@
#include <webserv/handler/CgiHandler.hpp>
#include <webserv/handler/CgiProcess.hpp> // for CgiProcess
#include <webserv/handler/ErrorHandler.hpp> // for ErrorHandler
#include <webserv/handler/URI.hpp> // for URI
#include <webserv/http/HttpRequest.hpp> // for HttpRequest
#include <webserv/http/HttpResponse.hpp> // for HttpResponse
#include <webserv/log/Log.hpp> // for Log, LOCATION
#include <webserv/socket/CgiSocket.hpp> // for CgiSocket
#include <webserv/socket/TimerSocket.hpp> // for TimerSocket
#include <webserv/handler/URI.hpp> // for URI
#include <webserv/utils/utils.hpp> // for trim
#include <algorithm>
#include <cerrno>
#include <cstddef>
#include <cstdlib>
#include <cstring>
#include <functional> // for function
#include <optional>
#include <string>
#include <utility> // for move
#include <sys/types.h> // for ssize_t
@ -28,7 +32,8 @@ void CgiHandler::handle()
{
Log::info("CgiHandler handling request");
if (request_.getUri().isCgi() && request_.getUri().getCgiPath().empty() && access(request_.getUri().getFullPath().c_str(), X_OK) != 0)
if (request_.getUri().isCgi() && request_.getUri().getCgiPath().empty()
&& access(request_.getUri().getFullPath().c_str(), X_OK) != 0)
{
ErrorHandler::createErrorResponse(403, response_);
return;
@ -41,6 +46,23 @@ void CgiHandler::handle()
Log::info("CGI process started and sockets registered");
}
static inline bool findHeaderEnd(const std::string &s, size_t &pos, long &sepSize)
{
Log::trace(LOCATION);
size_t a = s.find("\r\n\r\n");
size_t b = s.find("\n\n");
size_t c = s.find("\r\r");
size_t end = std::min({a, b, c});
if (end == std::string::npos)
{
return false;
}
sepSize = (end == a) ? 4 : 2;
pos = end;
return true;
}
void CgiHandler::write()
{
Log::trace(LOCATION);
@ -49,25 +71,36 @@ void CgiHandler::write()
Log::error("CGI stdin socket is null");
return;
}
if (request_.getBody().empty())
const std::string &body = request_.getBody();
size_t before = writeOffset_;
while (writeOffset_ < body.size())
{
Log::debug("No body to write to CGI stdin, fd: " + std::to_string(cgiStdIn_->getFd()));
request_.getClient().removeSocket(cgiStdIn_.get());
cgiStdIn_ = nullptr;
return;
}
ssize_t bytesWritten = cgiStdIn_->write(request_.getBody().data(), request_.getBody().size());
if (bytesWritten < 0)
const char *data = body.data() + writeOffset_; // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
size_t remaining = body.size() - writeOffset_;
size_t chunk = remaining > CHUNK_SIZE ? CHUNK_SIZE : remaining;
ssize_t bytesRead = cgiStdIn_->write(data, chunk);
if (bytesRead > 0)
{
Log::error("Failed to write to CGI stdin, fd: " + std::to_string(cgiStdIn_->getFd()));
writeOffset_ += static_cast<size_t>(bytesRead);
}
else
{
Log::debug("Wrote " + std::to_string(bytesWritten)
+ " bytes to CGI stdin, fd: " + std::to_string(cgiStdIn_->getFd()));
break; // would block or peer closed; try again on next EPOLLOUT
}
}
if (writeOffset_ >= body.size())
{
Log::debug("CGI stdin sent " + std::to_string(body.size()) + " bytes, closing write end");
request_.getClient().removeSocket(cgiStdIn_.get());
cgiStdIn_ = nullptr;
cgiStdIn_.reset();
bodyWriteCompleted_ = true;
}
else
{
Log::debug("Wrote " + std::to_string(writeOffset_ - before) + " bytes, write offset "
+ std::to_string(writeOffset_) + "/ " + std::to_string(body.size()));
// Log::debug("CGI stdin progress " + std::to_string(before) + "→" + std::to_string(writeOffset_));
}
}
void CgiHandler::read()
@ -75,31 +108,108 @@ void CgiHandler::read()
Log::trace(LOCATION);
if (cgiStdOut_ == nullptr)
{
Log::error("CGI stdout socket is null");
Log::debug("CGI stdout socket is null in read()");
return;
}
char buffer[bufferSize_] = {}; // NOLINT(cppcoreguidelines-avoid-c-arrays)
ssize_t bytesRead
= cgiStdOut_->read(buffer, sizeof(buffer) - 1); // NOLINT(cppcoreguidelines-pro-bounds-array-to-pointer-decay)
if (bytesRead < 0)
char buffer[bufferSize_] = {};
ssize_t bytesRead = cgiStdOut_->read(buffer, sizeof(buffer));
if (bytesRead > 0)
{
Log::error("Failed to read from CGI stdout, fd: " + std::to_string(cgiStdOut_->getFd()));
appendToBuffer(buffer, static_cast<size_t>(bytesRead));
Log::debug("Read " + std::to_string(bytesRead)
+ " bytes from CGI stdout (buffer size: " + std::to_string(buffer_.size()) + ")");
// Parse headers once, as soon as we have them
if (!headersParsed_)
{
size_t headerEnd = 0;
long sepSize = 0;
std::string snapshot(buffer_.begin(), buffer_.end());
if (findHeaderEnd(snapshot, headerEnd, sepSize))
{
std::string headers(snapshot.begin(), snapshot.begin() + static_cast<long>(headerEnd));
parseCgiHeaders(headers);
// After headers parsed, remove them from buffer_ so it contains only body
buffer_.erase(buffer_.begin(), buffer_.begin() + static_cast<long>(headerEnd) + sepSize);
headersParsed_ = true;
contentLength_ = response_.getHeaders().getContentLength();
Log::debug("CGI headers parsed, Content-Length: "
+ (contentLength_.has_value() ? std::to_string(contentLength_.value()) : "not set"));
}
else if (bytesRead == 0)
}
// Only finalize if we've finished writing the request body AND we have complete response
bool responseComplete = false;
if (headersParsed_ && contentLength_.has_value())
{
responseComplete = (buffer_.size() >= contentLength_.value());
}
if (bodyWriteCompleted_ && responseComplete)
{
Log::debug("Response complete: headers parsed and content received");
request_.getClient().removeSocket(cgiStdOut_.get());
cgiStdOut_.reset();
finalizeCgiResponse();
return;
}
return;
}
if (bytesRead == 0)
{
// EOF from CGI process
Log::info("CGI process closed stdout, fd: " + std::to_string(cgiStdOut_->getFd()));
request_.getClient().removeSocket(cgiStdOut_.get());
// request_.getClient().removeSocket(timerSocket_.get());
cgiStdOut_ = nullptr;
parseCgiOutput();
cgiStdOut_.reset();
// If headers not parsed yet, try once more
if (!headersParsed_)
{
size_t headerEnd = 0;
long sep = 0;
std::string snap(buffer_.begin(), buffer_.end());
if (findHeaderEnd(snap, headerEnd, sep))
{
std::string headers(snap.begin(), snap.begin() + static_cast<long>(headerEnd));
parseCgiHeaders(headers);
buffer_.erase(buffer_.begin(), buffer_.begin() + static_cast<long>(headerEnd) + sep);
headersParsed_ = true;
}
}
// Only finalize if we've finished writing the request body
if (bodyWriteCompleted_)
{
finalizeCgiResponse();
}
else
{
Log::warning("CGI process closed stdout before request body was completely written");
// Set error response but don't finalize until write is complete
// ErrorHandler::createErrorResponse(500, response_);
}
return;
}
if (bytesRead < 0)
{
if (errno == EAGAIN || errno == EWOULDBLOCK)
{
Log::debug("CGI stdout would block, will retry on next EPOLLIN");
return;
}
else
{
buffer[bytesRead] = '\0'; // NOLINT(cppcoreguidelines-pro-bounds-constant-array-index)
appendToBuffer(buffer, static_cast<size_t>(bytesRead));
Log::debug("Read " + std::to_string(bytesRead)
+ " bytes from CGI stdout, fd: " + std::to_string(cgiStdOut_->getFd()));
Log::error("Error reading from CGI stdout: " + std::string(strerror(errno)));
// Only finalize if write is complete
if (bodyWriteCompleted_)
{
finalizeCgiResponse();
}
}
}
}
@ -108,31 +218,27 @@ void CgiHandler::error()
Log::trace(LOCATION);
if (cgiStdErr_ == nullptr)
{
Log::error("CGI stderr socket is null");
return;
}
char buffer[bufferSize_] = {}; // NOLINT(cppcoreguidelines-avoid-c-arrays)
ssize_t bytesRead
= cgiStdErr_->read(buffer, sizeof(buffer) - 1); // NOLINT(cppcoreguidelines-pro-bounds-array-to-pointer-decay)
if (bytesRead < 0)
while (true)
{
Log::error("Failed to read from CGI stderr, fd: " + std::to_string(cgiStdErr_->getFd()));
}
else if (bytesRead == 0)
char buffer[bufferSize_] = {};
ssize_t bytesRead = cgiStdErr_->read(buffer, sizeof(buffer));
if (bytesRead > 0)
{
Log::info("CGI process closed stderr, fd: " + std::to_string(cgiStdErr_->getFd()));
request_.getClient().removeSocket(cgiStdErr_.get());
// request_.getClient().removeSocket(timerSocket_.get()); // todo maybe this dangerous
cgiStdErr_ = nullptr;
parseCgiOutput();
return;
}
else
{
buffer[bytesRead] = '\0'; // NOLINT(cppcoreguidelines-pro-bounds-constant-array-index)
appendToBuffer(buffer, static_cast<size_t>(bytesRead));
Log::error("CGI stderr output (fd: " + std::to_string(cgiStdErr_->getFd())
+ "): " + std::string(buffer, static_cast<size_t>(bytesRead)));
continue;
}
if (bytesRead == 0)
{
Log::info("CGI process closed stderr, fd: " + std::to_string(cgiStdErr_->getFd()));
request_.getClient().removeSocket(cgiStdErr_.get());
cgiStdErr_.reset();
break;
}
break;
}
}
@ -150,6 +256,12 @@ void CgiHandler::setCgiSockets(std::unique_ptr<CgiSocket> cgiStdIn, std::unique_
request_.getClient().addSocket(cgiStdIn_.get());
request_.getClient().addSocket(cgiStdOut_.get());
request_.getClient().addSocket(cgiStdErr_.get());
if (request_.getBody().empty())
{
request_.getClient().removeSocket(cgiStdIn_.get());
cgiStdIn_.reset();
}
}
void CgiHandler::wait() noexcept
@ -168,35 +280,24 @@ void CgiHandler::setPid(int pid)
void CgiHandler::parseCgiOutput()
{
Log::trace(LOCATION);
long headerSeperatorSize = 2;
// Parse the headers from the buffer
auto header = std::string(buffer_.begin(), buffer_.end());
size_t headerEnd = std::min({
header.find("\r\n\r\n"),
header.find("\n\n"),
header.find("\r\r"),
});
if (headerEnd == std::string::npos)
if (headersParsed_)
{
return;
}
size_t headerEnd = 0;
long sepSize = 0;
std::string header(buffer_.begin(), buffer_.end());
if (!findHeaderEnd(header, headerEnd, sepSize))
{
Log::debug("CGI output headers not complete yet");
return;
}
if (header.substr(static_cast<long>(headerEnd), 2) == "\r\n")
{
headerSeperatorSize = 4;
}
Log::debug("headerseperator: " + header.substr(static_cast<long>(headerEnd), 2));
// Parse the headers
std::string headers(buffer_.begin(), buffer_.begin() + static_cast<long>(headerEnd));
std::string headers(header.begin(), header.begin() + static_cast<long>(headerEnd));
Log::debug("CGI output headers: " + headers);
parseCgiHeaders(headers);
buffer_.erase(buffer_.begin(), buffer_.begin() + static_cast<long>(headerEnd) + headerSeperatorSize);
finalizeCgiResponse();
buffer_.erase(buffer_.begin(), buffer_.begin() + static_cast<long>(headerEnd) + sepSize);
headersParsed_ = true;
contentLength_ = response_.getHeaders().getContentLength();
}
void CgiHandler::parseCgiHeaders(std::string &headers)
@ -247,6 +348,8 @@ void CgiHandler::parseCgiHeaders(std::string &headers)
response_.addHeader(name, value);
}
}
contentLength_ = response_.getHeaders().getContentLength();
}
void CgiHandler::handleTimeout()
@ -275,9 +378,8 @@ void CgiHandler::finalizeCgiResponse()
{
Log::trace(LOCATION);
auto status = response_.getHeaders().get("Status");
wait();
if (cgiProcess_->getExitCode() > 0 && status.empty())
if (cgiProcess_ && cgiProcess_->getExitCode() > 0 && status.empty())
{
response_.setStatus(500);
}

7
webserv/handler/CgiHandler.hpp
View File

@ -4,6 +4,7 @@
#include <webserv/http/HttpRequest.hpp> // for HttpRequest
#include <webserv/socket/CgiSocket.hpp> // for CgiSocket
#include <cstddef>
#include <memory> // for unique_ptr
#include <string> // for string
#include <vector> // for vector
@ -36,6 +37,7 @@ class CgiHandler : public AHandler
void handleTimeout() override;
private:
constexpr static size_t CHUNK_SIZE = 32768;
constexpr static size_t bufferSize_ = 8192; // TODO: remove duplicate definition and move to configmanager
std::vector<uint8_t> buffer_;
@ -43,12 +45,17 @@ class CgiHandler : public AHandler
std::unique_ptr<CgiSocket> cgiStdIn_;
std::unique_ptr<CgiSocket> cgiStdOut_;
std::unique_ptr<CgiSocket> cgiStdErr_;
void parseCgiOutput();
void parseCgiHeaders(std::string &headers);
void finalizeCgiResponse();
void appendToBuffer(const char *data, size_t length);
int pid_ = -1;
size_t writeOffset_ = 0;
bool headersParsed_ = false;
bool bodyWriteCompleted_ = false;
std::optional<size_t> contentLength_;
void write();
void read();

254
webserv/handler/CgiHandler2.cpp2 Normal file
View File

@ -0,0 +1,254 @@
CgiHandler::CgiHandler(const HttpRequest &request, HttpResponse &response)
: AHandler(request, response), cgiProcess_(nullptr), cgiStdIn_(nullptr), cgiStdOut_(nullptr)
{
Log::debug("CgiHandler constructed");
bodyWriteOffset_ = 0;
headersParsed_ = false;
expectedBody_.reset();
}
void CgiHandler::setCgiSockets(std::unique_ptr<CgiSocket> cgiStdIn, std::unique_ptr<CgiSocket> cgiStdOut,
std::unique_ptr<CgiSocket> cgiStdErr)
{
cgiStdIn->setCallback([this]() { write(); });
cgiStdOut->setCallback([this]() { read(); });
cgiStdErr->setCallback([this]() { error(); });
cgiStdOut_ = std::move(cgiStdOut);
cgiStdIn_ = std::move(cgiStdIn);
cgiStdErr_ = std::move(cgiStdErr);
request_.getClient().addSocket(cgiStdIn_.get());
request_.getClient().addSocket(cgiStdOut_.get());
request_.getClient().addSocket(cgiStdErr_.get());
// Ensure stdout/stderr are set to READ interest; stdin to WRITE only if there's a body
cgiStdOut_->setIOState(ASocket::IoState::READ);
cgiStdOut_->markDirty();
cgiStdErr_->setIOState(ASocket::IoState::READ);
cgiStdErr_->markDirty();
if (!request_.getBody().empty())
{
cgiStdIn_->setIOState(ASocket::IoState::WRITE);
cgiStdIn_->markDirty();
}
else
{
request_.getClient().removeSocket(cgiStdIn_.get());
cgiStdIn_.reset();
}
}
void CgiHandler::write()
{
Log::trace(LOCATION);
if (!cgiStdIn_) return;
const std::string &body = request_.getBody();
if (bodyWriteOffset_ >= body.size())
{
request_.getClient().removeSocket(cgiStdIn_.get());
cgiStdIn_.reset();
return;
}
// Stream body until pipe stops accepting data; no errno checks needed (level-triggered epoll)
size_t before = bodyWriteOffset_;
while (bodyWriteOffset_ < body.size())
{
const char *data = body.data() + bodyWriteOffset_;
size_t remain = body.size() - bodyWriteOffset_;
size_t chunk = remain > 32768 ? 32768 : remain;
ssize_t n = cgiStdIn_->write(data, chunk);
if (n > 0)
{
bodyWriteOffset_ += static_cast<size_t>(n);
}
else
{
break; // would block or peer closed; try again on next EPOLLOUT
}
}
if (bodyWriteOffset_ >= body.size())
{
Log::debug("CGI stdin sent " + std::to_string(body.size()) + " bytes, closing write end");
request_.getClient().removeSocket(cgiStdIn_.get());
cgiStdIn_.reset();
}
else
{
Log::debug("CGI stdin progress " + std::to_string(before) + "→" + std::to_string(bodyWriteOffset_));
cgiStdIn_->setIOState(ASocket::IoState::WRITE);
cgiStdIn_->markDirty();
}
}
static inline bool findHeaderEnd(const std::string &s, size_t &pos, long &sepSize)
{
size_t a = s.find("\r\n\r\n");
size_t b = s.find("\n\n");
size_t c = s.find("\r\r");
size_t end = std::min({a, b, c});
if (end == std::string::npos) return false;
sepSize = (end == a) ? 4 : 2;
pos = end;
return true;
}
void CgiHandler::read()
{
Log::trace(LOCATION);
if (!cgiStdOut_) return;
// Drain as much as available this callback
for (;;)
{
char buffer[bufferSize_] = {};
ssize_t n = cgiStdOut_->read(buffer, sizeof(buffer));
if (n > 0)
{
appendToBuffer(buffer, static_cast<size_t>(n));
// Parse headers once, as soon as we have them
if (!headersParsed_)
{
size_t headerEnd = 0;
long sepSize = 0;
std::string snapshot(buffer_.begin(), buffer_.end());
if (findHeaderEnd(snapshot, headerEnd, sepSize))
{
std::string headers(snapshot.begin(), snapshot.begin() + static_cast<long>(headerEnd));
parseCgiHeaders(headers);
// After headers parsed, remove them from buffer_ so it contains only body
buffer_.erase(buffer_.begin(), buffer_.begin() + static_cast<long>(headerEnd) + sepSize);
headersParsed_ = true;
// Capture expected body size if provided
std::string cl = response_.getHeaders().get("Content-Length");
if (!cl.empty())
{
expectedBody_ = static_cast<size_t>(std::strtoul(cl.c_str(), nullptr, 10));
}
else
{
expectedBody_.reset();
}
}
}
// If we know Content-Length and already have it, finalize
if (headersParsed_ && expectedBody_.has_value() && buffer_.size() >= expectedBody_.value())
{
request_.getClient().removeSocket(cgiStdOut_.get());
cgiStdOut_.reset();
finalizeCgiResponse();
return;
}
continue; // try to read more this tick
}
else if (n == 0)
{
// EOF → finalize with whatever body we have
Log::info("CGI process closed stdout, fd: " + std::to_string(cgiStdOut_->getFd()));
request_.getClient().removeSocket(cgiStdOut_.get());
cgiStdOut_.reset();
// If headers not parsed yet, try once more (some scripts may end with only headers)
if (!headersParsed_)
{
size_t headerEnd = 0;
long sep = 0;
std::string snap(buffer_.begin(), buffer_.end());
if (findHeaderEnd(snap, headerEnd, sep))
{
std::string headers(snap.begin(), snap.begin() + static_cast<long>(headerEnd));
parseCgiHeaders(headers);
buffer_.erase(buffer_.begin(), buffer_.begin() + static_cast<long>(headerEnd) + sep);
headersParsed_ = true;
}
}
finalizeCgiResponse();
return;
}
else
{
// Would block or transient error; wait for next EPOLLIN
break;
}
}
}
void CgiHandler::error()
{
Log::trace(LOCATION);
if (!cgiStdErr_) return;
for (;;)
{
char buffer[bufferSize_] = {};
ssize_t n = cgiStdErr_->read(buffer, sizeof(buffer));
if (n > 0)
{
appendToBuffer(buffer, static_cast<size_t>(n));
Log::error("CGI stderr output (fd: " + std::to_string(cgiStdErr_->getFd())
+ "): " + std::string(buffer, static_cast<size_t>(n)));
continue;
}
else if (n == 0)
{
Log::info("CGI process closed stderr, fd: " + std::to_string(cgiStdErr_->getFd()));
request_.getClient().removeSocket(cgiStdErr_.get());
cgiStdErr_.reset();
break;
}
else
{
break;
}
}
}
void CgiHandler::parseCgiOutput()
{
// Changed: only parse headers if present; do NOT finalize here
Log::trace(LOCATION);
if (headersParsed_) return;
size_t headerEnd = 0;
long sepSize = 0;
std::string header(buffer_.begin(), buffer_.end());
if (!findHeaderEnd(header, headerEnd, sepSize))
{
Log::debug("CGI output headers not complete yet");
return;
}
std::string headers(header.begin(), header.begin() + static_cast<long>(headerEnd));
Log::debug("CGI output headers: " + headers);
parseCgiHeaders(headers);
buffer_.erase(buffer_.begin(), buffer_.begin() + static_cast<long>(headerEnd) + sepSize);
headersParsed_ = true;
std::string cl = response_.getHeaders().get("Content-Length");
if (!cl.empty())
expectedBody_ = static_cast<size_t>(std::strtoul(cl.c_str(), nullptr, 10));
else
expectedBody_.reset();
}
void CgiHandler::parseCgiHeaders(std::string &headers)
{
Log::trace(LOCATION);
// ...existing code...
// At end, capture Content-Length if present
std::string cl = response_.getHeaders().get("Content-Length");
if (!cl.empty()) expectedBody_ = static_cast<size_t>(std::strtoul(cl.c_str(), nullptr, 10));
// ...existing code...
}
void CgiHandler::finalizeCgiResponse()
{
Log::trace(LOCATION);
auto status = response_.getHeaders().get("Status");
wait();
if (cgiProcess_ && cgiProcess_->getExitCode() > 0 && status.empty())
{
response_.setStatus(500);
}
else if (!status.empty())
{
response_.setStatus(std::atoi(status.c_str()));
}
// Append only the body (headers already stripped)
response_.appendBody(buffer_);
response_.setComplete();
buffer_.clear();
}

47
webserv/handler/UploadHandler.cpp Normal file
View File

@ -0,0 +1,47 @@
#include "webserv/handler/UploadHandler.hpp"
#include "webserv/handler/ErrorHandler.hpp"
#include "webserv/handler/URI.hpp"
#include "webserv/http/HttpConstants.hpp"
#include <webserv/log/Log.hpp> // for Log, LOCATION
#include <fstream>
UploadHandler::UploadHandler(const HttpRequest &request, HttpResponse &response) : AHandler(request, response) {}
void UploadHandler::handle()
{
Log::trace(LOCATION);
std::string fullPath = request_.getUri().getFullPath();
if (fullPath.empty())
{
Log::warning("UploadHandler: Invalid path for UPLOAD");
ErrorHandler::createErrorResponse(Http::StatusCode::BAD_REQUEST, response_, request_.getUri().getConfig());
return;
}
uploadFile(fullPath, request_.getBody());
}
void UploadHandler::uploadFile(const std::string &path, const std::string &data)
{
Log::trace(LOCATION);
std::ofstream fileStream{path.c_str(), std::ios::binary};
if (!fileStream)
{
Log::error("UploadHandler: Failed to open file for upload: " + path);
ErrorHandler::createErrorResponse(Http::StatusCode::FORBIDDEN, response_, request_.getUri().getConfig());
return;
}
fileStream.write(data.c_str(), data.size());
fileStream.close();
response_.setStatus(Http::StatusCode::CREATED);
response_.setComplete();
}
void UploadHandler::handleTimeout()
{
Log::warning("UploadHandler: Upload operation timed out");
ErrorHandler::createErrorResponse(504, response_, request_.getUri().getConfig());
}

15
webserv/handler/UploadHandler.hpp Normal file
View File

@ -0,0 +1,15 @@
#pragma once
#include <webserv/handler/AHandler.hpp> // for AHandler
class UploadHandler : public AHandler
{
public:
UploadHandler(const HttpRequest &request, HttpResponse &response);
void handle() override;
void handleTimeout() override;
private:
void uploadFile(const std::string &path, const std::string &data);
};

10
webserv/socket/ASocket.cpp
View File

@ -36,10 +36,7 @@ ssize_t ASocket::read(void *buf, size_t len) const
{
Log::trace(LOCATION);
ssize_t bytesRead = ::recv(fd_, buf, len, 0);
if (bytesRead == -1)
{
throw std::system_error(errno, std::generic_category(), "Socket: Read error");
}
return bytesRead;
}
@ -47,10 +44,7 @@ ssize_t ASocket::write(const void *buf, size_t len) const
{
Log::trace(LOCATION);
ssize_t bytesSent = ::send(fd_, buf, len, 0);
if (bytesSent == -1)
{
throw std::system_error(errno, std::generic_category(), "Socket: Write error");
}
return bytesSent;
}

8
webserv/socket/CgiSocket.cpp
View File

@ -22,10 +22,6 @@ ssize_t CgiSocket::read(void *buf, size_t len) const
{
Log::trace(LOCATION);
ssize_t bytesRead = ::read(getFd(), buf, len);
if (bytesRead == -1)
{
throw std::system_error(errno, std::generic_category(), "Socket: Read error");
}
return bytesRead;
}
@ -33,9 +29,5 @@ ssize_t CgiSocket::write(const void *buf, size_t len) const
{
Log::trace(LOCATION);
ssize_t bytesSent = ::write(getFd(), buf, len);
if (bytesSent == -1)
{
throw std::system_error(errno, std::generic_category(), "Socket: Write error");
}
return bytesSent;
}

10
webserv/socket/TimerSocket.cpp
View File

@ -53,10 +53,7 @@ ssize_t TimerSocket::read(void *buf, size_t len) const
{
Log::trace(LOCATION);
ssize_t bytesRead = ::read(getFd(), buf, len);
if (bytesRead == -1)
{
throw std::system_error(errno, std::generic_category(), "Socket: Read error");
}
return bytesRead;
}
@ -64,9 +61,6 @@ ssize_t TimerSocket::write(const void *buf, size_t len) const
{
Log::trace(LOCATION);
ssize_t bytesSent = ::write(getFd(), buf, len);
if (bytesSent == -1)
{
throw std::system_error(errno, std::generic_category(), "Socket: Write error");
}
return bytesSent;
}