let's go to the bus

Author: StokesAsselborn

Makefile

@@ -45,6 +45,8 @@ srcs = \
   src/handler/error_handler.hpp \
   src/handler/handler.cpp \
   src/handler/handler.hpp \
+  src/handler/redirect_handler.cpp \
+  src/handler/redirect_handler.hpp \
   src/handler/static_file_handler.cpp \
   src/handler/static_file_handler.hpp \
   src/handler/upload_handler.cpp \
@@ -90,6 +92,7 @@ test_srcs = \
   tests/router_unittest.cpp \
   tests/server_config_unittest.cpp \
   tests/static_file_handler_unittest.cpp \
+  tests/redirect_handler_unittest.cpp \
   tests/str_split_unittest.cpp \
   tests/main.cpp \
 

src/handler/upload_handler.cpp

@@ -21,6 +21,12 @@ UploadHandler::UploadHandler(const std::string& path, const RouteConfig& rc, con
       fd_(-1)
 
 {
+    if (req.content_length == 0) {
+        //set_error(HttpResponse::kStatusBadRequest);
+        //set_error(HttpResponse::kStatusNoContent);
+        set_error(HttpResponse::kStatusOk);
+        return;
+    }
     struct stat file_stat;
     if (stat(path.c_str(), &file_stat) == 0 && S_ISREG(file_stat.st_mode)) {
         set_error(HttpResponse::kStatusConflict); // file already exists

src/http/http_response.cpp

@@ -70,6 +70,8 @@ HttpResponse::Status HttpResponse::status_from_int(int code)
     case 200: return HttpResponse::kStatusOk;
     case 201: return HttpResponse::kStatusCreated;
     case 204: return HttpResponse::kStatusNoContent;
+    case 301: return HttpResponse::kStatusMovedPermanently;
+    case 302: return HttpResponse::kStatusFound;
     case 400: return HttpResponse::kStatusBadRequest;
     case 403: return HttpResponse::kStatusForbidden;
     case 404: return HttpResponse::kStatusNotFound;
@@ -93,6 +95,9 @@ std::string HttpResponse::to_string() const
     if (!content_type.empty()) {
         out << "Content-Type: " << content_type << "\r\n";
     }
+    if (!location.empty()) {
+        out << "Location: " << location << "\r\n";
+    }
     if (!inline_body.empty()) {
         out << "Content-Length: " << inline_body.size() << "\r\n";
     }
@@ -145,8 +150,6 @@ HttpResponse HttpResponse::make_response_headers_only(HttpResponse::Status statu
     res.code = status;
     if (!content_type.empty())
         res.content_type = content_type;
-    else
-        res.content_type = "text/html; charset=UTF-8";
     res.keep_alive = req.keep_alive;
     res.content_length = content_length; // should be empty of content-length = 0
     return res;

src/http/http_response.hpp

@@ -29,16 +29,6 @@ struct HttpResponse {
     };
 
     explicit HttpResponse(HttpVersion protocol = WEBSERV_DEFAULT_HTTP_VERSION);
-    static Status status_from_int(int code);
-    static HttpResponse make_error(HttpResponse::Status status,
-                                   const std::map<HttpResponse::Status, std::string>& error_pages,
-                                   const HttpRequest& req);
-    static HttpResponse make_response_headers_only(HttpResponse::Status status,
-                                                   const std::string& content_type,
-                                                   size_t content_length, const HttpRequest& req);
-    static HttpResponse make_response_with_body(HttpResponse::Status status,
-                                                const std::string& content_type,
-                                                const std::string& body, const HttpRequest& req);
 
     HttpVersion http_version;
     HttpResponse::Status code;
@@ -50,6 +40,7 @@ struct HttpResponse {
 
     std::string content_type;
     size_t content_length;
+    std::string location;
     bool is_chunked;
     bool keep_alive;
 
@@ -60,7 +51,16 @@ struct HttpResponse {
 
     static const char* reason_phrase(HttpResponse::Status status);
     static HttpResponse::Status parse_status(const std::string& s);
-
+    static Status status_from_int(int code);
+    static HttpResponse make_error(HttpResponse::Status status,
+                                   const std::map<HttpResponse::Status, std::string>& error_pages,
+                                   const HttpRequest& req);
+    static HttpResponse make_response_headers_only(HttpResponse::Status status,
+                                                   const std::string& content_type,
+                                                   size_t content_length, const HttpRequest& req);
+    static HttpResponse make_response_with_body(HttpResponse::Status status,
+                                                const std::string& content_type,
+                                                const std::string& body, const HttpRequest& req);
     std::string to_string() const;
 };
 

src/main.cpp

@@ -10,7 +10,7 @@ int main(void)
     setup_signal_handlers();
 
     try {
-        HttpConfig cfg = load_http_config("config/youpi_banane.conf");
+        HttpConfig cfg = load_http_config("config/vitepress.conf");
 
         Server server(cfg.servers[0]);
         server.init();

src/router/router.cpp

@@ -6,6 +6,7 @@
 #include "handler/error_handler.hpp"
 #include "handler/static_file_handler.hpp"
 #include "handler/upload_handler.hpp"
+#include "handler/redirect_handler.hpp"
 #include "http/http_request.hpp"
 #include "http/http_response.hpp"
 #include "util/log_message.hpp"
@@ -124,8 +125,7 @@ Handler* Router::handle_request(const HttpRequest& request)
     const RouteConfig& best_route = find_best_route(request.path);
 
     if (!best_route.shared.redirect.url.empty()) {
-        LOG(WARN) << "Redirections not implemented yet";
-        return new ErrorHandler(HttpResponse::kStatusNotImplemented, best_route, request);
+        return new RedirectHandler(best_route.shared.redirect.code, best_route.shared.redirect.url, best_route, request);
     }
     if (!is_allowed_method(request, best_route)) {
         return new ErrorHandler(HttpResponse::kStatusMethodNotAllowed, best_route, request);

tests/cgi_handler_unittest.cpp

@@ -202,8 +202,8 @@ UTEST(CgiHandler, NotExecutable)
 
 UTEST(CgiHandler, EmptyOutput)
 {
-    TempCgiScript script("echo \"Content-Type: text/html; charset=UTF-8\"\n"
-                         "echo\n");
+    TempCgiScript script(
+        "echo\n""echo\n");
     RouteConfig rc;
     HttpRequest req;
     req.method = "GET";