github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 13:56:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix namespace utilization on seclang-parser.yy

Browse Source
This commit is contained in:
Felipe Zimmerle 2019-03-06 15:12:44 -03:00
parent 6d5198b1a6
commit b9ed150224
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
3 changed files with 485 additions and 563 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

950
src/parser/seclang-parser.cc
View File

File diff suppressed because it is too large Load Diff

51
src/parser/seclang-parser.hh
View File

@ -294,50 +294,11 @@ class Driver;
#include "src/variables/session.h"
#include "src/variables/status.h"
using modsecurity::ModSecurity;
using modsecurity::Rule;
using modsecurity::Utils::GeoLookup;
using modsecurity::Variables::Duration;
using modsecurity::Variables::Env;
using modsecurity::Variables::HighestSeverity;
using modsecurity::Variables::ModsecBuild;
using modsecurity::Variables::RemoteUser;
using modsecurity::Variables::TimeDay;
using modsecurity::Variables::TimeEpoch;
using modsecurity::Variables::TimeHour;
using modsecurity::Variables::TimeMin;
using modsecurity::Variables::TimeMon;
using modsecurity::Variables::TimeSec;
using modsecurity::Variables::TimeWDay;
using modsecurity::Variables::TimeYear;
using modsecurity::Variables::Time;
using modsecurity::Variables::Tx_DictElement;
using modsecurity::Variables::Tx_NoDictElement;
using modsecurity::Variables::Tx_DictElementRegexp;
using modsecurity::Variables::Ip_DictElement;
using modsecurity::Variables::Ip_NoDictElement;
using modsecurity::Variables::Ip_DictElementRegexp;
using modsecurity::Variables::Global_DictElement;
using modsecurity::Variables::Global_NoDictElement;
using modsecurity::Variables::Global_DictElementRegexp;
using modsecurity::Variables::Session_DictElement;
using modsecurity::Variables::Session_NoDictElement;
using modsecurity::Variables::Session_DictElementRegexp;
using modsecurity::Variables::Variable;
using modsecurity::Variables::VariableModificatorExclusion;
using modsecurity::Variables::VariableModificatorCount;
using modsecurity::Variables::XML;
using namespace modsecurity;
using modsecurity::operators::Operator;
using namespace modsecurity::Variables;
using namespace modsecurity::Utils;
using namespace modsecurity::operators;
#define CHECK_VARIATION_DECL \
@ -386,7 +347,7 @@ using modsecurity::operators::Operator;
a = std::move(c);
#line 390 "seclang-parser.hh" // lalr1.cc:403
#line 351 "seclang-parser.hh" // lalr1.cc:403
# include <cassert>
# include <cstdlib> // std::abort
@ -480,7 +441,7 @@ using modsecurity::operators::Operator;
namespace yy {
#line 484 "seclang-parser.hh" // lalr1.cc:403
#line 445 "seclang-parser.hh" // lalr1.cc:403
/// A stack with random access from its top.
template <typename T, typename S = std::vector<T> >
@ -6441,7 +6402,7 @@ namespace yy {
} // yy
#line 6445 "seclang-parser.hh" // lalr1.cc:403
#line 6406 "seclang-parser.hh" // lalr1.cc:403

47
src/parser/seclang-parser.yy
View File

@ -256,50 +256,11 @@ class Driver;
#include "src/variables/session.h"
#include "src/variables/status.h"
using modsecurity::ModSecurity;
using modsecurity::Rule;
using modsecurity::Utils::GeoLookup;
using modsecurity::Variables::Duration;
using modsecurity::Variables::Env;
using modsecurity::Variables::HighestSeverity;
using modsecurity::Variables::ModsecBuild;
using modsecurity::Variables::RemoteUser;
using modsecurity::Variables::TimeDay;
using modsecurity::Variables::TimeEpoch;
using modsecurity::Variables::TimeHour;
using modsecurity::Variables::TimeMin;
using modsecurity::Variables::TimeMon;
using modsecurity::Variables::TimeSec;
using modsecurity::Variables::TimeWDay;
using modsecurity::Variables::TimeYear;
using modsecurity::Variables::Time;
using modsecurity::Variables::Tx_DictElement;
using modsecurity::Variables::Tx_NoDictElement;
using modsecurity::Variables::Tx_DictElementRegexp;
using modsecurity::Variables::Ip_DictElement;
using modsecurity::Variables::Ip_NoDictElement;
using modsecurity::Variables::Ip_DictElementRegexp;
using modsecurity::Variables::Global_DictElement;
using modsecurity::Variables::Global_NoDictElement;
using modsecurity::Variables::Global_DictElementRegexp;
using modsecurity::Variables::Session_DictElement;
using modsecurity::Variables::Session_NoDictElement;
using modsecurity::Variables::Session_DictElementRegexp;
using modsecurity::Variables::Variable;
using modsecurity::Variables::VariableModificatorExclusion;
using modsecurity::Variables::VariableModificatorCount;
using modsecurity::Variables::XML;
using namespace modsecurity;
using modsecurity::operators::Operator;
using namespace modsecurity::Variables;
using namespace modsecurity::Utils;
using namespace modsecurity::operators;
#define CHECK_VARIATION_DECL \
@ -1572,7 +1533,7 @@ expression:
driver.error(@0, ss.str());
YYERROR;
}
if (GeoLookup::getInstance().setDataBase(file, &err) == false) {
if (Utils::GeoLookup::getInstance().setDataBase(file, &err) == false) {
std::stringstream ss;
ss << "Failed to load the GeoDB from: ";
ss << file << ". " << err;