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

feat: detect invalid tokens

Browse Source
This commit is contained in:
3lswear
2022-02-12 20:20:09 +03:00
parent 6b244dc57f
commit 15ae2b131f
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/config/Tokenizer.cpp
View File

@@ -38,6 +38,15 @@ namespace config
else
return (false);
}
bool istomlmapdecl(char c)
{
if (isalnum(c) || c == '-' || c == '_' || c == '.')
return (true);
else
return (false);
}
Tokenizer::Tokenizer(char *filename)
{
last_token = NO_TOK;
@@ -99,7 +108,7 @@ namespace config
{
token.type = MAPARRAY_DECL;
file.get(c);
while (c != ']')
while (c != ']' && config::istomlmapdecl(c))
{
token.value += c;
file.get(c);
@@ -107,7 +116,7 @@ namespace config
if (c == ']')
file.get(c);
if (c != ']')
throw std::logic_error("error in MAPARRAY_DECL");
throw InvalidToken("[[" + token.value);
}
else
{
@@ -120,7 +129,8 @@ namespace config
file.get(c);
}
if (c != ']')
throw std::logic_error("malformed MAP_DECL");
// throw std::logic_error("malformed MAP_DECL");
throw InvalidToken(token.value);
}
}
else if (c == '[')
@@ -233,6 +243,16 @@ namespace config
token.type = NEWLINE;
}
else
{
while (!config::isspace(c) && (c != '\n'))
{
DBOUT << RED << "[" << c << "]" <<ENDL;
token.value += c;
file.get(c);
}
throw InvalidToken(token.value);
}
last_token = token.type;
DBOUT << YELLO << "GOT " << token.value << ", type: " << token.type << ENDL;

2
src/config/Tokenizer.hpp
View File

@@ -43,6 +43,8 @@ namespace config
bool istomlkey(char c);
bool istomlmapdecl(char c);
class Tokenizer
{
private: