Merge pull request #47 from younes-ismaili/aoumad

fixed request and some stuff on response

Author: aoumad

CGI/cgi.cpp

@@ -149,6 +149,7 @@ std::string run_cgi(request &r,  Respond &res)
     if (pid == -1) 
     {
         res.set_status_code(500);
+        res.set_status_message(res.get_response_status(res.get_status_code()));
         return NULL;
     }
     else if (pid == 0)
@@ -176,8 +177,11 @@ std::string run_cgi(request &r,  Respond &res)
 
     int status;
     waitpid(pid, &status, 0);
-    if (WIFSIGNALED(status) || status != 0) 
+    if (WIFSIGNALED(status) || status != 0)
+    {
         res.set_status_code(500);
+        res.set_status_message(res.get_response_status(res.get_status_code()));
+    }
     char buf[1];
     std::string content;
     int byt;

prs_rsc/server.conf

@@ -47,9 +47,10 @@ server {
 	#meme_types ./configs/types.conf;
 
 
-	location /favicon.ico {
+	location / {
 		allow_methods GET POST DELETE;
 		root ./www/html/favicon.ico;
+		autoindex on;
 	}
 
 	location /cgi_bin {

request/http_server.cpp

@@ -6,7 +6,7 @@
 /*   By: aoumad <[email protected]>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/03/26 23:05:21 by aoumad            #+#    #+#             */
-/*   Updated: 2023/05/05 16:33:19 by aoumad           ###   ########.fr       */
+/*   Updated: 2023/05/08 16:17:03 by aoumad           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -119,6 +119,7 @@ void request::parse_request(std::string request)
         lines.push_back(line);
     }
     // Parse the request line
+    // std::cout << lines[0] << std::endl;
     std::istringstream request_line(lines[0]);
     request_line >> this->_method >> this->_uri >> this->_version;
     // i need to call a function to check if the request line content is suitable or not
@@ -164,62 +165,25 @@ void request::parse_request(std::string request)
         exit(1);
     }
     ft_parse_port(this->get_header("Host"));
-    ft_parse_language_charset();
+    // ft_parse_language_charset();
 
     // Parse the request body
     std::string content_len_str = this->get_header("Content-Length");
-    if (!content_len_str.empty())
+    if (content_len_str != "")
     {
         size_t content_len = std::stoi(content_len_str);
         this->_body = lines.back().substr(0, content_len);
-        // std::string transfer_encoding = this->get_header("Accept-Encoding");
-        // if (!transfer_encoding.empty())
-        // {
-        //     // using pointers to member functions to call the functions handlers
-        //     std::vector<std::string> encoding_types;
-        //     size_t startPos = 0;
-        //     size_t endPos = transfer_encoding.find(',');
-        //     while (endPos != std::string::npos)
-        //     {
-        //         encoding_types.push_back(transfer_encoding.substr(startPos, endPos - startPos));
-        //         startPos = endPos + 1;
-        //         endPos = transfer_encoding.find(',', startPos);
-        //     }
-        //     encoding_types.push_back(transfer_encoding.substr(startPos, endPos - startPos));
-        //     for (std::vector<std::string>::const_iterator it = encoding_types.begin(); it != encoding_types.end(); ++it)
-        //     {
-        //         std::string type_tmp = *it;
-        //         // Trim leading and trailing whitespaces from the value
-        //         // type_tmp.erase(0, type_tmp.find_first_not_of(" \t"));
-        //         // type_tmp.erase(type_tmp.find_first_not_of(" \t") + 1);
-        //         bool supported = false;
-        //         for (size_t i = 0; i < sizeof(handlers) / sizeof(handlers[0]); ++i)
-        //         {
-        //             if (type_tmp == supported_encodings[i])
-        //             {
-        //                 (this->*handlers[i])(this->_body);
-        //                 supported = true;
-        //                 break;
-        //             }
-        //         }
-        //         if (!supported)
-        //             std::cerr << "Unsupported encoding type: " << type_tmp << std::endl;
-        //     }
-            
-        // }
     }
     else
     {
-        if (this->_headers.find("Content-Length") != this->_headers.end() || this->_method == "POST" || this->_method == "PUT"
-            || this->_headers.find("Content-Type") != this->_headers.end())
+        // std::cout << "____----_-_-_-_--_-_____-_-_-_-____-_-_-_-_-------" << std::endl;
+        if (content_len_str == "" || this->_method == "POST")
             {
-                std::cerr << "Body request is missing" << std::endl;
-                exit(1);
+                set_body("");
+                return ;
             }
 
     }
-
-    // print_request();
 }
 
 void    request::print_request()

request/httpml.cpp

@@ -6,7 +6,7 @@
 /*   By: aoumad <[email protected]>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/04/09 17:52:50 by aoumad            #+#    #+#             */
-/*   Updated: 2023/05/07 00:31:03 by aoumad           ###   ########.fr       */
+/*   Updated: 2023/05/08 18:04:33 by aoumad           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,14 +16,13 @@ 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)
-    
     // step 3: check if it's a file or not
     if (ft_check_file() == true)
         ft_handle_file();
-
+    else
+        handle_error_response(404);
     // step 4 : check the index in the configuration file and render it
-    if (_is_index == true)
-        ft_handle_index(servers);
+    ft_handle_index(servers);
 
     // step 5: check if the autoindex if on or off
     ft_handle_autoindex(servers);
@@ -34,6 +33,12 @@ void    Respond::handle_get_response(std::vector<server> servers)
 
 void    Respond::handle_post_response(std::vector<server> server)
 {
+    // step 1: check if the request body is empty or not
+    if (r.get_body().empty())
+    {
+        set_response_body("Body request is missing");
+        return ;
+    }
     struct stat st;
     (void)server;
     // if (_is_cgi == false && (server[_server_index].get_upload_store().empty() || server[_server_index].get_upload() == "off"))