srngch · hhkim0729 · Oct 2, 2022 · Oct 2, 2022
diff --git a/error_pages/404.html b/error_pages/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>404 Not Found</title>
+  </head>
+  <body>
+    <h1>404 Not Found</h1>
+    <hr />
+    ngin-xs
+  </body>
+</html>
diff --git a/html/index.html b/html/index.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<head>
+  <title>Ngin-xs</title>
+</head>
+<body>
+  <h1>Hello World!</h1>
+</body>
+</html>
diff --git a/html/test.html b/html/test.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<head>
+  <title>test</title>
+</head>
+<body>
+  <h1>/test.html</h1>
+</body>
+</html>
diff --git a/html/test/a.html b/html/test/a.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<head>
+  <title>a</title>
+</head>
+<body>
+  <h1>a</h1>
+</body>
+</html>
diff --git a/html/test/b.html b/html/test/b.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<head>
+  <title>b</title>
+</head>
+<body>
+  <h1>b</h1>
+</body>
+</html>
diff --git a/html/test/index.html b/html/test/index.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<head>
+  <title>test index</title>
+</head>
+<body>
+  <h1>test/index.html</h1>
+</body>
+</html>
diff --git a/srcs/Worker.cpp b/srcs/Worker.cpp
@@ -41,6 +41,16 @@ const char *Worker::InvalidHostHeaderException::what() const throw() {
 	return message_.c_str();
 }
 
+Worker::FileNotFoundException::FileNotFoundException(const std::string str) {
+	message_ = str;
+}
+
+Worker::FileNotFoundException::~FileNotFoundException() throw() {}
+
+const char *Worker::FileNotFoundException::what() const throw() {
+	return message_.c_str();
+}
+
 Worker::Worker(int listenSocket) {
 	struct sockaddr_in	clientAddress;
 	socklen_t			addressLen;
@@ -55,6 +65,7 @@ Worker::Worker(int listenSocket) {
 
 Worker::~Worker() {
 	resetPollfd();
+	delete request_;
 }
 
 void	Worker::setPollfd(struct pollfd *pollfd) {
@@ -78,11 +89,23 @@ ft_bool Worker::work() {
 			ret = recv();
 			if (ret == FT_FALSE)
 				return ret;
-			// 
-			send(buf_);
+			if (request_->getMethod() == "GET") {
+				std::string filePath = std::string(WEB_ROOT) + request_->getUri();
+				if (isDirectory(filePath))
+					filePath += "/index.html"; // TODO: read default file from config
+				if (isFileExist(filePath) == FT_FALSE)
+					throw FileNotFoundException("File not found");
+				Response response(HTTP_OK, fileToString(filePath));
+				send(response.createMessage().c_str());
+			}
 			return ret;
 		}
 		return ret;
+	} catch(FileNotFoundException &e) {
+		std::cerr << e.what() << std::endl;
+		Response response(HTTP_NOT_FOUND, fileToString(std::string(ERROR_PAGES_PATH) + "404.html"));
+		send(response.createMessage().c_str());
+		return FT_TRUE;
 	} catch(InvalidMethodException &e) {
 		std::cerr << e.what() << std::endl;
 		Response response(HTTP_METHOD_NOT_ALLOWED, fileToString(std::string(ERROR_PAGES_PATH) + "405.html"));
@@ -114,8 +137,8 @@ ft_bool Worker::recv() {
 		throw WorkerException("fail: recv()\n");
 	buf_[ret] = '\0';
 	std::cout << "server received(" << ret << "): " << buf_ << std::endl;
-	Request request(buf_);
-	validate(request);
+	request_ = new Request(buf_);
+	validate(*request_);
 	return FT_TRUE;
 }
 

diff --git a/srcs/Worker.hpp b/srcs/Worker.hpp
@@ -23,7 +23,7 @@ class Worker {
 	int				connectSocket_;
 	char			buf_[BUFFER_LENGTH];
 	struct pollfd	*pollfd_;
-	std::string		statusCode_;
+	Request			*request_;
 
 	ft_bool	recv();
 	// void	unchunk();
@@ -73,6 +73,15 @@ class Worker {
 		~InvalidHostHeaderException() throw();
 		virtual const char *what() const throw();
 	};
+
+	class FileNotFoundException : public std::exception {
+	private:
+		std::string message_;
+	public:
+		FileNotFoundException(const std::string str);
+		~FileNotFoundException() throw();
+		virtual const char *what() const throw();
+	};
 };
 
 #endif
diff --git a/srcs/utils.cpp b/srcs/utils.cpp
@@ -19,7 +19,13 @@ std::vector<std::string> split(const std::string &str, std::string delim) {
 	return splitedMessage;
 }
 
-std::string fileToString(const std::string filePath) {
+ft_bool isFileExist(const std::string &filePath)
+{
+    std::ifstream file(filePath);
+    return file.good();
+}
+
+std::string fileToString(const std::string &filePath) {
 	std::string		str = "";
 	std::ifstream	openFile(filePath);
 
@@ -37,3 +43,9 @@ ft_bool isIncluded(const std::string &value, const std::vector<std::string> &arr
 {
 	return (std::find(array.begin(), array.end(), value) != array.end());
 }
+
+ft_bool isDirectory(const std::string &filePath)
+{
+	struct stat	buffer;
+	return (stat(filePath.c_str(), &buffer) == 0);
+}
diff --git a/srcs/utils.hpp b/srcs/utils.hpp
@@ -5,6 +5,7 @@
 #include <vector>
 #include <fstream>
 #include <sstream>
+#include <sys/stat.h>
 #include "macro.hpp"
 
 template <typename T>
@@ -17,7 +18,9 @@ std::string ntos (T n)
 }
 
 std::vector<std::string> split(const std::string &str, std::string delim);
-std::string fileToString(const std::string filePath);
+ft_bool isFileExist(const std::string &filePath);
+std::string fileToString(const std::string &filePath);
 ft_bool isIncluded(const std::string &value, const std::vector<std::string> &array);
+ft_bool isDirectory(const std::string &filePath);
 
 #endif