Merge branch 'master' of https://github.com/younes-ismaili/webserv

Author: aoumad

config/server.conf

@@ -1,10 +1,10 @@
 server
 	{
-	listen	8001;
+	listen	80;
 
 	host 127.0.0.1;
 	client_max_body_size 100;
-
+	server_name hhjdsghj dsfsdfda dfdsfsdf;
 
 	error_page 404 www/html/error_pages/404.html;
 	error_page 403 www/html/error_pages/403.html;
@@ -24,11 +24,12 @@ server
 	{
 			root ./www/html/cgi_bin;
 			allow_Methods GET;
+			allow_Methods POST;
 			index hello.html;
-	# 		path_info .py /usr/bin/python3;
-	# 		path_info .php /php-cgi;
-	# 		#listen 8001;
-			autoindex off;
+			path_info .py /usr/bin/python3;
+			path_info .php /php-cgi;
+			# listen 8001;
+			#autoindex on;
 	}
 
 	location /red
@@ -123,7 +124,7 @@ server
 
 # server							
 # 	{
-# 	listen	8001;
+# 	listen	8002;
 
 # 	host 127.0.0.1;
 # 	client_max_body_size 10000000;
@@ -205,8 +206,4 @@ server
 
 # 	}
 
-
-	
-
-
 # }

include/sockets.hpp

@@ -6,7 +6,7 @@
 /*   By: yismaili <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/03/27 15:29:15 by yismaili          #+#    #+#             */
-/*   Updated: 2023/05/22 22:13:50 by yismaili         ###   ########.fr       */
+/*   Updated: 2023/05/24 14:46:10 by yismaili         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

respond/method_handling.cpp

@@ -6,7 +6,7 @@
 /*   By: aoumad <[email protected]>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/04/09 17:52:50 by aoumad            #+#    #+#             */
-/*   Updated: 2023/05/24 16:04:10 by aoumad           ###   ########.fr       */
+/*   Updated: 2023/05/24 16:07:00 by aoumad           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

server/http_server.cpp

@@ -6,7 +6,7 @@
 /*   By: aoumad <[email protected]>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/04/04 18:41:23 by yismaili          #+#    #+#             */
-/*   Updated: 2023/05/24 15:59:43 by aoumad           ###   ########.fr       */
+/*   Updated: 2023/05/24 16:07:27 by aoumad           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -137,7 +137,6 @@ namespace http{
             clients.push_back(server_pollfd);
             it++;
         }
-        
         while (true)
         {
             i = 0;

server/sockets.cpp

@@ -6,7 +6,7 @@
 /*   By: yismaili <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/04/04 18:41:42 by yismaili          #+#    #+#             */
-/*   Updated: 2023/05/22 22:48:44 by yismaili         ###   ########.fr       */
+/*   Updated: 2023/05/24 14:56:46 by yismaili         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -96,6 +96,7 @@ namespace http{
         bool sockets::start_server() 
         {
             int optval;
+            static int    check_port = 0;
 
             optval = 1; //enabling the SO_REUSEADDR socket option.
             // Creates a TCP socket
@@ -118,11 +119,16 @@ namespace http{
             fcntl(sockfd, F_SETFL, O_NONBLOCK);
 
             //bind a socket with a specific address and port number
-            if (bind(sockfd, result->ai_addr, result->ai_addrlen) == 0)
+            int ret_bind = bind(sockfd, result->ai_addr, result->ai_addrlen);
+            if (ret_bind == 0)
             {
                 // F_SETFL: This flag indicates that we want to set the file status flags.
+               check_port++;
                 std::cout << "\n\033[32mLISTENING ON ["<<port<<"]...\033[0m\n";
             }
+            else if (ret_bind == -1 &&  check_port == 0){
+                std::cout << "\033[31mthis ["<<port<<"] port is used\033[0m\n";
+            }
           //  Set socket to listen
             if (listen(sockfd, SOMAXCONN) < 0){
                 // The backlog argument defines the maximum length to which the queue of pending connections for sockfd may grow

www/html/upload/getfile.php

@@ -0,0 +1,26 @@
+<?php
+$dir = "uploads/";
+$allowed_exts = array("pdf", "mp4", "png", "jpg");
+
+// Loop through the directory and find files with allowed extensions
+$files = array();
+if (is_dir($dir)) {
+  if ($dh = opendir($dir)) {
+    while (($file = readdir($dh)) !== false) {
+      $ext = pathinfo($file, PATHINFO_EXTENSION);
+      if (in_array($ext, $allowed_exts)) {
+        $files[] = $file;
+      }
+    }
+    closedir($dh);
+  }
+}
+// Display the files in a table
+echo "<table>";
+foreach ($files as $file) {
+  echo "<tr>";
+  echo "<td><a href='$dir$file' target='_blank'>$file</a></td>";
+  echo "</tr>";
+}
+echo "</table>";
+?>