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

test-only: Placing a mutex while evaluating the pm operator

Browse Source 
Performing an earlier optimization of the tree (before threads creation)
This commit is contained in:
Felipe Zimmerle 2017-09-07 22:23:07 -03:00
parent a2427df27f
commit 119a6fc074
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/operators/pm.cc
View File

@ -40,6 +40,7 @@ Pm::~Pm() {
free(m_p);
m_p = NULL;
pthread_mutex_destroy(&m_lock);
}
@ -86,8 +87,9 @@ bool Pm::evaluate(Transaction *transaction, Rule *rule,
pt.parser = m_p;
pt.ptr = NULL;
const char *match = NULL;
pthread_mutex_lock(&m_lock);
rc = acmp_process_quick(&pt, &match, input.c_str(), input.length());
pthread_mutex_unlock(&m_lock);
bool capture = rule && rule->getActionsByName("capture").size() > 0;
if (rc > 0 && transaction) {
@ -114,6 +116,8 @@ bool Pm::init(const std::string &file, std::string *error) {
std::istringstream *iss;
const char *err = NULL;
pthread_mutex_init(&m_lock, NULL);
char *content = parse_pm_content(m_param.c_str(), m_param.length(), &err);
if (content == NULL) {
iss = new std::istringstream(m_param);
@ -129,7 +133,9 @@ bool Pm::init(const std::string &file, std::string *error) {
acmp_add_pattern(m_p, a.c_str(), NULL, NULL, a.length());
}
acmp_prepare(m_p);
while (m_p->is_failtree_done == 0) {
acmp_prepare(m_p);
}
if (content) {
free(content);

3
src/operators/pm.h
View File

@ -55,6 +55,9 @@ class Pm : public Operator {
protected:
ACMP *m_p;
private:
pthread_mutex_t m_lock;
};

20
src/utils/acmp.cc
View File

@ -297,6 +297,10 @@ static void acmp_add_btree_leaves(acmp_btree_node_t *node, acmp_node_t *nodes[],
if ((pos - lb) > 1) {
left = lb + (pos - lb) / 2;
node->left = reinterpret_cast<acmp_btree_node_t *>(calloc(1, sizeof(acmp_btree_node_t)));
node->left->node = NULL;
node->left->right = NULL;
node->left->left = NULL;
node->left->letter = 0;
/* ENH: Check alloc succeded */
node->left->node = nodes[left];
node->left->letter = nodes[left]->letter;
@ -307,6 +311,10 @@ static void acmp_add_btree_leaves(acmp_btree_node_t *node, acmp_node_t *nodes[],
if ((rb - pos) > 1) {
right = pos + (rb - pos) / 2;
node->right = reinterpret_cast<acmp_btree_node_t *>(calloc(1, sizeof(acmp_btree_node_t)));
node->right->node = NULL;
node->right->right = NULL;
node->right->left = NULL;
node->right->letter = 0;
/* ENH: Check alloc succeded */
node->right->node = nodes[right];
node->right->letter = nodes[right]->letter;
@ -355,8 +363,12 @@ static void acmp_build_binary_tree(ACMP *parser, acmp_node_t *node) {
nodes[i] = nodes[j];
nodes[j] = tmp;
}
if (node->btree) { free (node->btree); node->btree = NULL; }
if (node->btree != NULL) {
free(node->btree);
node->btree = NULL;
}
node->btree = reinterpret_cast<acmp_btree_node_t *>(calloc(1, sizeof(acmp_btree_node_t)));
/* ENH: Check alloc succeded */
pos = count / 2;
node->btree->node = nodes[pos];
@ -365,7 +377,9 @@ static void acmp_build_binary_tree(ACMP *parser, acmp_node_t *node) {
for (i = 0; i < count; i++) {
if (nodes[i]->child != NULL) acmp_build_binary_tree(parser, nodes[i]);
}
free(nodes);
if (nodes != NULL) {
free(nodes);
}
}
/**
@ -532,9 +546,11 @@ int acmp_process_quick(ACMPT *acmpt, const char **match, const char *data, size_
const char *end;
int offset = 0;
/*
if (acmpt->parser->is_failtree_done == 0) {
acmp_prepare(acmpt->parser);
};
*/
parser = acmpt->parser;
if (acmpt->ptr == NULL) acmpt->ptr = parser->root_node;