willem/webserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: implement method support check in Router for HTTP requests

Browse Source
This commit is contained in:
Quinten 2025-10-07 17:03:57 +02:00
parent ec683f1690
commit e0efb0192c
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
webserv/router/Router.cpp
View File

@ -1,4 +1,4 @@
#include <webserv/router/Router.hpp>
#include "webserv/config/directive/ADirective.hpp"
#include <webserv/config/ConfigManager.hpp> // for ConfigManager
#include <webserv/config/ServerConfig.hpp> // for ServerConfig
@ -7,15 +7,29 @@
#include <webserv/handler/URIParser.hpp> // for URIParser
#include <webserv/http/HttpHeaders.hpp> // for HttpHeaders
#include <webserv/log/Log.hpp> // for LOCATION, Log
#include <webserv/router/Router.hpp>
#include <algorithm>
#include <memory> // for unique_ptr
#include <optional> // for optional
#include <string> // for basic_string, string
#include <vector>
class LocationConfig;
Router::Router() {}
bool Router::isMethodSupported(const std::string &method, const LocationConfig &location)
{
const ADirective *allowedMethods = location.getDirective("allowed_methods");
if (allowedMethods == nullptr || !allowedMethods->getValue().try_get<std::vector<std::string>>().has_value())
{
return true;
}
auto methods = allowedMethods->getValue().get<std::vector<std::string>>();
return std::ranges::find(methods, method) != methods.end();
}
std::unique_ptr<HttpResponse> Router::handleRequest(const HttpRequest &request)
{
Log::trace(LOCATION);
@ -37,7 +51,10 @@ std::unique_ptr<HttpResponse> Router::handleRequest(const HttpRequest &request)
{
return ErrorHandler::getErrorResponse(404, config);
}
if (!isMethodSupported(method, *location))
{
return ErrorHandler::getErrorResponse(405, config);
}
FileHandler fileHandler(location, uriParser);
return fileHandler.getResponse();
}

1
webserv/router/Router.hpp
View File

@ -19,4 +19,5 @@ class Router
private:
[[nodiscard]] const LocationConfig *getLocation(const std::string &path, const ServerConfig &serverConfig) const;
[[nodiscard]] static bool isMethodSupported(const std::string &method, const LocationConfig &location);
};