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

Switch to simpler PCRE error flags

Browse Source
This commit is contained in:
Brandon Payton
2022-12-02 17:43:10 -05:00
parent 8c4b7c18e2
commit 0c42ee229e
11 changed files with 4265 additions and 4270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/variables/rx_error.h → src/variables/msc_pcre_errored.h
View File

@@ -19,8 +19,8 @@
#include <list>
#include <utility>
#ifndef SRC_VARIABLES_RX_ERROR_H_
#define SRC_VARIABLES_RX_ERROR_H_
#ifndef SRC_VARIABLES_MSC_PCRE_ERRORED_H_
#define SRC_VARIABLES_MSC_PCRE_ERRORED_H_
#include "src/variables/variable.h"
@@ -30,10 +30,10 @@ class Transaction;
namespace variables {
DEFINE_VARIABLE(RxError, RX_ERROR, m_variableRxError)
DEFINE_VARIABLE(MscPcreErrored, MSC_PCRE_ERRORED, m_variableMscPcreErrored)
} // namespace variables
} // namespace modsecurity
#endif // SRC_VARIABLES_RX_ERROR_H_
#endif // SRC_VARIABLES_MSC_PCRE_ERRORED_H_

8
src/variables/rx_error_rule_id.h → src/variables/msc_pcre_limits_exceeded.h
View File

@@ -19,8 +19,8 @@
#include <list>
#include <utility>
#ifndef SRC_VARIABLES_RX_ERROR_RULE_ID_H_
#define SRC_VARIABLES_RX_ERROR_RULE_ID_H_
#ifndef SRC_VARIABLES_MSC_PCRE_LIMITS_EXCEEDED_H_
#define SRC_VARIABLES_MSC_PCRE_LIMITS_EXCEEDED_H_
#include "src/variables/variable.h"
@@ -30,10 +30,10 @@ class Transaction;
namespace variables {
DEFINE_VARIABLE(RxErrorRuleID, RX_ERROR_RULE_ID, m_variableRxErrorRuleID)
DEFINE_VARIABLE(MscPcreLimitsExceeded, MSC_PCRE_LIMITS_EXCEEDED, m_variableMscPcreLimitsExceeded)
} // namespace variables
} // namespace modsecurity
#endif // SRC_VARIABLES_RX_ERROR_RULE_ID_H_
#endif // SRC_VARIABLES_MSC_PCRE_LIMITS_EXCEEDED_H_

16
src/variables/variable.h
View File

@@ -202,6 +202,10 @@ class VariableMonkeyResolution {
t->m_variableMatchedVar.evaluate(l);
} else if (comp(variable, "MATCHED_VAR_NAME")) {
t->m_variableMatchedVarName.evaluate(l);
} else if (comp(variable, "MSC_PCRE_ERRORED")) {
t->m_variableMscPcreErrored.evaluate(l);
} else if (comp(variable, "MSC_PCRE_LIMITS_EXCEEDED")) {
t->m_variableMscPcreLimitsExceeded.evaluate(l);
} else if (comp(variable, "MULTIPART_CRLF_LF_LINES")) {
t->m_variableMultipartCrlfLFLines.evaluate(l);
} else if (comp(variable, "MULTIPART_DATA_AFTER")) {
@@ -282,10 +286,6 @@ class VariableMonkeyResolution {
t->m_variableUrlEncodedError.evaluate(l);
} else if (comp(variable, "USERID")) {
t->m_variableUserID.evaluate(l);
} else if (comp(variable, "RX_ERROR")) {
t->m_variableRxError.evaluate(l);
} else if (comp(variable, "RX_ERROR_RULE_ID")) {
t->m_variableRxErrorRuleID.evaluate(l);
} else {
throw std::invalid_argument("Variable not found.");
}
@@ -369,6 +369,10 @@ class VariableMonkeyResolution {
vv = t->m_variableMatchedVar.resolveFirst();
} else if (comp(variable, "MATCHED_VAR_NAME")) {
vv = t->m_variableMatchedVarName.resolveFirst();
} else if (comp(variable, "MSC_PCRE_ERRORED")) {
vv = t->m_variableMscPcreErrored.resolveFirst();
} else if (comp(variable, "MSC_PCRE_LIMITS_EXCEEDED")) {
vv = t->m_variableMscPcreLimitsExceeded.resolveFirst();
} else if (comp(variable, "MULTIPART_CRLF_LF_LINES")) {
vv = t->m_variableMultipartCrlfLFLines.resolveFirst();
} else if (comp(variable, "MULTIPART_DATA_AFTER")) {
@@ -466,10 +470,6 @@ class VariableMonkeyResolution {
} else if (comp(variable, "GLOBAL")) {
vv = t->m_collections.m_global_collection->resolveFirst("",
t->m_collections.m_global_collection_key, t->m_rules->m_secWebAppId.m_value);
} else if (comp(variable, "RX_ERROR")) {
vv = t->m_variableRxError.resolveFirst();
} else if (comp(variable, "RX_ERROR_RULE_ID")) {
vv = t->m_variableRxErrorRuleID.resolveFirst();
} else {
throw std::invalid_argument("Variable not found.");
}