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

Refactoring: Renames RulesProperties to RulesSetProperties

Browse Source
This commit is contained in:
Felipe Zimmerle
2018-11-13 16:08:27 -03:00
parent bad5892b93
commit 6a742cdf76
27 changed files with 675 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/parser/driver.cc
View File

@@ -15,8 +15,9 @@
#include "src/parser/driver.h"
#include "modsecurity/rules_set_properties.h"
#include "src/parser/seclang-parser.hh"
#include "modsecurity/audit_log.h"
#include "modsecurity/rules_properties.h"
using modsecurity::audit_log::AuditLog;
using modsecurity::Rule;
@@ -25,7 +26,7 @@ namespace modsecurity {
namespace Parser {
Driver::Driver()
: RulesProperties(),
: RulesSetProperties(),
trace_scanning(false),
trace_parsing(false),
lastRule(NULL) { }

4
src/parser/driver.h
View File

@@ -27,7 +27,7 @@
#include "modsecurity/modsecurity.h"
#include "modsecurity/rules_set.h"
#include "modsecurity/rules_properties.h"
#include "modsecurity/rules_set_properties.h"
#include "modsecurity/audit_log.h"
#include "src/rule_script.h"
#ifndef MS_CPPCHECK_DISABLED_FOR_PARSER
@@ -61,7 +61,7 @@ typedef struct Driver_t Driver;
* driver class.
*
**/
class Driver : public RulesProperties {
class Driver : public RulesSetProperties {
public:
Driver();
virtual ~Driver();

20
src/parser/seclang-parser.cc
View File

@@ -1847,7 +1847,7 @@ namespace yy {
case 21:
#line 803 "seclang-parser.yy"
{
driver.m_uploadKeepFiles = modsecurity::RulesProperties::TrueConfigBoolean;
driver.m_uploadKeepFiles = modsecurity::RulesSetProperties::TrueConfigBoolean;
}
#line 1853 "seclang-parser.cc"
break;
@@ -1855,7 +1855,7 @@ namespace yy {
case 22:
#line 807 "seclang-parser.yy"
{
driver.m_uploadKeepFiles = modsecurity::RulesProperties::FalseConfigBoolean;
driver.m_uploadKeepFiles = modsecurity::RulesSetProperties::FalseConfigBoolean;
}
#line 1861 "seclang-parser.cc"
break;
@@ -1899,7 +1899,7 @@ namespace yy {
case 27:
#line 831 "seclang-parser.yy"
{
driver.m_tmpSaveUploadedFiles = modsecurity::RulesProperties::TrueConfigBoolean;
driver.m_tmpSaveUploadedFiles = modsecurity::RulesSetProperties::TrueConfigBoolean;
}
#line 1905 "seclang-parser.cc"
break;
@@ -1907,7 +1907,7 @@ namespace yy {
case 28:
#line 835 "seclang-parser.yy"
{
driver.m_tmpSaveUploadedFiles = modsecurity::RulesProperties::FalseConfigBoolean;
driver.m_tmpSaveUploadedFiles = modsecurity::RulesSetProperties::FalseConfigBoolean;
}
#line 1913 "seclang-parser.cc"
break;
@@ -2495,7 +2495,7 @@ namespace yy {
case 83:
#line 1223 "seclang-parser.yy"
{
driver.m_secRequestBodyAccess = modsecurity::RulesProperties::TrueConfigBoolean;
driver.m_secRequestBodyAccess = modsecurity::RulesSetProperties::TrueConfigBoolean;
}
#line 2501 "seclang-parser.cc"
break;
@@ -2503,7 +2503,7 @@ namespace yy {
case 84:
#line 1227 "seclang-parser.yy"
{
driver.m_secRequestBodyAccess = modsecurity::RulesProperties::FalseConfigBoolean;
driver.m_secRequestBodyAccess = modsecurity::RulesSetProperties::FalseConfigBoolean;
}
#line 2509 "seclang-parser.cc"
break;
@@ -2511,7 +2511,7 @@ namespace yy {
case 85:
#line 1231 "seclang-parser.yy"
{
driver.m_secResponseBodyAccess = modsecurity::RulesProperties::TrueConfigBoolean;
driver.m_secResponseBodyAccess = modsecurity::RulesSetProperties::TrueConfigBoolean;
}
#line 2517 "seclang-parser.cc"
break;
@@ -2519,7 +2519,7 @@ namespace yy {
case 86:
#line 1235 "seclang-parser.yy"
{
driver.m_secResponseBodyAccess = modsecurity::RulesProperties::FalseConfigBoolean;
driver.m_secResponseBodyAccess = modsecurity::RulesSetProperties::FalseConfigBoolean;
}
#line 2525 "seclang-parser.cc"
break;
@@ -3127,7 +3127,7 @@ namespace yy {
case 142:
#line 1640 "seclang-parser.yy"
{
driver.m_secXMLExternalEntity = modsecurity::RulesProperties::FalseConfigBoolean;
driver.m_secXMLExternalEntity = modsecurity::RulesSetProperties::FalseConfigBoolean;
}
#line 3133 "seclang-parser.cc"
break;
@@ -3135,7 +3135,7 @@ namespace yy {
case 143:
#line 1644 "seclang-parser.yy"
{
driver.m_secXMLExternalEntity = modsecurity::RulesProperties::TrueConfigBoolean;
driver.m_secXMLExternalEntity = modsecurity::RulesSetProperties::TrueConfigBoolean;
}
#line 3141 "seclang-parser.cc"
break;

2
src/parser/seclang-parser.hh
View File

@@ -187,7 +187,7 @@ class Driver;
#include "modsecurity/audit_log.h"
#include "modsecurity/modsecurity.h"
#include "modsecurity/rules_properties.h"
#include "modsecurity/rules_set_properties.h"
#include "modsecurity/rule.h"
#include "src/operators/operator.h"
#include "src/utils/geo_lookup.h"

22
src/parser/seclang-parser.yy
View File

@@ -149,7 +149,7 @@ class Driver;
#include "modsecurity/audit_log.h"
#include "modsecurity/modsecurity.h"
#include "modsecurity/rules_properties.h"
#include "modsecurity/rules_set_properties.h"
#include "modsecurity/rule.h"
#include "src/operators/operator.h"
#include "src/utils/geo_lookup.h"
@@ -801,11 +801,11 @@ audit_log:
/* Upload */
| CONFIG_UPDLOAD_KEEP_FILES CONFIG_VALUE_ON
{
driver.m_uploadKeepFiles = modsecurity::RulesProperties::TrueConfigBoolean;
driver.m_uploadKeepFiles = modsecurity::RulesSetProperties::TrueConfigBoolean;
}
| CONFIG_UPDLOAD_KEEP_FILES CONFIG_VALUE_OFF
{
driver.m_uploadKeepFiles = modsecurity::RulesProperties::FalseConfigBoolean;
driver.m_uploadKeepFiles = modsecurity::RulesSetProperties::FalseConfigBoolean;
}
| CONFIG_UPDLOAD_KEEP_FILES CONFIG_VALUE_RELEVANT_ONLY
{
@@ -829,11 +829,11 @@ audit_log:
}
| CONFIG_UPDLOAD_SAVE_TMP_FILES CONFIG_VALUE_ON
{
driver.m_tmpSaveUploadedFiles = modsecurity::RulesProperties::TrueConfigBoolean;
driver.m_tmpSaveUploadedFiles = modsecurity::RulesSetProperties::TrueConfigBoolean;
}
| CONFIG_UPDLOAD_SAVE_TMP_FILES CONFIG_VALUE_OFF
{
driver.m_tmpSaveUploadedFiles = modsecurity::RulesProperties::FalseConfigBoolean;
driver.m_tmpSaveUploadedFiles = modsecurity::RulesSetProperties::FalseConfigBoolean;
}
;
@@ -1221,19 +1221,19 @@ expression:
}
| CONFIG_DIR_REQ_BODY CONFIG_VALUE_ON
{
driver.m_secRequestBodyAccess = modsecurity::RulesProperties::TrueConfigBoolean;
driver.m_secRequestBodyAccess = modsecurity::RulesSetProperties::TrueConfigBoolean;
}
| CONFIG_DIR_REQ_BODY CONFIG_VALUE_OFF
{
driver.m_secRequestBodyAccess = modsecurity::RulesProperties::FalseConfigBoolean;
driver.m_secRequestBodyAccess = modsecurity::RulesSetProperties::FalseConfigBoolean;
}
| CONFIG_DIR_RES_BODY CONFIG_VALUE_ON
{
driver.m_secResponseBodyAccess = modsecurity::RulesProperties::TrueConfigBoolean;
driver.m_secResponseBodyAccess = modsecurity::RulesSetProperties::TrueConfigBoolean;
}
| CONFIG_DIR_RES_BODY CONFIG_VALUE_OFF
{
driver.m_secResponseBodyAccess = modsecurity::RulesProperties::FalseConfigBoolean;
driver.m_secResponseBodyAccess = modsecurity::RulesSetProperties::FalseConfigBoolean;
}
| CONFIG_SEC_ARGUMENT_SEPARATOR
{
@@ -1638,11 +1638,11 @@ expression:
}
| CONFIG_XML_EXTERNAL_ENTITY CONFIG_VALUE_OFF
{
driver.m_secXMLExternalEntity = modsecurity::RulesProperties::FalseConfigBoolean;
driver.m_secXMLExternalEntity = modsecurity::RulesSetProperties::FalseConfigBoolean;
}
| CONFIG_XML_EXTERNAL_ENTITY CONFIG_VALUE_ON
{
driver.m_secXMLExternalEntity = modsecurity::RulesProperties::TrueConfigBoolean;
driver.m_secXMLExternalEntity = modsecurity::RulesSetProperties::TrueConfigBoolean;
}
| CONGIG_DIR_SEC_TMP_DIR
{