github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-16 01:22:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Moving regex from utils to its own namespace

Browse Source
This commit is contained in:
Felipe Zimmerle
2019-01-18 17:52:42 -03:00
parent 3dda0ea2c6
commit d3f9974d52
20 changed files with 146 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/regression/custom_debug_log.cc
View File

@@ -19,7 +19,7 @@
#include <string>
#include "modsecurity/debug_log.h"
#include "src/utils/regex.h"
#include "src/regex/regex.h"
namespace modsecurity_test {
@@ -37,9 +37,9 @@ void CustomDebugLog::write(int level, const std::string &id,
}
bool CustomDebugLog::contains(const std::string& pattern) {
modsecurity::Utils::Regex re(pattern);
modsecurity::regex::Regex re(pattern);
std::string s = m_log.str();
return modsecurity::Utils::regex_search(s, re);
return modsecurity::regex::regex_search(s, re);
}
std::string CustomDebugLog::log_messages() {

12
test/regression/regression.cc
View File

@@ -31,7 +31,7 @@
#include "test/regression/regression_test.h"
#include "test/common/modsecurity_test_results.h"
#include "test/regression/custom_debug_log.h"
#include "src/utils/regex.h"
#include "src/regex/regex.h"
using modsecurity_test::CustomDebugLog;
using modsecurity_test::ModSecurityTest;
@@ -39,9 +39,9 @@ using modsecurity_test::ModSecurityTestResults;
using modsecurity_test::RegressionTest;
using modsecurity_test::RegressionTestResult;
using modsecurity::Utils::regex_search;
using modsecurity::Utils::SMatch;
using modsecurity::Utils::Regex;
using modsecurity::regex::regex_search;
using modsecurity::regex::SMatch;
using modsecurity::regex::Regex;
std::string default_test_path = "test-cases/regression";
std::list<std::string> resources;
@@ -54,8 +54,8 @@ void print_help() {
bool contains(const std::string &s, const std::string &pattern) {
bool ret;
modsecurity::Utils::Regex re(pattern);
ret = modsecurity::Utils::regex_search(s, re);
modsecurity::regex::Regex re(pattern);
ret = modsecurity::regex::regex_search(s, re);
return ret;
}