github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Moves string related functions from utils' to utils/string'

Browse Source
This commit is contained in:
Felipe Zimmerle
2016-11-01 14:59:06 -03:00
parent 9733cacd4d
commit 73c4d69174
25 changed files with 403 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,7 @@ class Driver;
#include "operators/operator.h"
#include "utils.h"
#include "utils/geo_lookup.h"
#include "utils/msc_string.h"
#include "variables/xml.h"
#include "variables/duration.h"
#include "variables/env.h"
@@ -121,7 +122,7 @@ using modsecurity::actions::Ver;
using modsecurity::actions::transformations::None;
using modsecurity::actions::transformations::Transformation;
using modsecurity::operators::Operator;
using modsecurity::removeBracketsIfNeeded;
using modsecurity::utils::String;
@@ -577,7 +578,7 @@ expression:
}
| CONFIG_DIR_SEC_MARKER
{
driver.addSecMarker(removeBracketsIfNeeded($1));
driver.addSecMarker(String::removeBracketsIfNeeded($1));
}
| CONFIG_DIR_RULE_ENG CONFIG_VALUE_OFF
{

5
src/parser/seclang-scanner.ll
View File

@@ -8,10 +8,11 @@
#include "seclang-parser.hh"
#include "utils/https_client.h"
#include "src/utils.h"
#include "utils/msc_string.h"
using modsecurity::Parser::Driver;
using modsecurity::Utils::HttpsClient;
using modsecurity::split;
using modsecurity::utils::String;
typedef yy::seclang_parser p;
@@ -436,7 +437,7 @@ VAR_FREE_TEXT_SPACE_COMMA [^, \t\"]+
std::string key;
std::string url;
std::vector<std::string> conf = split(yytext, ' ');
std::vector<std::string> conf = String::split(yytext, ' ');
key = conf[1];
url = conf[2];
c.setKey(key);