Otm

.github/workflows/ci.yml

@@ -24,5 +24,4 @@ jobs:
 
     - name: Run make
       run: make
-    - name: Run tests
-      run: make tests
+

.gitignore

@@ -1,31 +1,41 @@
 # Prerequisites
 *.d
 
+labs/myfld/*
 
-
-
-
+test/runner
 labs/intern/
 
-
+ts.txt
 # Compiled Object files
 *.slo
 *.lo
 *.o
 *.obj
 *.p
+*.mp4
+
 ./configs/php/app 
 configs/php/app
 # Precompiled Headers
 *.gch
 *.pch
 labs/app
+mmm/
+var/tmp/*
+var/www/html/main/uploads/*
 *.log
+ts.html
+otm.cpp 
+*.otm
 # Compiled Dynamic libraries
 *.so
 *.dylib
 *.dll
-
+*.zip
+uploadtestfile.txt 
+uploadtestfile.cpp
+.DS_Store
 # Fortran module files
 *.mod
 *.smod
@@ -44,3 +54,7 @@ testing/
 *.exe
 *.out
 *.app
+.DS_Store
+
+
+test*

Makefile

@@ -1,25 +1,23 @@
 CPP = c++
-CPPFLAGS = -Wall -Wextra -Werror -std=c++98 -I./headers/ #-fsanitize=address
+CPPFLAGS = -Wall -Wextra -Werror -std=c++98 -I./headers/  
 
 NAME=webserv
 
-# OTM
 SRCS=main.cpp srcs/parsing/config/readConfig.cpp srcs/parsing/helpers/strTrim.cpp \
-srcs/parsing/helpers/FtPars.cpp srcs/models/Server.cpp  debug/printing.cpp 
+srcs/parsing/helpers/FtPars.cpp srcs/models/Server.cpp \
+srcs/utils/httpResponseErrors.cpp srcs/utils/serverUtils.cpp srcs/utils/ClientData.cpp \
 
-# ACHAKKAF
-SRCS +=  srcs/cgi/ft_cgi.cpp
+SRCS +=   srcs/models/Upload.cpp srcs/models/Request.cpp
 
-# MOAD
-SRCS +=  
+SRCS +=  srcs/models/Response.cpp srcs/models/ResponseUtils.cpp srcs/models/MimeTypes.cpp srcs/models/Cgi.cpp
 
-#OTM
 SRCS += srcs/models/Webserv.cpp srcs/models/WebservHandler.cpp
 
 HEADERS=headers/*.hpp
 OBJS=$(SRCS:.cpp=.o)
 
 all: $(NAME)
+	mkdir -p ./var/tmp
 
 $(NAME): $(OBJS)
 	$(CPP) $(CPPFLAGS) $(OBJS) -o $(NAME)
@@ -32,8 +30,7 @@ clean:
 
 fclean: clean
 	rm -f $(NAME)
-tests:
-	bash test/test01.sh
+
 
 re: fclean all
 

configs/config.conf

@@ -2,91 +2,51 @@
 # Server 1: Default server
 ###############################################################################
 [server.default]
+# required
 host = "127.0.0.1"
-port = "8080,5555"
+# required
+port = "8080,7070"
+# optional
 server_name = "myserver.local"
-client_max_body_size = "1048576"
-
-# Default error pages
-error_page_404 = "/errors/404.html"
-error_page_500 = "/errors/500.html"
-
-# Route 1 (for path "/")
-# location_path = "/" //!
-location_root = "/var/www/html"
-# location_redirect = "/xyz/index.html"
+# optional
+client_max_body_size = "40000000000"
+# Timeouts IN SECONDS
+# optional
+client_timeout = "555"
+# optional
+# redirects = "/index.html:/page.html"
+# optional
+client_body_temp_path= "var/tmp"
+
+# location_root required
+location_root = "var/www/html/main"
+# required
 indexes = "index.html,index.php,index.py"
 allowed_methods = "POST,DELETE,GET"
-autoindex = "off"
-# upload_enabled = "on"
-upload_store = "/var/www/uploads"
-
-
-# Route 3 (for path "/scripts")
-location3_path = "./scripts/php/"
-location3_root = "/var/www/cgi-bin"
-location3_cgi_enable = ".php,.py"
-location3_cgi_path_info = "on"
+autoindex = "on"
+upload_enabled = "on"
+upload_store = "var/www/html/main/uploads/"
+cgi = "/bin/bash:.sh"
 
 
 ###############################################################################
 # Server 2
 ###############################################################################
 [server.second]
 host = "127.0.0.1"
-port = "9090"
-server_name = "another-server.local"
-
-# Error page for this server
-error_page_403 = "/errors/403.html"
-
-# Route (for path "/static")
-location1_path = "/static"
-location1_root = "/var/www/static"
-allowed_methods = "GET"
-autoindex = "on"
+port = "9000"
+server_name = "second.local"
+location_root = "var/www/html/magic"
+indexes = "index.html,index.php,index.py"
 
 
 ###############################################################################
 # Server 3
 ###############################################################################
 [server.third]
-host = "192.168.1.1"
-port = "8081"
-server_name = "third-server.local"
-client_max_body_size = "2097152"
-
-# Error pages
-error_page_400 = "/errors/400.html"
-error_page_500 = "/errors/500.html"
-
-# Route (for path "/")
-location1_path = "/"
-location1_root = "/var/www/app"
-indexes = "home.html"
-allowed_methods = "GET,POST"
-autoindex = "off"
-location1_upload_enabled = "off"
-
-
-###############################################################################
-# Server 4
-###############################################################################
-[server.fourth]
-host = "10.0.0.1"
-port = "4444,7070"
-server_name = "fourth-server.local"
-client_max_body_size = "5242880"
-
-# Error pages
-error_page_403 = "/errors/403.html"
-error_page_502 = "/errors/502.html"
+host = "0.0.0.0"
+port = "9999"
+server_name = "second.local"
+location_root = "var/www/html/simple"
+indexes = "index.html,index.php,index.py"
 
-# Route (for path "/")
-location1_path = "/"
-location1_root = "/var/www/public"
-indexes = "default.html"
-allowed_methods = "GET,POST,DELETE"
-autoindex = "on"
-location1_upload_enabled = "on"
-location1_upload_store = "/var/www/public/uploads"