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

Refactoring: Renames Rules to RulesSet

Browse Source 
RulesSet does not only contain rules but alse properties
This commit is contained in:
Felipe Zimmerle
2018-11-13 15:29:55 -03:00
parent 0c3e8b6b59
commit 7495675d54
47 changed files with 239 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/benchmark/benchmark.cc
View File

@@ -19,8 +19,8 @@
#include <iostream>
#include <string>
#include "modsecurity/rules_set.h"
#include "modsecurity/modsecurity.h"
#include "modsecurity/rules.h"
using modsecurity::Transaction;
@@ -71,14 +71,14 @@ int main(int argc, char *argv[]) {
}
std::cout << "Doing " << NUM_REQUESTS << " transactions...\n";
modsecurity::ModSecurity *modsec;
modsecurity::Rules *rules;
modsecurity::RulesSet *rules;
modsecurity::ModSecurityIntervention it;
modsecurity::intervention::reset(&it);
modsec = new modsecurity::ModSecurity();
modsec->setConnectorInformation("ModSecurity-benchmark v0.0.1-alpha" \
" (ModSecurity benchmark utility)");
rules = new modsecurity::Rules();
rules = new modsecurity::RulesSet();
if (rules->loadFromUri(rules_file) < 0) {
std::cout << "Problems loading the rules..." << std::endl;
std::cout << rules->m_parserError.str() << std::endl;

5
test/fuzzer/afl_fuzzer.cc
View File

@@ -15,9 +15,8 @@
#include <string.h>
#include "modsecurity/rules_set.h"
#include "modsecurity/modsecurity.h"
#include "modsecurity/rules.h"
#include "src/actions/transformations/transformation.h"
/**
@@ -135,7 +134,7 @@ int main(int argc, char** argv) {
std::string z = lastString;
ModSecurity *ms = new ModSecurity();
Rules *rules = new Rules();
RulesSet *rules = new RulesSet();
// Here it is possible to load a real transaction from a JSON.
// like we do on the regression tests.
Transaction *t = new Transaction(ms, rules, NULL);

4
test/optimization/optimization.cc
View File

@@ -20,8 +20,8 @@
#include <string>
#include <list>
#include "modsecurity/rules_set.h"
#include "modsecurity/modsecurity.h"
#include "modsecurity/rules.h"
#include "src/utils/system.h"
#include "src/parser/driver.h"
#include "src/utils/https_client.h"
@@ -36,7 +36,7 @@ void print_help() {
int main(int argc, char **argv) {
modsecurity::Rules *modsecRules = new modsecurity::Rules();
modsecurity::RulesSet *modsecRules = new modsecurity::RulesSet();
std::list<std::string> files;
int total = 0;

7
test/regression/regression.cc
View File

@@ -23,9 +23,8 @@
#include <list>
#include <algorithm>
#include "modsecurity/rules_set.h"
#include "modsecurity/modsecurity.h"
#include "modsecurity/rules.h"
#include "test/common/modsecurity_test.h"
#include "test/common/colors.h"
#include "test/regression/regression_test.h"
@@ -99,7 +98,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
for (RegressionTest *t : *tests) {
CustomDebugLog *debug_log = new CustomDebugLog();
modsecurity::ModSecurity *modsec = NULL;
modsecurity::Rules *modsec_rules = NULL;
modsecurity::RulesSet *modsec_rules = NULL;
modsecurity::Transaction *modsec_transaction = NULL;
ModSecurityTestResults<RegressionTest> r;
std::stringstream serverLog;
@@ -148,7 +147,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
modsec->setConnectorInformation("ModSecurity-regression v0.0.1-alpha" \
" (ModSecurity regression test utility)");
modsec->setServerLogCb(logCb);
modsec_rules = new modsecurity::Rules(debug_log);
modsec_rules = new modsecurity::RulesSet(debug_log);
bool found = true;
if (t->resource.empty() == false) {

3
test/unit/unit.cc
View File

@@ -20,9 +20,8 @@
#include <ctime>
#include <string>
#include "modsecurity/rules_set.h"
#include "modsecurity/modsecurity.h"
#include "modsecurity/rules.h"
#include "src/operators/operator.h"
#include "src/actions/transformations/transformation.h"
#include "modsecurity/transaction.h"