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

merge hugo5 with script cgi tests

Browse Source
This commit is contained in:
Hugo LAMY
2022-08-17 18:26:06 +02:00
parent 1a99c6cc84 c6ebb95dc5
commit 875810c992
26 changed files with 628 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
srcs/Client.cpp
View File

@@ -221,11 +221,6 @@ void Client::fill_script_path(std::string &path, size_t pos)
{
std::string tmp;
if (path[0] == '.')
{
path.erase(0, 1);
pos--;
}
_request.script.path = path.substr(0, pos);
_request.script.info = path.substr(pos);
}

57
srcs/cgi-bin/Makefile
View File

@@ -1,3 +1,4 @@
# - - - - - - #
# #
# COLORS #
@@ -30,11 +31,7 @@ RESET = "\e[0m"
# . name is case sensitive . ?= set if not already set #
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #
NAME_1 = $(SRCS_1:.cpp=.out)
NAME_2 = $(SRCS_2:.cpp=.out)
NAME_3 = $(SRCS_3:.cpp=.out)
NAME_4 = $(SRCS_4:.cpp=.out)
NAME_5 = $(SRCS_5:.cpp=.out)
NAME = $(SRCS_X:.cpp=.out)
CXX = c++
CXXFLAGS = -Wall -Wextra #-Werror
@@ -47,19 +44,24 @@ HEADERS_D = .
SRCS_D = .
SRCS = cgi_utils.cpp
SRCS_1 = cgi_cpp.cpp
SRCS_2 = cgi_cpp_len.cpp
SRCS_3 = cgi_cpp_len_big.cpp
SRCS_4 = cgi_cpp_len_small.cpp
SRCS_5 = cgi_cpp_status.cpp
SRCS_X = \
cgi_cpp.cpp \
cgi_cpp_bad_headers.cpp \
cgi_cpp_empty.cpp \
cgi_cpp_empty_lines.cpp \
cgi_cpp_len.cpp \
cgi_cpp_len_big.cpp \
cgi_cpp_len_small.cpp \
cgi_cpp_no_body.cpp \
cgi_cpp_no_headers.cpp \
cgi_cpp_only_crlf.cpp \
cgi_cpp_sleep.cpp \
cgi_cpp_status.cpp \
cgi_cpp_download.cpp \
OBJS_D = builds
OBJS = $(SRCS:%.cpp=$(OBJS_D)/%.o)
OBJS_1 = $(SRCS_1:%.cpp=$(OBJS_D)/%.o)
OBJS_2 = $(SRCS_2:%.cpp=$(OBJS_D)/%.o)
OBJS_3 = $(SRCS_3:%.cpp=$(OBJS_D)/%.o)
OBJS_4 = $(SRCS_4:%.cpp=$(OBJS_D)/%.o)
OBJS_5 = $(SRCS_5:%.cpp=$(OBJS_D)/%.o)
OBJS_X = $(SRCS_X:%.cpp=$(OBJS_D)/%.o)
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #
# . target: prerequisites . $@ : target #
@@ -67,36 +69,25 @@ OBJS_5 = $(SRCS_5:%.cpp=$(OBJS_D)/%.o)
# . recipe . $^ : all prerequisites #
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #
all: cgi_1 cgi_2 cgi_3 cgi_4 cgi_5
cgi_1: $(NAME_1)
cgi_2: $(NAME_2)
cgi_3: $(NAME_3)
cgi_4: $(NAME_4)
cgi_5: $(NAME_5)
all: $(NAME)
$(OBJS_D)/%.o: %.cpp | $(OBJS_D)
@echo $(B_GREEN)"compilation :" $@ $(RESET)
$(CXX) $(CXXFLAGS) -c $< -o $@
$(OBJS_D):
mkdir $@
$(NAME_1): $(OBJS) $(OBJS_1)
$(NAME_2): $(OBJS) $(OBJS_2)
$(NAME_3): $(OBJS) $(OBJS_3)
$(NAME_4): $(OBJS) $(OBJS_4)
$(NAME_5): $(OBJS) $(OBJS_5)
$(NAME_1) $(NAME_2) $(NAME_3) $(NAME_4) $(NAME_5):
$(CXX) $^ -o $@
$(NAME): $(OBJS) $(OBJS_X)
$(NAME):
@echo $(B_YELLOW)"linkage :" $@ $(RESET)
$(CXX) $(OBJS) $(@:%.out=$(OBJS_D)/%.o) -o $@
clean:
rm -rf $(OBJS_D)
fclean: clean
rm -f $(NAME_1)
rm -f $(NAME_2)
rm -f $(NAME_3)
rm -f $(NAME_4)
rm -f $(NAME_5)
rm -f $(NAME)
re: fclean all

21
srcs/cgi-bin/cgi_cpp.cpp
View File

@@ -5,25 +5,20 @@
int main (int ac, char **av, char ** env)
{
std::string http_header;
std::string http_body;
std::string http_header;
std::string http_body;
std::string rq_body;
std::cin >> rq_body;
(void)ac;
(void)av;
// ::sleep(5);
http_header = "Content-Type: text/html; charset=UTF-8" CRLF;
fill_response_basic(env, http_body, http_header);
fill_body_basic(env, http_body, rq_body);
std::cout << http_header;
std::flush(std::cout);
::sleep(2);
std::cout << CRLF CRLF;
std::flush(std::cout);
::sleep(2);
std::cout << http_body;
std::flush(std::cout);
::sleep(2);
std::cout << http_header << CRLF << http_body;
return 0;
}

24
srcs/cgi-bin/cgi_cpp_bad_headers.cpp Normal file
View File

@@ -0,0 +1,24 @@
# include "cgi_utils.hpp"
int main (int ac, char **av, char ** env)
{
std::string http_header;
std::string http_body;
std::string http_status;
std::string rq_body;
std::cin >> rq_body;
(void)ac;
(void)av;
http_header = "Bad-Headers: wrong";
fill_body_basic(env, http_body, rq_body);
std::cout << http_header << CRLF << http_body;
return 0;
}

55
srcs/cgi-bin/cgi_cpp_download.cpp Normal file
View File

@@ -0,0 +1,55 @@
# include "cgi_utils.hpp"
int main (int ac, char **av, char ** env)
{
std::string http_header;
std::string http_body;
std::string rq_body;
std::string form_infos;
std::string path;
std::ifstream ifd;
std::stringstream buf;
size_t status;
std::cin >> rq_body;
(void)ac;
(void)av;
(void)env;
http_header = "Content-Type: image/jpeg" CRLF;
form_infos = get_form_infos(rq_body);
path = get_value("file", rq_body);
path = "./www/" + path;
status = ::eval_file_read(path);
if (status)
{
std::cout << "Status: " << status << CRLF CRLF;
return 0;
}
ifd.open(path.c_str());
if (!ifd)
{
std::cout << "Status: " << 500 << CRLF CRLF;
return 0;
}
else
{
buf << ifd.rdbuf();
if (!ifd || !buf)
{
std::cout << "Status: " << 500 << CRLF CRLF;
return 0;
}
}
std::cout << http_header << CRLF << buf.str();
return 0;
}

12
srcs/cgi-bin/cgi_cpp_empty.cpp Normal file
View File

@@ -0,0 +1,12 @@
# include "cgi_utils.hpp"
int main (int ac, char **av, char ** env)
{
(void)ac;
(void)av;
(void)env;
return 0;
}

23
srcs/cgi-bin/cgi_cpp_empty_lines.cpp Normal file
View File

@@ -0,0 +1,23 @@
# include "cgi_utils.hpp"
int main (int ac, char **av, char ** env)
{
std::string http_header;
std::string http_body;
std::string rq_body;
std::cin >> rq_body;
(void)ac;
(void)av;
http_header = "Content-Type: text/html; charset=UTF-8" CRLF;
fill_body_basic(env, http_body, rq_body);
std::cout << http_header << CRLF CRLF CRLF CRLF CRLF << http_body;
return 0;
}

11
srcs/cgi-bin/cgi_cpp_len.cpp
View File

@@ -5,15 +5,20 @@ int main (int ac, char **av, char ** env)
{
std::string http_header;
std::string http_body;
std::string rq_body;
std::cin >> rq_body;
(void)ac;
(void)av;
fill_response_basic(env, http_body, http_header);
http_header = "Content-Type: text/html; charset=UTF-8" CRLF;
http_header += "Content-Length: " + itos(http_body.size()) + CRLF;
http_header += "Content-Length: " + itos(http_body.size());
fill_body_basic(env, http_body, rq_body);
std::cout << http_header << CRLF CRLF << http_body;
std::cout << http_header << CRLF << http_body;
return 0;
}

15
srcs/cgi-bin/cgi_cpp_len_big.cpp
View File

@@ -3,17 +3,22 @@
int main (int ac, char **av, char ** env)
{
std::string http_header;
std::string http_body;
std::string http_header;
std::string http_body;
std::string rq_body;
std::cin >> rq_body;
(void)ac;
(void)av;
fill_response_basic(env, http_body, http_header);
http_header = "Content-Type: text/html; charset=UTF-8" CRLF;
http_header += "Content-Length: " + itos(http_body.size() + 100) + CRLF;
http_header += "Content-Length: " + itos(http_body.size() + 100);
fill_body_basic(env, http_body, rq_body);
std::cout << http_header << CRLF CRLF << http_body;
std::cout << http_header << CRLF << http_body;
return 0;
}

14
srcs/cgi-bin/cgi_cpp_len_small.cpp
View File

@@ -3,17 +3,21 @@
int main (int ac, char **av, char ** env)
{
std::string http_header;
std::string http_body;
std::string http_header;
std::string http_body;
std::string rq_body;
std::cin >> rq_body;
(void)ac;
(void)av;
fill_response_basic(env, http_body, http_header);
http_header = "Content-Type: text/html; charset=UTF-8" CRLF;
http_header += "Content-Length: " + itos(http_body.size() - 100) + CRLF;
http_header += "Content-Length: " + itos(http_body.size() - 100);
fill_body_basic(env, http_body, rq_body);
std::cout << http_header << CRLF CRLF << http_body;
std::cout << http_header << CRLF << http_body;
return 0;
}

22
srcs/cgi-bin/cgi_cpp_no_body.cpp Normal file
View File

@@ -0,0 +1,22 @@
# include "cgi_utils.hpp"
int main (int ac, char **av, char ** env)
{
std::string http_header;
std::string http_status;
std::string rq_body;
std::cin >> rq_body;
(void)ac;
(void)av;
(void)env;
http_header = "Content-Type: text/html; charset=UTF-8" CRLF;
std::cout << http_header << CRLF;
return 0;
}

24
srcs/cgi-bin/cgi_cpp_no_headers.cpp Normal file
View File

@@ -0,0 +1,24 @@
# include "cgi_utils.hpp"
int main (int ac, char **av, char ** env)
{
std::string http_header;
std::string http_body;
std::string http_status;
std::string rq_body;
std::cin >> rq_body;
(void)ac;
(void)av;
http_header = CRLF;
fill_body_basic(env, http_body, rq_body);
std::cout << CRLF << http_body;
return 0;
}

15
srcs/cgi-bin/cgi_cpp_only_crlf.cpp Normal file
View File

@@ -0,0 +1,15 @@
# include "cgi_utils.hpp"
int main (int ac, char **av, char ** env)
{
(void)ac;
(void)av;
(void)env;
std::cout << CRLF CRLF;
return 0;
}

29
srcs/cgi-bin/cgi_cpp_sleep.cpp Normal file
View File

@@ -0,0 +1,29 @@
# include "cgi_utils.hpp"
int main (int ac, char **av, char ** env)
{
std::string http_header;
std::string http_body;
std::string rq_body;
size_t time;
std::stringstream ss;
std::cin >> rq_body;
(void)ac;
(void)av;
http_header = "Content-Type: text/html; charset=UTF-8" CRLF;
fill_body_basic(env, http_body, rq_body);
ss << get_value("sleep", rq_body);
ss >> time;
sleep(time);
std::cout << http_header << CRLF << http_body;
return 0;
}

11
srcs/cgi-bin/cgi_cpp_status.cpp
View File

@@ -6,14 +6,19 @@ int main (int ac, char **av, char ** env)
std::string http_header;
std::string http_body;
std::string http_status;
std::string rq_body;
std::cin >> rq_body;
(void)ac;
(void)av;
fill_response_basic(env, http_body, http_header);
http_header = "Content-Type: text/html; charset=UTF-8" CRLF;
http_status = get_value("Status");
http_header += "Status: " + http_status;
fill_body_basic(env, http_body, rq_body);
http_status = get_value("Status", rq_body);
http_header += "Status: " + http_status + CRLF;
std::cout << http_header << CRLF CRLF << http_body;

38
srcs/cgi-bin/cgi_utils.cpp
View File

@@ -69,14 +69,6 @@ std::string parse_env(const std::string & env)
return ret;
}
std::string parse_body()
{
std::string ret;
std::cin >> ret;
return ret;
}
std::string print_env(char **env, std::string tag)
{
std::string ret = "";
@@ -114,7 +106,7 @@ std::string
return ret;
}
std::string get_form_infos()
std::string get_form_infos(const std::string & rq_body)
{
std::string form_infos;
std::string method;
@@ -122,14 +114,14 @@ std::string get_form_infos()
method = parse_env("REQUEST_METHOD");
if (method == "POST")
form_infos = parse_body();
form_infos = rq_body;
else if (method == "GET")
form_infos = parse_env("QUERY_STRING");
return form_infos;
}
std::string get_value(std::string key)
std::string get_value(const std::string & key, const std::string & rq_body)
{
std::string infos;
std::string ret;
@@ -137,7 +129,7 @@ std::string get_value(std::string key)
size_t end;
size_t len;
infos = get_form_infos();
infos = get_form_infos(rq_body);
pos = str_tolower(infos).find(str_tolower(key));
if (pos == NPOS)
return "";
@@ -155,15 +147,13 @@ std::string get_value(std::string key)
}
void
fill_response_basic(char **env, std::string & http_body, std::string & http_header)
fill_body_basic(char **env, std::string & http_body, const std::string & rq_body)
{
std::string rq_method = "not found";
std::string rq_body;
std::string rq_query;
std::string form_infos;
rq_method = parse_env("REQUEST_METHOD");
rq_body = parse_body();
rq_query = parse_env("QUERY_STRING");
if (rq_method == "POST")
@@ -189,7 +179,21 @@ void
http_body += print_env(env, "p");
http_body += HTML_BODY_BOTTOM;
http_header = "Content-Type: text/html; charset=UTF-8" CRLF;
}
size_t eval_file_read(const std::string &path)
{
if (::access(path.c_str(), F_OK) == -1)
{
std::perror("err access()");
return 404; // NOT_FOUND, file doesn't exist
}
if (::access(path.c_str(), R_OK) == -1)
{
std::perror("err access()");
return 403; // FORBIDDEN, file doesn't have access permission
}
return 0;
}

33
srcs/cgi-bin/cgi_utils.hpp
View File

@@ -5,9 +5,11 @@
# include <iostream>
# include <string>
# include <sstream>
# include <fstream>
# include <vector>
# include <stdlib.h> // getenv
# include <algorithm> // transform
# include <unistd.h> // sleep, close, access
# define CR "\r"
# define LF "\n"
@@ -24,42 +26,43 @@
" <link href=\"./cgi_style.css\" type=\"text/css\" rel=\"stylesheet\">"\
" </head>"\
" <body>"\
" <h1>cgi</h1><br>"
# define HTML_BODY_BOTTOM " </body>"\
" <h1>CGI</h1><br>"
# define HTML_BODY_BOTTOM " <br><h1>END CGI</h1>"\
" </body>"\
"</html>"
std::string
str_tolower(std::string str);
str_tolower(std::string str);
std::string
trim(std::string str, char del);
trim(std::string str, char del);
std::vector<std::string>
split(const std::string & input, std::string delim, char ctrim = '\0');
split(const std::string & input, std::string delim, char ctrim = '\0');
std::string
itos(int n);
itos(int n);
std::string
parse_env(const std::string & env);
parse_env(const std::string & env);
std::string
parse_body();
print_env(char **env, std::string tag = "p");
std::string
print_env(char **env, std::string tag = "p");
get_form_infos(const std::string & rq_body);
std::string
get_form_infos();
get_value(const std::string & key, const std::string & rq_body);
std::string
get_value(std::string key);
std::string
print_form(std::string form, std::string key = "p", std::string val = "p");
print_form(std::string form, std::string key = "p", std::string val = "p");
void
fill_response_basic(char **env, std::string & body, std::string & header);
fill_body_basic(char **env, std::string & http_body, const std::string & rq_body);
size_t
eval_file_read(const std::string &path);
#endif

14
srcs/webserv/Webserv.hpp
View File

@@ -132,17 +132,15 @@ class Webserv
void _exec_script(Client *client, char *env[]);
void _check_script_output(Client *client, std::string & output);
void _check_script_status(Client *client, std::string & output);
void _check_script_fields(Client *client, std::string & output);
size_t _check_script_fields(const std::string & output, size_t status);
void _check_fields_duplicates(Client *client, std::string & output);
void _add_script_body_length_header(std::string & output);
void _remove_body_leading_empty_lines(std::string & output);
Client *_find_cgi_fd(int cgi_fd);
void _read_cgi_output(Client *client);
void _handle_epoll_error_cgi_fd(uint32_t events, Client *client);
void _cgi_epollhup(uint32_t events, Client *client);
Client *_find_cgi_fd(int cgi_fd);
void _read_cgi_output(Client *client);
void _handle_epoll_error_cgi_fd(uint32_t events, Client *client);
void _cgi_epollhup(uint32_t events, Client *client);
///////////////////////

50
srcs/webserv/cgi.cpp
View File

@@ -18,7 +18,7 @@ bool Webserv::_is_cgi(Client *client, std::string path)
if (pos == NPOS)
break;
client->fill_script_path(path, pos);
script_path = "." + client->get_rq_script_path();
script_path = client->get_rq_script_path();
file_type = ::eval_file_type(script_path);
if (file_type == IS_DIR) // but what if it's a symlink ?
continue;
@@ -126,7 +126,7 @@ void Webserv::_set_env_vector(Client *client, std::vector<std::string> &env_vect
env_vector.push_back(_dup_env("REMOTE_IDENT")); // authentification not supported
env_vector.push_back(_dup_env("REMOTE_USER")); // authentification not supported
env_vector.push_back(_dup_env("REQUEST_METHOD" , client->get_rq_method_str()));
env_vector.push_back(_dup_env("SCRIPT_NAME" , client->get_rq_script_path())); // LUKE: To Check
env_vector.push_back(_dup_env("SCRIPT_NAME" , "/" + client->get_rq_script_path())); // LUKE: To Check
env_vector.push_back(_dup_env("SERVER_NAME" , client->get_cl_lsocket()->host));
env_vector.push_back(_dup_env("SERVER_PORT" , client->get_cl_lsocket()->port));
env_vector.push_back(_dup_env("SERVER_PROTOCOL" , "HTTP/1.1"));
@@ -200,7 +200,7 @@ void Webserv::_exec_script(Client *client, char *env[])
::close(FD_RD_FR_PRNT);
::close(FD_WR_TO_PRNT);
path = "." + client->get_rq_script_path(); // Wut ? Only relative path ?
path = client->get_rq_script_path(); // Wut ? Only relative path ?
/*DEBUG*/std::cerr << "execve:[" << path << "]\n";
if (::execve(path.c_str(), nll, env) == -1) // replace path for debug error forcing
{
@@ -241,16 +241,14 @@ void Webserv::_check_script_output(Client *client, std::string & output)
_check_script_status(client, output);
if (client->status >= 400 && client->status < 600)
return;
///*DEBUG*/ std::cout << "\n" B_PURPLE "[script status]:" RESET "\n"; ::print_special(output); std::cout << B_PURPLE "-----------" RESET "\n\n";
_check_script_fields(client, output);
///*DEBUG*/ std::cout << "\n" B_PURPLE "[script fields]:" RESET "\n"; ::print_special(output); std::cout << B_PURPLE "-----------" RESET "\n\n";
//*DEBUG*/ std::cout << "\n" B_PURPLE "[script status]:" RESET "\n"; ::print_special(output); std::cout << B_PURPLE "-----------" RESET "\n\n";
client->status = _check_script_fields(output, client->status);
_check_fields_duplicates(client, output);
//*DEBUG*/ std::cout << "\n" B_PURPLE "[script fields]:" RESET "\n"; ::print_special(output); std::cout << B_PURPLE "-----------" RESET "\n\n";
_remove_body_leading_empty_lines(output);
///*DEBUG*/ std::cout << "\n" B_PURPLE "[script empty lines]:" RESET "\n"; ::print_special(output); std::cout << B_PURPLE "-----------" RESET "\n\n";
//*DEBUG*/ std::cout << "\n" B_PURPLE "[script empty lines]:" RESET "\n"; ::print_special(output); std::cout << B_PURPLE "-----------" RESET "\n\n";
_add_script_body_length_header(output);
///*DEBUG*/ std::cout << "\n" B_PURPLE "[script content length]:" RESET "\n"; ::print_special(output); std::cout << B_PURPLE "-----------" RESET "\n\n";
// _check_script_empty_lines(client, output);
// _check_script_space_colons(client, output);
// _check_script_new_lines(client, output);
//*DEBUG*/ std::cout << "\n" B_PURPLE "[script content length]:" RESET "\n"; ::print_special(output); std::cout << B_PURPLE "-----------" RESET "\n\n";
}
void Webserv::_check_script_status(Client *client, std::string & output)
@@ -269,7 +267,35 @@ void Webserv::_check_script_status(Client *client, std::string & output)
client->status = 200;
}
void Webserv::_check_script_fields(Client *client, std::string & output)
size_t Webserv::_check_script_fields(const std::string & output, size_t status)
{
std::string headers;
std::string body;
size_t pos;
pos = output.find(CRLF CRLF);
if (pos == NPOS) // there is not empty line
return 500;
headers = output.substr(0, pos);
body = output.substr(pos + CRLF_SIZE * 2);
headers = str_tolower(headers);
pos = headers.find("content-type");
if (pos == NPOS) // there is no content-type field
{
if (!body.empty()) // there is body
return 500;
if (headers.find("location") == NPOS) // there is no location field
return 500;
}
else if (headers.find("location") != NPOS) // there is a location field
{
if (body.empty()) // there is no body
return 500;
}
return status;
}
void Webserv::_check_fields_duplicates(Client *client, std::string & output)
{
std::map<std::string, std::string> srv_fld; // server_field
std::map<std::string, std::string> scr_fld; // script_field

3
srcs/webserv/response.cpp
View File

@@ -64,7 +64,7 @@ int Webserv::_send_response(Client *client)
if (client->status >= 400)
_error_html_response(client);
//*DEBUG*/ std::cout << "\n" B_PURPLE "[response + output + headers]:" RESET "\n"; ::print_special(client->response); std::cout << "\n" B_PURPLE "-----------" RESET "\n\n";
/*DEBUG*/ std::cout << "\n" B_PURPLE "[response + output + headers]:" RESET "\n"; ::print_special(client->response); std::cout << "\n" B_PURPLE "-----------" RESET "\n\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);
@@ -97,7 +97,6 @@ void Webserv::_append_base_headers(Client *client)
client->response.append("Connection: keep-alive" CRLF);
}
// TODO HUGO : wip
void Webserv::_construct_response(Client *client)
{
std::string path;