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

Merge branch 'hugo4'

Browse Source
This commit is contained in:
Hugo LAMY
2022-08-15 00:32:47 +02:00
parent 8000668b36 f6f63931ad
commit a6bfea3b56
14 changed files with 395 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1,6 +1,6 @@
NAME = webserv NAME = webserv
CXX = clang++ CXX = c++
CXXFLAGS = -Wall -Wextra #-Werror CXXFLAGS = -Wall -Wextra #-Werror
CXXFLAGS += $(HEADERS_D:%=-I%) CXXFLAGS += $(HEADERS_D:%=-I%)

2
default.config
View File

@@ -43,7 +43,7 @@ server {
location /cgi-bin { location /cgi-bin {
root ./srcs/cgi-bin/; root ./srcs/cgi-bin/;
cgi_ext cpp php sh; cgi_ext out php sh;
} }
location /cgi-bin { location /cgi-bin {

5
srcs/Client.cpp
View File

@@ -215,18 +215,13 @@ void Client::fill_script_path(std::string &path, size_t pos)
{ {
std::string tmp; std::string tmp;
/*DEBUG*/ std::cout << "\n" << B_PURPLE << "debug path dot" << RESET << "\npath:[" << path << "]\n" << "&path[pos]:[" << &path[pos] << "]\n";
if (path[0] == '.') if (path[0] == '.')
{ {
path.erase(0, 1); path.erase(0, 1);
pos--; pos--;
} }
/*DEBUG*/ std::cout << "path:[" << path << "]\n" << "&path[pos]:[" << &path[pos] << "]\n";
_request.script.path = path.substr(0, pos); _request.script.path = path.substr(0, pos);
/*DEBUG*/ std::cout << "script_path:[" << _request.script.path << "]\n";
_request.script.info = path.substr(pos); _request.script.info = path.substr(pos);
/*DEBUG*/ std::cout << "script_info:[" << _request.script.info << "]\n" << B_PURPLE << "end debug path dot" << RESET << "\n";
} }
void Client::clear() void Client::clear()

BIN
srcs/cgi-bin/cgi.cpp
View File

Binary file not shown.

114
srcs/cgi-bin/cgi_cpp.cpp Normal file
View File

@@ -0,0 +1,114 @@
# include <iostream>
# include <string>
# include <sstream>
# include <vector>
# include <stdlib.h> // getenv
# define CR "\r"
# define LF "\n"
# define CRLF CR LF
# define NPOS std::string::npos
std::string trim(std::string str, char del)
{
size_t pos;
// delete leadings del
pos = str.find_first_not_of(del);
if (pos == NPOS)
pos = str.size();
str = str.substr(pos);
// delete trailing del
pos = str.find_last_not_of(del);
if (pos != NPOS)
str = str.substr(0, pos + 1);
return str;
}
std::vector<std::string>
split(const std::string & input, std::string delim, char ctrim = '\0')
{
std::vector<std::string> split_str;
std::string tmp;
size_t start = 0;
size_t end = 0;
size_t len = 0;
while (end != NPOS)
{
end = input.find(delim, start);
len = end - start;
if (end == NPOS)
len = end;
tmp = input.substr(start, len);
if (ctrim != '\0')
tmp = trim(tmp, ctrim);
if (tmp.size() != 0)
split_str.push_back( tmp );
start = end + delim.size();
}
return split_str;
}
int main (int ac, char **av, char **en)
{
std::vector<std::string> split_str;
std::vector<std::string> sub_split_str;
std::vector<std::string>::const_iterator it;
char * tmp;
std::string input;
std::string http_header;
std::string http_body;
std::ostringstream strs;
size_t pos;
std::cin >> input;
http_header = "Content-Type: text/html; charset=UTF-8" CRLF;
http_header += "Content-Length: ";
http_body = "\
<!DOCTYPE html>\
<html>\
<head>\
<title>CGI</title>\
</head>\
<body>\
<h2>cgi</h2>\
";
http_body += "<h3>";
tmp = getenv("REQUEST_METHOD");
if (tmp != NULL)
http_body += tmp;
else
http_body = "method not foud";
http_body += "</h3>";
split_str = split(input, "&");
for (it = split_str.begin(); it != split_str.end(); ++it)
{
sub_split_str = split(*it, "=");
http_body += "<h3>";
http_body += sub_split_str[0];
http_body += "</h3>";
http_body += "<p>";
http_body += sub_split_str[1];
http_body += "</p>";
}
http_body += "\
</body>\
</html>\
";
strs << http_body.size();
http_header += strs.str();
http_header += CRLF CRLF;
std::cout << http_header << CRLF CRLF << http_body;
return 0;
}

133
srcs/cgi-bin/cgi_cpp_content_length.cpp Normal file
View File

@@ -0,0 +1,133 @@
# include <iostream>
# include <string>
# include <sstream>
# include <vector>
# include <stdlib.h> // getenv
# define CR "\r"
# define LF "\n"
# define CRLF CR LF
# define NPOS std::string::npos
std::string trim(std::string str, char del)
{
size_t pos;
// delete leadings del
pos = str.find_first_not_of(del);
if (pos == NPOS)
pos = str.size();
str = str.substr(pos);
// delete trailing del
pos = str.find_last_not_of(del);
if (pos != NPOS)
str = str.substr(0, pos + 1);
return str;
}
std::vector<std::string>
split(const std::string & input, std::string delim, char ctrim = '\0')
{
std::vector<std::string> split_str;
std::string tmp;
size_t start = 0;
size_t end = 0;
size_t len = 0;
while (end != NPOS)
{
end = input.find(delim, start);
len = end - start;
if (end == NPOS)
len = end;
tmp = input.substr(start, len);
if (ctrim != '\0')
tmp = trim(tmp, ctrim);
if (tmp.size() != 0)
split_str.push_back( tmp );
start = end + delim.size();
}
return split_str;
}
int main (int ac, char **av, char **en) {
std::vector<std::string> split_str;
std::vector<std::string> sub_split_str;
std::vector<std::string>::const_iterator it;
char * tmp;
std::string output;
std::ostringstream strs;
size_t pos;
std::cout << "Content-Type: text/html; charset=UTF-8" << CRLF CRLF;
std::cout
<< "<!DOCTYPE html>"
<< "<html>"
<< "<head>"
<< " <title>CGI</title>"
<< "</head>"
<< "<body>"
<< " <h2>cgi</h2>"
<< " <h3>";
tmp = getenv("REQUEST_METHOD");
if (tmp != NULL)
output = tmp;
else
output = "method not foud";
std::cout
<< output
<< " </h3>"
<< " <h3>http-request-body-message content :</h3>";
std::cin >> output;
split_str = split(output, "&");
output.clear();
for (it = split_str.begin(); it != split_str.end(); ++it)
{
sub_split_str = split(*it, "=");
std::cout
<< "<p>"
<< sub_split_str[0]
<< " : "
<< sub_split_str[1]
<< "</p>";
}
tmp = getenv("QUERY_STRING");
if (tmp == NULL)
std::cout << "query not foud";
std::cout
<< " <h3>http-uri-query content :</h3>";
output = tmp;
split_str = split(output, "&");
output.clear();
for (it = split_str.begin(); it != split_str.end(); ++it)
{
sub_split_str = split(*it, "=");
std::cout
<< "<h3>"
<< sub_split_str[0]
<< "</h3>"
<< "<p>"
<< sub_split_str[1]
<< "</p>";
}
std::cout
<< "</body>"
<< "</html>";
return 0;
}

2
srcs/utils.cpp
View File

@@ -226,7 +226,7 @@ std::string
begin = str.rfind(delim, pos); begin = str.rfind(delim, pos);
if (begin == NPOS) if (begin == NPOS)
begin = 0; begin = 0;
else else if (begin < pos)
begin += delim.size(); begin += delim.size();
end = str.find(delim, pos); end = str.find(delim, pos);

2
srcs/webserv/Webserv.hpp
View File

@@ -114,6 +114,8 @@ class Webserv
void _check_script_output(Client *client, std::string & output); void _check_script_output(Client *client, std::string & output);
void _check_script_status(Client *client, std::string & output); void _check_script_status(Client *client, std::string & output);
void _check_script_fields(Client *client, std::string & output); void _check_script_fields(Client *client, std::string & output);
void _add_script_body_length_header(std::string & output);
void _remove_body_leading_empty_lines(std::string & output);
// epoll_update.cpp // epoll_update.cpp
int _epoll_update(int fd, uint32_t events, int op); int _epoll_update(int fd, uint32_t events, int op);
int _epoll_update(int fd, uint32_t events, int op, void *ptr); int _epoll_update(int fd, uint32_t events, int op, void *ptr);

77
srcs/webserv/cgi_script.cpp
View File

@@ -11,7 +11,6 @@ bool Webserv::_is_cgi(Client *client, std::string path)
while (pos != NPOS) while (pos != NPOS)
{ {
pos = _cgi_pos(client, path, pos); pos = _cgi_pos(client, path, pos);
/*DEBUG*/ std::cout << "pos:" << pos << "\n&path[pos]:" << &path[pos] << "\n" << B_YELLOW << "fin debug _cgi_pos()\n\n" << RESET;
if (pos == NPOS) if (pos == NPOS)
break; break;
client->fill_script_path(path, pos); client->fill_script_path(path, pos);
@@ -27,7 +26,6 @@ bool Webserv::_is_cgi(Client *client, std::string path)
} }
} }
client->clear_script(); client->clear_script();
client->clear_script();
client->status = file_mode; // 404 not_found OR 403 forbidden client->status = file_mode; // 404 not_found OR 403 forbidden
return false; return false;
} }
@@ -40,25 +38,20 @@ size_t Webserv::_cgi_pos(Client *client, std::string &path, size_t pos)
size_t len; size_t len;
std::locale loc; // for isalpha() std::locale loc; // for isalpha()
/*DEBUG*/ it = client->assigned_location->cgi_ext.begin(); std::cout << B_YELLOW << "\nDEBUG _cgi_pos()\n" << RESET << "vector_ext.size():[" << client->assigned_location->cgi_ext.size() << "]\n\n";
v_ext = client->assigned_location->cgi_ext; v_ext = client->assigned_location->cgi_ext;
if (v_ext.empty()) if (v_ext.empty())
return NPOS; return NPOS;
/*DEBUG*/ std::cout << "ext:[" << *it << "]\n" << "path:[" << path << "]\n\n";
it_end = client->assigned_location->cgi_ext.end(); it_end = client->assigned_location->cgi_ext.end();
while (pos < path.size()) while (pos < path.size())
{ {
/*DEBUG*/ std::cout << "\nwhile\n";
if (path.compare(pos, 2, "./") == 0) if (path.compare(pos, 2, "./") == 0)
pos += 2; pos += 2;
/*DEBUG*/ std::cout << "&path[pos]:[" << &path[pos] << "]\n";
pos = path.find('.', pos); pos = path.find('.', pos);
if (pos == NPOS) if (pos == NPOS)
return pos; return pos;
it = client->assigned_location->cgi_ext.begin(); it = client->assigned_location->cgi_ext.begin();
for ( ; it != it_end; ++it) for ( ; it != it_end; ++it)
{ {
/*DEBUG*/ std::cout << " for\n"; std::cout << " &path[pos]:[" << &path[pos] << "]\n" << " *it:[" << *it << "]\n" << " (*it).size():[" << (*it).size() << "]\n" << " path.substr(pos, (*it).size()):[" << path.substr(pos + 1, (*it).size()) << "]\n\n";
len = (*it).size(); len = (*it).size();
if (path.compare(pos + 1, len, *it) == 0) if (path.compare(pos + 1, len, *it) == 0)
if ( !std::isalpha(path[pos + 1 + len], loc) ) if ( !std::isalpha(path[pos + 1 + len], loc) )
@@ -147,8 +140,6 @@ std::string Webserv::_exec_script(Client *client, char **env)
std::string body = client->get_rq_body(); std::string body = client->get_rq_body();
int fd_in[2]; int fd_in[2];
int fd_out[2]; int fd_out[2];
int save_in = dup(STDIN_FILENO);
int save_out = dup(STDOUT_FILENO);
std::string path; std::string path;
pipe(fd_in); pipe(fd_in);
@@ -157,21 +148,22 @@ std::string Webserv::_exec_script(Client *client, char **env)
pid = fork(); pid = fork();
if (pid == -1) if (pid == -1)
std::cerr << "fork crashed" << std::endl; std::cerr << "fork crashed" << std::endl;
else if (pid == 0) else if (pid == 0) // child
{ {
close(FD_WR_TO_CHLD); close(FD_WR_TO_CHLD);
close(FD_RD_FR_CHLD); close(FD_RD_FR_CHLD);
dup2(FD_RD_FR_PRNT, STDIN_FILENO); dup2(FD_RD_FR_PRNT, STDIN_FILENO);
dup2(FD_WR_TO_PRNT, STDOUT_FILENO); dup2(FD_WR_TO_PRNT, STDOUT_FILENO);
path = "." + client->get_rq_script_path(); path = "." + client->get_rq_script_path();
/*DEBUG*/std::cerr << "execve\n" << "path:[" << path << "]\n"; /*DEBUG*/std::cerr << "execve:[" << path << "]\n";
execve(path.c_str(), nll, env); execve(path.c_str(), nll, env);
// for tests execve crash : // for tests execve crash :
//execve("wrong", nll, env); //execve("wrong", nll, env);
std::cerr << "execve crashed.\n"; std::cerr << "execve crashed.\n";
// TODO HUGO : check errno // TODO HUGO : check errno
} }
else else //parent
{ {
close(FD_RD_FR_PRNT); close(FD_RD_FR_PRNT);
close(FD_WR_TO_PRNT); close(FD_WR_TO_PRNT);
@@ -189,9 +181,7 @@ std::string Webserv::_exec_script(Client *client, char **env)
} }
if (script_output.empty()) if (script_output.empty())
script_output = "Status: 500\r\n\r\n"; script_output = "Status: 500\r\n\r\n";
dup2(save_in, STDIN_FILENO);
dup2(save_out, STDOUT_FILENO);
return script_output; return script_output;
} }
@@ -199,6 +189,8 @@ void Webserv::_check_script_output(Client *client, std::string & output)
{ {
_check_script_status(client, output); _check_script_status(client, output);
_check_script_fields(client, output); _check_script_fields(client, output);
_add_script_body_length_header(output);
_remove_body_leading_empty_lines(output);
// _check_script_empty_lines(client, output); // _check_script_empty_lines(client, output);
// _check_script_space_colons(client, output); // _check_script_space_colons(client, output);
// _check_script_new_lines(client, output); // _check_script_new_lines(client, output);
@@ -255,3 +247,58 @@ void Webserv::_check_script_fields(Client *client, std::string & output)
} }
} }
void Webserv::_remove_body_leading_empty_lines(std::string & output)
{
size_t pos;
size_t pos_empty;
pos = output.find(CRLF CRLF);
if (pos == NPOS)
return;
pos += CRLF_SIZE * 2;
pos_empty = pos;
while (pos_empty == pos)
{
pos = output.find(CRLF, pos);
if (pos == pos_empty)
extract_line(output, pos, CRLF);
}
}
void Webserv::_add_script_body_length_header(std::string & output)
{
std::map<std::string, std::string> field;
std::map<std::string, std::string>::iterator it;
std::stringstream str_len;
std::string tmp;
size_t pos;
size_t len;
pos = output.find(CRLF CRLF);
if (pos != NPOS)
tmp = output.substr(pos + CRLF_SIZE);
len = tmp.size();
str_len << len;
// put script headers in map
tmp = output;
pos = tmp.find(CRLF CRLF);
if (pos != NPOS)
tmp.erase(pos);
::parse_http_headers(tmp, field);
// case insensitive search in map for "Content-Length"
tmp = "Content-Length";
for (it = field.begin(); it != field.end(); ++it)
{
if (str_tolower(it->first) == str_tolower(tmp))
{
pos = output.find(it->first);
::extract_line(output, pos, CRLF);
}
}
tmp += ": ";
tmp += str_len.str();
tmp += CRLF;
output.insert(0, tmp);
}

17
srcs/webserv/parsing_message_http.cpp
View File

@@ -1,17 +0,0 @@
#include "parsing_message_http.hpp"
std::string
parse_http_body(std::string message)
{
std::string body;
size_t pos;
pos = message.find(CRLF CRLF);
pos += std::string(CRLF CRLF).size();
// TODO: copying just like that might fail in case of binary or images
body = message.substr(pos);
return body;
}

32
srcs/webserv/parsing_message_http.hpp
View File

@@ -1,32 +0,0 @@
#ifndef PARSING_MESSAGE_HTTP_HPP
# define PARSING_MESSAGE_HTTP_HPP
# include <iostream>
# include <string>
# include <vector>
# include <map>
# include "utils.hpp"
std::map<std::string, std::string>
parse_http_headers (
std::string headers,
std::map<std::string, std::string> fields )
std::string
parse_http_body(std::string message);
// http message structure :
//
// start-line
// request-line
// method SP target SP version
// response-line
// version SP status SP reason
// header-fields
// name ":" SP value
// CRLF
// body
#endif

9
srcs/webserv/response.cpp
View File

@@ -47,6 +47,8 @@ int Webserv::_send_response(Client *client)
if (client->status >= 400) if (client->status >= 400)
_error_html_response(client); _error_html_response(client);
/*DEBUG*/ std::cout << "\n" B_PURPLE "[response + output + headers]:" RESET "\n"; ::print_special(client->response); std::cout << B_PURPLE "-----------" RESET "\n\n";
std::cerr << "client->response.size() = " << client->response.size() << "\n"; // DEBUG std::cerr << "client->response.size() = " << client->response.size() << "\n"; // DEBUG
ret = ::send(client->get_cl_fd(), client->response.c_str(), client->response.size(), 0); ret = ::send(client->get_cl_fd(), client->response.c_str(), client->response.size(), 0);
if (ret == -1) if (ret == -1)
@@ -83,8 +85,15 @@ void Webserv::_construct_response(Client *client)
if (_is_cgi(client, path)) if (_is_cgi(client, path))
{ {
script_output = _exec_cgi(client); script_output = _exec_cgi(client);
/*DEBUG*/ std::cout << "\n" B_PURPLE "[script output]:" RESET "\n"; ::print_special(script_output); std::cout << B_PURPLE "-----------" RESET "\n\n";
/*DEBUG*/ std::cout << "\n" B_PURPLE "[response]:" RESET "\n"; ::print_special(client->response); std::cout << B_PURPLE "-----------" RESET "\n\n";
_check_script_output(client, script_output); _check_script_output(client, script_output);
client->response += script_output; client->response += script_output;
/*DEBUG*/ std::cout << "\n" B_PURPLE "[response + output]:" RESET "\n"; ::print_special(client->response); std::cout << B_PURPLE "-----------" RESET "\n\n";
return; return;
} }
_process_method(client, path); _process_method(client, path);

73
www/form_get.html
View File

@@ -3,11 +3,82 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title></title> <title></title>
<style>
body {
display: flex;
flex-direction: row;
margin: auto;
}
form {
display: flex;
flex-direction: column;
border: 1px solid red;
margin: 20px auto;
padding: 5px;
}
form > * {
display: flex;
margin: 5px auto 5px 5px;
}
mark {
margin: 0px 3px;
}
</style>
</head> </head>
<body> <body>
<form method="get">
<form method="get" action="/cgi-bin/cgi_cpp.out">
<p><mark>get</mark> form</p>
<p>to <mark>/cgi-bin/cgi_cpp.out</mark></p>
<label for="fname">First name:</label><br>
<input type="text" id="fname" name="fname" value="John"><br>
<label for="lname">Last name:</label><br>
<input type="text" id="lname" name="lname" value="Doe"><br><br>
<input type="submit" value="submit"> <input type="submit" value="submit">
</form> </form>
<br>
<form method="post" action="/cgi-bin/cgi_cpp.out">
<p><mark>post</mark> form</p>
<p>to <mark>/cgi-bin/cgi_cpp.out</mark></p>
<label for="fname">First name:</label><br>
<input type="text" id="fname" name="fname" value="John"><br>
<label for="lname">Last name:</label><br>
<input type="text" id="lname" name="lname" value="Doe"><br><br>
<input type="submit" value="submit">
</form>
<br>
<form method="get" action="/cgi-bin/cgi_cpp_content_length.out">
<p><mark>get</mark> form</p>
<p>to <mark>/cgi-bin/cgi_cpp_content_length.out</mark></p>
<label for="fname">First name:</label><br>
<input type="text" id="fname" name="fname" value="John"><br>
<label for="lname">Last name:</label><br>
<input type="text" id="lname" name="lname" value="Doe"><br><br>
<input type="submit" value="submit">
</form>
<br>
<form method="post" action="/cgi-bin/cgi_cpp_content_length.out">
<p><mark>post</mark> form</p>
<p>to <mark>/cgi-bin/cgi_cpp_content_length.out</mark></p>
<label for="fname">First name:</label><br>
<input type="text" id="fname" name="fname" value="John"><br>
<label for="lname">Last name:</label><br>
<input type="text" id="lname" name="lname" value="Doe"><br><br>
<input type="submit" value="submit">
</form>
<br>
</body> </body>
</html> </html>

13
www/form_post.html
View File

@@ -1,13 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title></title>
</head>
<body>
<form method="post">
<input type="submit" value="submit">
</form>
</body>
</html>