roman/webserv
1
0
Fork 0
mirror of https://github.com/3lswear/webserv.git synced 2025-10-29 05:17:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

add: client body limit in locations

Browse Source
This commit is contained in:
Talyx
2022-02-10 19:28:20 +03:00
parent 586ada6f15
commit abff8b474f
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Server/ServerConfig.cpp
View File

@@ -3,12 +3,17 @@
ServerConfig::ServerConfig() ServerConfig::ServerConfig()
{ {
ret = 0; ret = 0;
_clientBodySize = 0;
_port = 0;
} }
ServerConfig::ServerConfig(TOMLMap *map) ServerConfig::ServerConfig(TOMLMap *map)
{ {
ret = 0; ret = 0;
server = map; server = map;
_clientBodySize = 0;
_port = 0;
fillFields(); fillFields();
} }
@@ -133,6 +138,13 @@ int ServerConfig::putPort(toml_node *node)
_port = node->getNum(); _port = node->getNum();
return (0); return (0);
} }
void ServerConfig::resetLocation(location *tmp)
{
tmp->autoindex = false;
tmp->uploadAccept = false;
tmp->clientBodySize = 0;
}
int ServerConfig::putLocation(toml_node *node) int ServerConfig::putLocation(toml_node *node)
{ {
if (node->get_type() != toml_node::MAPARRAY) if (node->get_type() != toml_node::MAPARRAY)
@@ -152,6 +164,7 @@ int ServerConfig::putLocation(toml_node *node)
map = *it; map = *it;
it1 = map->begin(); it1 = map->begin();
tmp = new location; tmp = new location;
resetLocation(tmp);
while (it1 != map->end()) while (it1 != map->end())
{ {
if (it1->first == "location") if (it1->first == "location")
@@ -190,6 +203,12 @@ int ServerConfig::putLocation(toml_node *node)
return (1); return (1);
tmp->cgi_pass = *it1->second->getString(); tmp->cgi_pass = *it1->second->getString();
} }
else if (it1->first == "body_size_limit")
{
if (node->get_type() != toml_node::NUM)
return (1);
tmp->clientBodySize = it1->second->getNum();
}
else if (it1->first == "directory_file") else if (it1->first == "directory_file")
{ {
if (it1->second->get_type() != toml_node::STRING) if (it1->second->get_type() != toml_node::STRING)
@@ -288,6 +307,7 @@ void ServerConfig::printFields(void)
std::cout << YELLOW << "autoindex " << BLUE << (*it)->autoindex <<std::endl; std::cout << YELLOW << "autoindex " << BLUE << (*it)->autoindex <<std::endl;
std::cout << YELLOW << "uploadAccept " << BLUE << (*it)->uploadAccept <<std::endl; std::cout << YELLOW << "uploadAccept " << BLUE << (*it)->uploadAccept <<std::endl;
std::cout << YELLOW << "cgi_pass " << BLUE << (*it)->cgi_pass <<std::endl; std::cout << YELLOW << "cgi_pass " << BLUE << (*it)->cgi_pass <<std::endl;
std::cout << YELLOW << "client_body_size " << BLUE << (*it)->clientBodySize <<std::endl;
std::cout << YELLOW << "methods " << std::endl; std::cout << YELLOW << "methods " << std::endl;
it2 = (*it)->methods.begin(); it2 = (*it)->methods.begin();
while (it2 != (*it)->methods.end()) while (it2 != (*it)->methods.end())

2
src/Server/ServerConfig.hpp
View File

@@ -15,6 +15,7 @@ struct location
std::vector<std::string> methods; std::vector<std::string> methods;
std::map<int, std::string> redirect; std::map<int, std::string> redirect;
std::string cgi_pass; std::string cgi_pass;
unsigned int clientBodySize;
}; };
struct serverListen struct serverListen
@@ -37,6 +38,7 @@ private:
std::map<int, std::string> _errorPages; std::map<int, std::string> _errorPages;
std::vector<location *> _locations; std::vector<location *> _locations;
void resetLocation(location *);
public: public:
void setServerName(std::string); void setServerName(std::string);
void setHost(std::string); void setHost(std::string);