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

Makes @pm compatible with the brand new capture schema

Browse Source
This commit is contained in:
Felipe Zimmerle 2016-11-23 17:10:06 -03:00
parent eecb90cfd0
commit 7a36499f22
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/operators/pm.cc
View File

@ -88,7 +88,8 @@ void Pm::replaceAll(std::string str, const std::string& from,
} }
} }
bool Pm::evaluate(Transaction *transaction, const std::string &input) { bool Pm::evaluate(Transaction *transaction, Rule *rule,
const std::string &input) {
int rc = 0; int rc = 0;
ACMPT pt; ACMPT pt;
pt.parser = m_p; pt.parser = m_p;
@ -96,10 +97,19 @@ bool Pm::evaluate(Transaction *transaction, const std::string &input) {
const char *match = NULL; const char *match = NULL;
rc = acmp_process_quick(&pt, &match, input.c_str(), input.length()); rc = acmp_process_quick(&pt, &match, input.c_str(), input.length());
bool capture = rule && rule->getActionsByName("capture").size() > 0;
if (rc == 1 && transaction) { if (rc == 1 && transaction) {
transaction->m_matched.push_back(std::string(match)); transaction->m_matched.push_back(std::string(match));
} }
if (capture && transaction && rc) {
transaction->m_collections.storeOrUpdateFirst("TX", "0",
std::string(match));
transaction->debug(7, "Added pm match TX.0: " + \
std::string(match));
}
return rc == 1; return rc == 1;
} }

7
src/operators/pm.h
View File

@ -37,7 +37,12 @@ class Pm : public Operator {
~Pm(); ~Pm();
void replaceAll(std::string str, const std::string& from, void replaceAll(std::string str, const std::string& from,
const std::string& to); const std::string& to);
bool evaluate(Transaction *transaction, const std::string &input) override; bool evaluate(Transaction *transaction, Rule *rule,
const std::string &input) override;
bool evaluate(Transaction *transaction,
const std::string &input) override {
return evaluate(transaction, NULL, input);
}
bool init(const std::string &file, std::string *error) override; bool init(const std::string &file, std::string *error) override;
void postOrderTraversal(acmp_btree_node_t *node); void postOrderTraversal(acmp_btree_node_t *node);