Skip to content

Commit f3d8198

Browse files
brandonpaytonbrandonpayton
committed
Respond to code review feedback
1 parent 0c42ee2 commit f3d8198

File tree

12 files changed

+2473
-2491
lines changed

12 files changed

+2473
-2491
lines changed

‎headers/modsecurity/transaction.h‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4279,10 +4279,10 @@ namespace yy {
42794279
#line 4280 "seclang-parser.cc"
42804280
break;
42814281

4282-
case 275: // var: "MSC_PCRE_ERRORED"
4282+
case 275: // var: "MSC_PCRE_ERROR"
42834283
#line 2329 "seclang-parser.yy"
42844284
{
4285-
VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr<Variable> > (), new variables::MscPcreErrored());
4285+
VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr<Variable> > (), new variables::MscPcreError());
42864286
}
42874287
#line 4288 "seclang-parser.cc"
42884288
break;
@@ -7060,7 +7060,7 @@ namespace yy {
70607060
"VARIABLE_RULE", "\"Variable ARGS_NAMES\"", "VARIABLE_ARGS_POST_NAMES",
70617061
"\"AUTH_TYPE\"", "\"FILES_COMBINED_SIZE\"", "\"FILES_TMPNAMES\"",
70627062
"\"FULL_REQUEST\"", "\"FULL_REQUEST_LENGTH\"", "\"INBOUND_DATA_ERROR\"",
7063-
"\"MATCHED_VAR\"", "\"MATCHED_VAR_NAME\"", "\"MSC_PCRE_ERRORED\"",
7063+
"\"MATCHED_VAR\"", "\"MATCHED_VAR_NAME\"", "\"MSC_PCRE_ERROR\"",
70647064
"\"MSC_PCRE_LIMITS_EXCEEDED\"", "VARIABLE_MULTIPART_BOUNDARY_QUOTED",
70657065
"VARIABLE_MULTIPART_BOUNDARY_WHITESPACE", "\"MULTIPART_CRLF_LF_LINES\"",
70667066
"\"MULTIPART_DATA_AFTER\"", "VARIABLE_MULTIPART_DATA_BEFORE",

‎src/parser/seclang-parser.hh‎

Lines changed: 7 additions & 7 deletions
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"
@@ -1025,7 +1025,7 @@ namespace yy {
10251025
TOK_VARIABLE_INBOUND_DATA_ERROR = 292, // "INBOUND_DATA_ERROR"
10261026
TOK_VARIABLE_MATCHED_VAR = 293, // "MATCHED_VAR"
10271027
TOK_VARIABLE_MATCHED_VAR_NAME = 294, // "MATCHED_VAR_NAME"
1028-
TOK_VARIABLE_MSC_PCRE_ERRORED = 295, // "MSC_PCRE_ERRORED"
1028+
TOK_VARIABLE_MSC_PCRE_ERROR = 295, // "MSC_PCRE_ERROR"
10291029
TOK_VARIABLE_MSC_PCRE_LIMITS_EXCEEDED = 296, // "MSC_PCRE_LIMITS_EXCEEDED"
10301030
TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 297, // VARIABLE_MULTIPART_BOUNDARY_QUOTED
10311031
TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 298, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE
@@ -1391,7 +1391,7 @@ namespace yy {
13911391
S_VARIABLE_INBOUND_DATA_ERROR = 37, // "INBOUND_DATA_ERROR"
13921392
S_VARIABLE_MATCHED_VAR = 38, // "MATCHED_VAR"
13931393
S_VARIABLE_MATCHED_VAR_NAME = 39, // "MATCHED_VAR_NAME"
1394-
S_VARIABLE_MSC_PCRE_ERRORED = 40, // "MSC_PCRE_ERRORED"
1394+
S_VARIABLE_MSC_PCRE_ERROR = 40, // "MSC_PCRE_ERROR"
13951395
S_VARIABLE_MSC_PCRE_LIMITS_EXCEEDED = 41, // "MSC_PCRE_LIMITS_EXCEEDED"
13961396
S_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 42, // VARIABLE_MULTIPART_BOUNDARY_QUOTED
13971397
S_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 43, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE
@@ -3122,16 +3122,16 @@ switch (yykind)
31223122
#if 201103L <= YY_CPLUSPLUS
31233123
static
31243124
symbol_type
3125-
make_VARIABLE_MSC_PCRE_ERRORED (location_type l)
3125+
make_VARIABLE_MSC_PCRE_ERROR (location_type l)
31263126
{
3127-
return symbol_type (token::TOK_VARIABLE_MSC_PCRE_ERRORED, std::move (l));
3127+
return symbol_type (token::TOK_VARIABLE_MSC_PCRE_ERROR, std::move (l));
31283128
}
31293129
#else
31303130
static
31313131
symbol_type
3132-
make_VARIABLE_MSC_PCRE_ERRORED (const location_type& l)
3132+
make_VARIABLE_MSC_PCRE_ERROR (const location_type& l)
31333133
{
3134-
return symbol_type (token::TOK_VARIABLE_MSC_PCRE_ERRORED, l);
3134+
return symbol_type (token::TOK_VARIABLE_MSC_PCRE_ERROR, l);
31353135
}
31363136
#endif
31373137
#if 201103L <= YY_CPLUSPLUS

‎src/parser/seclang-parser.yy‎

Lines changed: 4 additions & 4 deletions
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"
@@ -370,7 +370,7 @@ using namespace modsecurity::operators;
370370
VARIABLE_INBOUND_DATA_ERROR "INBOUND_DATA_ERROR"
371371
VARIABLE_MATCHED_VAR "MATCHED_VAR"
372372
VARIABLE_MATCHED_VAR_NAME "MATCHED_VAR_NAME"
373-
VARIABLE_MSC_PCRE_ERRORED "MSC_PCRE_ERRORED"
373+
VARIABLE_MSC_PCRE_ERROR "MSC_PCRE_ERROR"
374374
VARIABLE_MSC_PCRE_LIMITS_EXCEEDED "MSC_PCRE_LIMITS_EXCEEDED"
375375
VARIABLE_MULTIPART_BOUNDARY_QUOTED
376376
VARIABLE_MULTIPART_BOUNDARY_WHITESPACE
@@ -2325,9 +2325,9 @@ var:
23252325
{
23262326
VARIABLE_CONTAINER($$, new variables::MatchedVarName());
23272327
}
2328-
| VARIABLE_MSC_PCRE_ERRORED
2328+
| VARIABLE_MSC_PCRE_ERROR
23292329
{
2330-
VARIABLE_CONTAINER($$, new variables::MscPcreErrored());
2330+
VARIABLE_CONTAINER($$, new variables::MscPcreError());
23312331
}
23322332
| VARIABLE_MSC_PCRE_LIMITS_EXCEEDED
23332333
{

0 commit comments

Comments
 (0)