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

Actions refactoring: now there is a clear definiation on the action name

Browse Source
This commit is contained in:
Felipe Zimmerle
2016-05-17 14:36:59 -03:00
parent 1b88947d9b
commit 8c714af8e1
62 changed files with 431 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/actions/phase.cc
View File

@@ -26,51 +26,39 @@
namespace modsecurity {
namespace actions {
Phase::Phase(std::string action)
: Action(action),
m_secRulesPhase(0),
phase(0) {
this->action_kind = ConfigurationKind;
std::string a = action;
a.erase(0, 6);
if (a.at(0) == '\'') {
a.erase(0, 1);
a.pop_back();
}
bool Phase::init(std::string *error) {
std::string a = tolower(m_parser_payload);
try {
this->phase = std::stoi(a);
m_phase = std::stoi(m_parser_payload);
} catch (...) {
this->phase = 0;
if (tolower(a) == "request") {
this->phase = ModSecurity::Phases::RequestHeadersPhase;
m_phase = 0;
if (a == "request") {
m_phase = ModSecurity::Phases::RequestHeadersPhase;
m_secRulesPhase = 2;
}
if (tolower(a) == "response") {
this->phase = ModSecurity::Phases::ResponseBodyPhase;
if (a == "response") {
m_phase = ModSecurity::Phases::ResponseBodyPhase;
m_secRulesPhase = 4;
}
if (tolower(a) == "logging") {
this->phase = ModSecurity::Phases::LoggingPhase;
if (a == "logging") {
m_phase = ModSecurity::Phases::LoggingPhase;
m_secRulesPhase = 5;
}
}
if (this->phase == 0) {
if (m_phase == 0) {
/* Phase 0 is something new, we want to use as ConnectionPhase */
this->phase = ModSecurity::Phases::ConnectionPhase;
m_phase = ModSecurity::Phases::ConnectionPhase;
m_secRulesPhase = 1;
} else {
/* Otherwise we want to shift the rule to the correct phase */
m_secRulesPhase = phase;
this->phase = phase + 1;
m_secRulesPhase = m_phase;
m_phase = m_phase + 1;
}
}
bool Phase::init(std::string *error) {
if (phase > ModSecurity::Phases::NUMBER_OF_PHASES) {
error->assign("Unknown phase: " + std::to_string(phase));
if (m_phase > ModSecurity::Phases::NUMBER_OF_PHASES) {
error->assign("Unknown phase: " + std::to_string(m_phase));
return false;
}
return true;
@@ -78,7 +66,7 @@ bool Phase::init(std::string *error) {
bool Phase::evaluate(Rule *rule, Transaction *transaction) {
rule->phase = this->phase;
rule->phase = m_phase;
return true;
}