Redirects alec

assets/index.html

@@ -262,13 +262,6 @@ <h3>Special Files</h3>
 					<a href="/assets/old_index.html" class="btn">Archive File</a>
 				</div>
 			</div>
-            <!-- GET Tests -->
-            <h3><span class="method-badge get">GET</span> Method Tests</h3>
-            <div class="button-row">
-                <a href="/index.html" class="btn">Get HTML File</a>
-                <a href="/assets/style.css" class="btn">Get CSS File</a>
-                <a href="/assets/test.jpg" class="btn">Get Image File</a>
-            </div>
 
             <!-- POST Tests -->
             <h3><span class="method-badge post">POST</span> Method Test</h3>
@@ -343,13 +336,6 @@ <h3>Directory Tests</h3>
                 <a href="/empty/" class="btn">Empty Directory Test</a>
             </div>
 
-            <h3>Static Files</h3>
-            <div class="button-row">
-                <a href="/test.html" class="btn">HTML File</a>
-                <a href="/test.txt" class="btn">Text File</a>
-                <a href="/test.pdf" class="btn">PDF File</a>
-                <a href="/test.json" class="btn">JSON File</a>
-            </div>
         </div>
 
         <!-- CGI Tests -->

conf/default.conf

@@ -1,5 +1,5 @@
 server {
-	listen 0.0.0.0:8081;
+	listen 0.0.0.0:8001;
 	server_name localhost;
 	root ./;
 	autoindex on;

conf/redirect.conf

@@ -0,0 +1,79 @@
+server {
+	listen 0.0.0.0:9050;
+	server_name localhost;
+	root ./;
+	autoindex on;
+	client_max_body_size 1m;
+	index assets/index.html;
+	use_chunked_encoding true;
+	chunk_size 100;
+    allowed_redirects 301 https://google.com;
+
+# Custom error pages
+	error_page 404 /error_page/404.html;
+	error_page 403 /error_page/403.html;
+	error_page 500 /error_page/500.html;
+
+# Main site and directory listing test
+	location /assets/ {
+		root ./;
+		index old_index.html;
+		allowed_methods GET;
+		autoindex on;
+	}
+
+	location /cgi-bin/ {
+		root ./;
+		allowed_methods GET POST;
+		cgi_path /usr/bin/python3 /usr/bin/php;
+		cgi_ext .py .php;
+		autoindex off;
+	}
+
+	location /uploads/ {
+		root ./;
+		allowed_methods POST GET DELETE;
+	}
+}
+
+server {
+	listen 0.0.0.0:9051;
+	server_name localhost;
+	root ./;
+	autoindex on;
+	client_max_body_size 1m;
+	index assets/index.html;
+	use_chunked_encoding true;
+	chunk_size 100;
+
+# Custom error pages
+	error_page 404 /error_page/404.html;
+	error_page 403 /error_page/403.html;
+	error_page 500 /error_page/500.html;
+
+# Main site and directory listing test
+	location /assets/ {
+		root ./;
+		index old_index.html;
+		allowed_methods GET;
+		autoindex on;
+	}
+
+    location /google/ {
+        allowed_redirects 301 https://google.com;
+    }
+
+	location /cgi-bin/ {
+		root ./;
+		allowed_methods GET POST;
+		cgi_path /usr/bin/python3 /usr/bin/php;
+		cgi_ext .py .php;
+		autoindex off;
+	}
+
+	location /uploads/ {
+		root ./;
+		allowed_methods POST GET DELETE;
+	}
+
+}

inc/Config.hpp

@@ -35,7 +35,7 @@ class Config {
 	void	setServerConf( ServerConf server );
 
 	//member fucnitons
-        void	parse( std::string& filename );
+    void	parse( std::string& filename );
 	void	parseServerConfBlock( ServerConf& server );
 	void	parseLocationConfBlock( ServerConf&, std::stringstream& );
 };

inc/HttpRequest.hpp

@@ -20,6 +20,7 @@ class HttpRequest {
 		//cgi response string 
 		std::string											_cgiResponseString;
         std::string                                          _hostname;
+        int                                                  _port;
 
         // reference to which serverConf i have matched from request
         ServerConf                                          _server;
@@ -46,6 +47,7 @@ class HttpRequest {
         ServerConf						                        getServer() const;
         PathInfo                                                getPathInfo() const;
 		std::string                                             getCgiResponseString() const;
+        int                                                     getPort() const;
 
         //setters
         void	setMethod( std::string );
@@ -59,6 +61,7 @@ class HttpRequest {
         void	setServer( ServerConf );
         void    setPathInfo( PathInfo );
 		void    setCgiResponseString(const std::string& cgiResponseString);
+        void    setPort(const int port);
 
         // main handler
         void    handleRequest(const std::string& rawRequest);

inc/Response.hpp

@@ -27,6 +27,8 @@ class Response {
 		std::string									_reasonPhrase;
 		const ServerConf*							_serverConf;
 		LocationConf* 								_locationConf;
+		// for redirects
+		std::string									_redirectDest;
 
 		// to make cookies work
 		// cookie value we want to have
@@ -62,6 +64,10 @@ class Response {
 		bool serveRootIndexfile(HttpRequest& ReqObj, std::string fullPath);
 		bool serveLocationIndex(HttpRequest& ReqObj);
 
+
+
+		// Handlers
+		void HandleRedirectRequest(HttpRequest& ReqObj, std::map<std::string, std::string > redirect);
 		void HandleDeleteRequest(HttpRequest& ReqObj, PathInfo& pathInfo);
 		void HandlePostRequest(HttpRequest& ReqObj,PathInfo& pathinfo);
 		void genarateUploadSucces(HttpRequest& ReqObj);
@@ -80,6 +86,7 @@ class Response {
 		std::string getServerName();
 		std::string getCurrentDateTime();
 		std::string getContentType(HttpRequest &reqObj, const std::string& extension);
+		std::string getRedirectDest();
 
         // Setters
         void setHttpResponse(const std::string& httpResponse) { _httpResponse = httpResponse; }
@@ -91,6 +98,7 @@ class Response {
         void setFilename(const std::string& filename) { _filename = filename; }
         void setStatusCode(int statusCode) { m_statusCode = statusCode; }
 		void setReasonPhrase(const std::string &reasonPhrase);
+		void setRedirectDest(const std::string& redirectDest) { _redirectDest = redirectDest; };
 
 		// for cookie setter
 		void setSetCookieValue(std::string value);

src/Config/ServerConfAccess.cpp

@@ -32,11 +32,11 @@ void	ServerConf::checkAccess( void ){
 		throw( std::runtime_error( \
 			"RootDir: " + _rootDir + " not accsessible" ) );
 
-	//check every location
-	for( std::vector< LocationConf >::iterator it = _locations.begin(); \
-			it != _locations.end(); it++ ){
-		it->checkAccess( _rootDir );	
-	}
+	// //check every location
+	// for( std::vector< LocationConf >::iterator it = _locations.begin(); 
+	// 		it != _locations.end(); it++ ){
+	// 	it->checkAccess( _rootDir );	
+	// }
 
 	//check every errorpage path
 	for( std::map< int, std::string >::iterator it = _errorPages.begin(); \