Skip to content

Commit 826c3cc

Browse files
brandonpaytonbrandonpayton
committed
Respond to code review feedback
1 parent c685d46 commit 826c3cc

File tree

12 files changed

+2436
-2456
lines changed

12 files changed

+2436
-2456
lines changed

‎headers/modsecurity/transaction.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class TransactionAnchoredVariables {
134134
m_variableInboundDataError(t, "INBOUND_DATA_ERROR"),
135135
m_variableMatchedVar(t, "MATCHED_VAR"),
136136
m_variableMatchedVarName(t, "MATCHED_VAR_NAME"),
137-
m_variableMscPcreErrored(t, "MSC_PCRE_ERRORED"),
137+
m_variableMscPcreError(t, "MSC_PCRE_ERROR"),
138138
m_variableMscPcreLimitsExceeded(t, "MSC_PCRE_LIMITS_EXCEEDED"),
139139
m_variableMultipartBoundaryQuoted(t, "MULTIPART_BOUNDARY_QUOTED"),
140140
m_variableMultipartBoundaryWhiteSpace(t,
@@ -221,7 +221,7 @@ class TransactionAnchoredVariables {
221221
AnchoredVariable m_variableInboundDataError;
222222
AnchoredVariable m_variableMatchedVar;
223223
AnchoredVariable m_variableMatchedVarName;
224-
AnchoredVariable m_variableMscPcreErrored;
224+
AnchoredVariable m_variableMscPcreError;
225225
AnchoredVariable m_variableMscPcreLimitsExceeded;
226226
AnchoredVariable m_variableMultipartBoundaryQuoted;
227227
AnchoredVariable m_variableMultipartBoundaryWhiteSpace;

‎src/operators/rx.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ bool Rx::evaluate(Transaction *transaction, RuleWithActions *rule,
6868

6969
// FIXME: DRY regex error reporting. This logic is currently duplicated in other operators.
7070
if (regex_result != Utils::RegexResult::Ok) {
71-
transaction->m_variableMscPcreErrored.set("1", transaction->m_variableOffset);
71+
transaction->m_variableMscPcreError.set("1", transaction->m_variableOffset);
7272

7373
std::string regex_error_str = "OTHER";
7474
if (regex_result == Utils::RegexResult::ErrorMatchLimit) {

‎src/operators/rx_global.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ bool RxGlobal::evaluate(Transaction *transaction, RuleWithActions *rule,
6262

6363
// FIXME: DRY regex error reporting. This logic is currently duplicated in other operators.
6464
if (regex_result != Utils::RegexResult::Ok) {
65-
transaction->m_variableMscPcreErrored.set("1", transaction->m_variableOffset);
65+
transaction->m_variableMscPcreError.set("1", transaction->m_variableOffset);
6666

6767
std::string regex_error_str = "OTHER";
6868
if (regex_result == Utils::RegexResult::ErrorMatchLimit) {

‎src/parser/seclang-parser.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -4273,10 +4273,10 @@ namespace yy {
42734273
#line 4274 "seclang-parser.cc"
42744274
break;
42754275

4276-
case 275: // var: "MSC_PCRE_ERRORED"
4276+
case 275: // var: "MSC_PCRE_ERROR"
42774277
#line 2327 "seclang-parser.yy"
42784278
{
4279-
VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr<Variable> > (), new variables::MscPcreErrored());
4279+
VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr<Variable> > (), new variables::MscPcreError());
42804280
}
42814281
#line 4282 "seclang-parser.cc"
42824282
break;
@@ -7054,7 +7054,7 @@ namespace yy {
70547054
"VARIABLE_RULE", "\"Variable ARGS_NAMES\"", "VARIABLE_ARGS_POST_NAMES",
70557055
"\"AUTH_TYPE\"", "\"FILES_COMBINED_SIZE\"", "\"FILES_TMPNAMES\"",
70567056
"\"FULL_REQUEST\"", "\"FULL_REQUEST_LENGTH\"", "\"INBOUND_DATA_ERROR\"",
7057-
"\"MATCHED_VAR\"", "\"MATCHED_VAR_NAME\"", "\"MSC_PCRE_ERRORED\"",
7057+
"\"MATCHED_VAR\"", "\"MATCHED_VAR_NAME\"", "\"MSC_PCRE_ERROR\"",
70587058
"\"MSC_PCRE_LIMITS_EXCEEDED\"", "VARIABLE_MULTIPART_BOUNDARY_QUOTED",
70597059
"VARIABLE_MULTIPART_BOUNDARY_WHITESPACE", "\"MULTIPART_CRLF_LF_LINES\"",
70607060
"\"MULTIPART_DATA_AFTER\"", "VARIABLE_MULTIPART_DATA_BEFORE",

‎src/parser/seclang-parser.hh

+7-7
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ class Driver;
223223
#include "src/variables/matched_vars.h"
224224
#include "src/variables/matched_vars_names.h"
225225
#include "src/variables/modsec_build.h"
226-
#include "src/variables/msc_pcre_errored.h"
226+
#include "src/variables/msc_pcre_error.h"
227227
#include "src/variables/msc_pcre_limits_exceeded.h"
228228
#include "src/variables/multipart_boundary_quoted.h"
229229
#include "src/variables/multipart_boundary_whitespace.h"
@@ -1024,7 +1024,7 @@ namespace yy {
10241024
TOK_VARIABLE_INBOUND_DATA_ERROR = 292, // "INBOUND_DATA_ERROR"
10251025
TOK_VARIABLE_MATCHED_VAR = 293, // "MATCHED_VAR"
10261026
TOK_VARIABLE_MATCHED_VAR_NAME = 294, // "MATCHED_VAR_NAME"
1027-
TOK_VARIABLE_MSC_PCRE_ERRORED = 295, // "MSC_PCRE_ERRORED"
1027+
TOK_VARIABLE_MSC_PCRE_ERROR = 295, // "MSC_PCRE_ERROR"
10281028
TOK_VARIABLE_MSC_PCRE_LIMITS_EXCEEDED = 296, // "MSC_PCRE_LIMITS_EXCEEDED"
10291029
TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 297, // VARIABLE_MULTIPART_BOUNDARY_QUOTED
10301030
TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 298, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE
@@ -1389,7 +1389,7 @@ namespace yy {
13891389
S_VARIABLE_INBOUND_DATA_ERROR = 37, // "INBOUND_DATA_ERROR"
13901390
S_VARIABLE_MATCHED_VAR = 38, // "MATCHED_VAR"
13911391
S_VARIABLE_MATCHED_VAR_NAME = 39, // "MATCHED_VAR_NAME"
1392-
S_VARIABLE_MSC_PCRE_ERRORED = 40, // "MSC_PCRE_ERRORED"
1392+
S_VARIABLE_MSC_PCRE_ERROR = 40, // "MSC_PCRE_ERROR"
13931393
S_VARIABLE_MSC_PCRE_LIMITS_EXCEEDED = 41, // "MSC_PCRE_LIMITS_EXCEEDED"
13941394
S_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 42, // VARIABLE_MULTIPART_BOUNDARY_QUOTED
13951395
S_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 43, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE
@@ -3117,16 +3117,16 @@ switch (yykind)
31173117
#if 201103L <= YY_CPLUSPLUS
31183118
static
31193119
symbol_type
3120-
make_VARIABLE_MSC_PCRE_ERRORED (location_type l)
3120+
make_VARIABLE_MSC_PCRE_ERROR (location_type l)
31213121
{
3122-
return symbol_type (token::TOK_VARIABLE_MSC_PCRE_ERRORED, std::move (l));
3122+
return symbol_type (token::TOK_VARIABLE_MSC_PCRE_ERROR, std::move (l));
31233123
}
31243124
#else
31253125
static
31263126
symbol_type
3127-
make_VARIABLE_MSC_PCRE_ERRORED (const location_type& l)
3127+
make_VARIABLE_MSC_PCRE_ERROR (const location_type& l)
31283128
{
3129-
return symbol_type (token::TOK_VARIABLE_MSC_PCRE_ERRORED, l);
3129+
return symbol_type (token::TOK_VARIABLE_MSC_PCRE_ERROR, l);
31303130
}
31313131
#endif
31323132
#if 201103L <= YY_CPLUSPLUS

‎src/parser/seclang-parser.yy

+4-4
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ class Driver;
184184
#include "src/variables/matched_vars.h"
185185
#include "src/variables/matched_vars_names.h"
186186
#include "src/variables/modsec_build.h"
187-
#include "src/variables/msc_pcre_errored.h"
187+
#include "src/variables/msc_pcre_error.h"
188188
#include "src/variables/msc_pcre_limits_exceeded.h"
189189
#include "src/variables/multipart_boundary_quoted.h"
190190
#include "src/variables/multipart_boundary_whitespace.h"
@@ -369,7 +369,7 @@ using namespace modsecurity::operators;
369369
VARIABLE_INBOUND_DATA_ERROR "INBOUND_DATA_ERROR"
370370
VARIABLE_MATCHED_VAR "MATCHED_VAR"
371371
VARIABLE_MATCHED_VAR_NAME "MATCHED_VAR_NAME"
372-
VARIABLE_MSC_PCRE_ERRORED "MSC_PCRE_ERRORED"
372+
VARIABLE_MSC_PCRE_ERROR "MSC_PCRE_ERROR"
373373
VARIABLE_MSC_PCRE_LIMITS_EXCEEDED "MSC_PCRE_LIMITS_EXCEEDED"
374374
VARIABLE_MULTIPART_BOUNDARY_QUOTED
375375
VARIABLE_MULTIPART_BOUNDARY_WHITESPACE
@@ -2323,9 +2323,9 @@ var:
23232323
{
23242324
VARIABLE_CONTAINER($$, new variables::MatchedVarName());
23252325
}
2326-
| VARIABLE_MSC_PCRE_ERRORED
2326+
| VARIABLE_MSC_PCRE_ERROR
23272327
{
2328-
VARIABLE_CONTAINER($$, new variables::MscPcreErrored());
2328+
VARIABLE_CONTAINER($$, new variables::MscPcreError());
23292329
}
23302330
| VARIABLE_MSC_PCRE_LIMITS_EXCEEDED
23312331
{

0 commit comments

Comments
 (0)