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

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

5
examples/multiprocess_c/multi.c
View File

@@ -15,7 +15,7 @@
#include <modsecurity/modsecurity.h>
#include <modsecurity/transaction.h>
#include <modsecurity/rules.h>
#include <modsecurity/rules_set.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -24,12 +24,13 @@
#include <sys/wait.h>
#include <sys/time.h>
#define FORKS 5
#define REQUESTS_PER_PROCESS 100
char main_rule_uri[] = "basic_rules.conf";
Rules *rules = NULL;
RulesSet *rules = NULL;
ModSecurity *modsec = NULL;

8
examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h
View File

@@ -69,14 +69,14 @@ char ip[] = "200.249.12.31";
struct data_ms {
modsecurity::ModSecurity *modsec;
modsecurity::Rules *rules;
modsecurity::RulesSet *rules;
};
static void *process_request(void *data) {
struct data_ms *a = (struct data_ms *)data;
modsecurity::ModSecurity *modsec = a->modsec;
modsecurity::Rules *rules = a->rules;
modsecurity::RulesSet *rules = a->rules;
int z = 0;
for (z = 0; z < 10000; z++) {
@@ -132,7 +132,7 @@ class ReadingLogsViaRuleMessage {
void *status;
modsecurity::ModSecurity *modsec;
modsecurity::Rules *rules;
modsecurity::RulesSet *rules;
modsec = new modsecurity::ModSecurity();
modsec->setConnectorInformation("ModSecurity-test v0.0.1-alpha" \
@@ -140,7 +140,7 @@ class ReadingLogsViaRuleMessage {
modsec->setServerLogCb(logCb, modsecurity::RuleMessageLogProperty
| modsecurity::IncludeFullHighlightLogProperty);
rules = new modsecurity::Rules();
rules = new modsecurity::RulesSet();
if (rules->loadFromUri(m_rules.c_str()) < 0) {
std::cout << "Problems loading the rules..." << std::endl;
std::cout << rules->m_parserError.str() << std::endl;

2
examples/reading_logs_via_rule_message/simple_request.cc
View File

@@ -17,7 +17,7 @@
#include <string.h>
#include <modsecurity/modsecurity.h>
#include <modsecurity/rules.h>
#include <modsecurity/rules_set.h>
#include "examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h"

4
examples/simple_example_using_c/test.c
View File

@@ -18,7 +18,7 @@
#include <stdlib.h>
#include "modsecurity/modsecurity.h"
#include "modsecurity/rules.h"
#include "modsecurity/rules_set.h"
char main_rule_uri[] = "basic_rules.conf";
@@ -29,7 +29,7 @@ int main (int argc, char **argv)
const char *error = NULL;
ModSecurity *modsec;
Transaction *transaction = NULL;
Rules *rules;
RulesSet *rules;
modsec = msc_init();

7
examples/using_bodies_in_chunks/simple_request.cc
View File

@@ -19,7 +19,7 @@
#include <modsecurity/modsecurity.h>
#include <modsecurity/rules.h>
#include <modsecurity/rules_set.h>
#include <modsecurity/rule_message.h>
@@ -28,6 +28,7 @@
char request_uri[] = "/test.pl?param1=test&para2=test2";
char request_body_first[] = "" \
@@ -125,7 +126,7 @@ int process_intervention(modsecurity::Transaction *transaction) {
int main(int argc, char **argv) {
modsecurity::ModSecurity *modsec;
modsecurity::Rules *rules;
modsecurity::RulesSet *rules;
if (argc < 2) {
std::cout << "Use " << *argv << " test-case-file.conf";
@@ -150,7 +151,7 @@ int main(int argc, char **argv) {
* loading the rules....
*
*/
rules = new modsecurity::Rules();
rules = new modsecurity::RulesSet();
if (rules->loadFromUri(rules_arg.c_str()) < 0) {
std::cout << "Problems loading the rules..." << std::endl;
std::cout << rules->m_parserError.str() << std::endl;