merge with request response

Author: Younes Ismaili

Makefile

@@ -1,6 +1,6 @@
 NAME = webserv
 CC = c++
-CFLAGS = -Wall -Wextra -Werror -std=c++98 
+CFLAGS = -Wall -Wextra -Werror -std=c++98 -g -fsanitize=address
 SRCS =  prs_rsc/main.cpp prs_rsc/server.cpp prs_rsc/location.cpp prs_rsc/server_utils.cpp \
 		request/request.cpp request/request_utils.cpp respond/respond.cpp respond/respond_root.cpp respond/pairs_def.cpp respond/method_utils.cpp \
 		respond/method_handling.cpp CGI/cgi.cpp server/sockets.cpp server/http_server.cpp 

prs_rsc/server.conf

@@ -1,80 +1,50 @@
-# server {
-#     listen    8004;
-#     listen    8002;
-#     listen    8003;
-#     server_name localhost;              
-#     host 127.0.0.1;
-#     client_max_body_size 200000;
-#     error_page 404 error_pages/404.html;
-#     error_page 500 error_pages/500.html;
-#     autoindex on;
-
-#     location /favicon.ico 
-#     {
-#         #allow_methods GET POST DELETE;
-#         root ./web_pages/favicon.ico;
-#         return 301 https://www.example.com$request_uri;
-#     }
-
-#     location /favicon.php
-#     {
-#         allow_methods GET POST DELETE;
-#     }
-#         location /favicon.php           
-#     {
-#         allow_methods GET POST DELETE;
-#     }
-# }
-
-
-
-
 server {
-	# default server;
 
 	listen	8001;
 
 
 	host 127.0.0.1;
 	client_max_body_size 10000000;
-	root ./www/html/ffuyu;
+	root ./www/html;
 	error_page 404 www/html/error_pages/404.html;
 	error_page 500 www/html/error_pages/500.html;
 
-	#allow_methods GET POST DELETE;
 	autoindex on;
-	index index.html ;
-	#meme_types ./configs/types.conf;
+	index index.html;
 
 
+	location /favicon.ico {
+		allow_methods GET POST DELETE;
+		root ./www/html/favicon.ico;
+	}
+
 	location / {
 		allow_methods GET POST DELETE;
 		root ./www/html/favicon.ico;
-		autoindex on;
 	}
 
-	location /cgi_bin {
+	location /cgi_bin
+	{
 		root ./www/html/cgi_bin;
 		allow_methods GET POST;
 		index hello.html;
 		path_info .py /usr/bin/python3;
 		path_info .php ./php-cgi;
 	}
 
-	location /red {
+	location /red
+	{
 		return 301 https://www.youtube.com/watch?v=_Nbm2yn8WA8&t=30s;
 	}
 
-	location /delete
-	{
+	location /delete {
 		root ./www/html/delete;
 		allow_methods DELETE;
 		index todelete;
 		path_info .py /usr/bin/python3;
 	}
 
-	location /upload
-	{
+	location /upload{
 		root ./www/html/upload;
 		index upload.html;
 		allow_methods POST GET;
@@ -84,23 +54,20 @@ server {
 
 server {
 	listen	8000;
-	root ./www/html/delete;
+
 	host 127.0.0.1;
 
+	server_name mazhari;
 	client_max_body_size 26336;
-	#allow_methods GET POST DELETE;
 	autoindex on;
 	index server2.html;
-	#meme_types ./configs/types.conf;
 }
 
 server {
 	listen	8003;
 
 	host 127.0.0.1;
 	client_max_body_size 26000;
-	#allow_methods GET POST DELETE;
 	autoindex on;
 	index server3.html;
-	#meme_types ./configs/types.conf;
-}
+}

request/request.cpp

@@ -12,12 +12,14 @@
 
 #include "request.hpp"
 
-request::request()
+request::request() : _method(""), _uri(""), _version(""),
+    _body(""), _port(80), _query("")
 {
     return ;
 }
 
-request::request(std::string request)
+request::request(std::string request) : _method(""), _uri(""), _version(""),
+    _body(""), _port(80), _query("")
 {
     this->parse_request(request);
     return ;
@@ -43,6 +45,8 @@ request &request::operator=(const request &src)
         this->_version = src._version;
         this->_headers = src._headers;
         this->_body = src._body;
+        this->_port = src._port;
+        this->_query = src._query;
     }
     return (*this);
 }

respond/method_handling.cpp

@@ -6,28 +6,41 @@
 /*   By: aoumad <[email protected]>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/04/09 17:52:50 by aoumad            #+#    #+#             */
-/*   Updated: 2023/05/08 18:04:33 by aoumad           ###   ########.fr       */
+/*   Updated: 2023/05/09 17:50:06 by aoumad           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "respond.hpp"
 
 void    Respond::handle_get_response(std::vector<server> servers)
 {
-    
     // step 2: check if it's a CGI or not (like if `index` of the configuration file has .py or .php...etc)
+    if (_is_cgi == true)
+    {
+        run_cgi(r, *this);
+        return ;
+    }
     // step 3: check if it's a file or not
     if (ft_check_file() == true)
+    {
         ft_handle_file();
-    else
-        handle_error_response(404);
+        return ;
+    }
+    // else
+    // {
+    //     std::cout << "___--_------__------_-_-_--_-__-_-_-_-HEREEEEE_--_-_-_--_-_-_-_-" << std::endl;
+    //     handle_error_response(404);
+    //     return ;
+    // }
     // step 4 : check the index in the configuration file and render it
-    ft_handle_index(servers);
-    
+    if (ft_handle_index(servers))
+        return ;
     // step 5: check if the autoindex if on or off
-    ft_handle_autoindex(servers);
-    
-    // ft_handle_error(404);
+    if (ft_handle_autoindex(servers))
+    {
+        handle_error_response(403);
+        return ;
+    }
 
 }