Having RuleWithActionsProperties()

zimmerle · zimmerle · commit baf189938e9e · 2020-10-21T09:09:12.000-03:00
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -287,6 +287,7 @@ libmodsecurity_la_SOURCES = \
 	rules.cc \
 	rule_unconditional.cc \
 	rule_with_actions.cc \
+	rule_with_actions_properties.cc \
 	rule_with_operator.cc \
 	rule_message.cc \
 	rule_script.cc \
diff --git a/src/actions/action_with_run_time_string.h b/src/actions/action_with_run_time_string.h
@@ -43,14 +43,14 @@ class ActionWithRunTimeString : public virtual Action {
         return *this;
     }
 
-    virtual void populate(RuleWithActions *rule) {
+    virtual void populate(const RuleWithActions *rule) {
         if (m_string) {
             m_string->populate(rule);
         }
     }
 
     std::string getEvaluatedRunTimeString(const Transaction *transaction) const noexcept {
-        return (m_string == nullptr)?"":m_string->evaluate(transaction);
+        return (!m_string)?"":m_string->evaluate(transaction);
     }
 
     bool hasRunTimeString() const noexcept {
diff --git a/src/actions/audit_log.h b/src/actions/audit_log.h
@@ -36,7 +36,7 @@ class AuditLog : public ActionTypeRuleMetaData,
     { }
 
     void configure(RuleWithActions *rule) override {
-        rule->setHasAuditLogAction(true);
+        rule->setAuditLog(true);
     }
 };
 
diff --git a/src/actions/block.h b/src/actions/block.h
@@ -37,7 +37,7 @@ class Block : public ActionTypeRuleMetaData,
     { }
 
     void configure(RuleWithActions *rule) override {
-        rule->setHasBlockAction(true);
+        rule->setBlock(true);
     }
 };
 
diff --git a/src/actions/capture.h b/src/actions/capture.h
@@ -33,7 +33,7 @@ class Capture : public ActionTypeRuleMetaData {
         : Action("capture") { }
 
     void configure(RuleWithActions *rule) override {
-        rule->setHasCaptureAction(true);
+        rule->setHasCapture(true);
     }
 };
 
diff --git a/src/actions/log.h b/src/actions/log.h
@@ -37,7 +37,7 @@ class Log : public ActionTypeRuleMetaData,
     { }
 
     void configure(RuleWithActions *rule) override {
-        rule->setHasLogAction(true);
+        rule->setLog(true);
     }
 
 };
diff --git a/src/actions/multi_match.h b/src/actions/multi_match.h
@@ -34,7 +34,7 @@ class MultiMatch : public ActionTypeRuleMetaData {
 
 
     void configure(RuleWithActions *rule) override {
-        rule->setHasMultimatchAction(true);
+        rule->setMultiMatch(true);
     }
 };
 
diff --git a/src/actions/no_audit_log.h b/src/actions/no_audit_log.h
@@ -36,7 +36,7 @@ class NoAuditLog : public ActionTypeRuleMetaData,
     { }
 
     void configure(RuleWithActions *rule) override {
-        rule->setHasNoAuditLogAction(true);
+        rule->setNoAuditLog(true);
     }
 };
 
diff --git a/src/actions/no_log.h b/src/actions/no_log.h
@@ -36,7 +36,7 @@ class NoLog : public ActionTypeRuleMetaData,
     { }
 
     void configure(RuleWithActions *rule) override {
-        rule->setHasNoLogAction(true);
+        rule->setNoLog(true);
     }
 };
 
diff --git a/src/actions/set_var.h b/src/actions/set_var.h
@@ -87,7 +87,7 @@ class SetVar : public ActionWithRunTimeString, public ActionWithExecution {
 
     bool execute(Transaction *transaction) const noexcept override;
 
-    void populate(RuleWithActions *rule) override {
+    void populate(const RuleWithActions *rule) override {
         ActionWithRunTimeString::populate(rule);
         variables::RuleVariable *rulev =
             dynamic_cast<variables::RuleVariable *>(
diff --git a/src/actions/tag.h b/src/actions/tag.h
@@ -47,7 +47,7 @@ class Tag : public ActionWithRunTimeString,
 
     bool execute(Transaction *transaction) const noexcept override;
 
-    inline std::string getTagName(Transaction *transaction) const {
+    inline std::string getTagName(const Transaction *transaction) const {
         return getEvaluatedRunTimeString(transaction);
     }
 
diff --git a/src/operators/detect_sqli.cc b/src/operators/detect_sqli.cc
@@ -45,7 +45,7 @@ bool DetectSQLi::evaluate(Transaction *transaction,
         ms_dbg_a(transaction, 4, "detected SQLi using libinjection with " \
             "fingerprint '" + std::string(fingerprint) + "' at: '" +
             input.to_string() + "'");
-        if (rule && rule->hasCaptureAction()) {
+        if (rule && rule->hasCapture()) {
             transaction->m_collections.m_tx_collection->storeOrUpdateFirst(
                 "0", std::string(fingerprint));
             ms_dbg_a(transaction, 7, "Added DetectSQLi match TX.0: " + \
diff --git a/src/operators/detect_xss.cc b/src/operators/detect_xss.cc
@@ -37,7 +37,7 @@ bool DetectXSS::evaluate(Transaction *transaction,
     if (transaction) {
         if (is_xss) {
             ms_dbg_a(transaction, 5, "detected XSS using libinjection.");
-            if (rule && rule->hasCaptureAction()) {
+            if (rule && rule->hasCapture()) {
                 transaction->m_collections.m_tx_collection->storeOrUpdateFirst(
                     "0", std::string(input));
                 ms_dbg_a(transaction, 7, "Added DetectXSS match TX.0: " + \
diff --git a/src/operators/pm.cc b/src/operators/pm.cc
@@ -105,7 +105,7 @@ bool Pm::evaluate(Transaction *transaction,
         logOffset(ruleMessage, rc - match_.size() + 1, match_.size());
         transaction->m_matched.push_back(match_);
 
-        if (rule && rule->hasCaptureAction()) {
+        if (rule && rule->hasCapture()) {
             transaction->m_collections.m_tx_collection->storeOrUpdateFirst("0",
                 match_);
             ms_dbg_a(transaction, 7, "Added pm match TX.0: " + \
diff --git a/src/operators/rbl.cc b/src/operators/rbl.cc
@@ -229,7 +229,7 @@ bool Rbl::evaluate(Transaction *transaction,
     furtherInfo(sin, str.c_str(), transaction, m_provider);
 
     freeaddrinfo(info);
-    if (rule && transaction && rule->hasCaptureAction()) {
+    if (rule && transaction && rule->hasCapture()) {
         transaction->m_collections.m_tx_collection->storeOrUpdateFirst(
         "0", std::string(str));
         ms_dbg_a(transaction, 7, "Added RXL match TX.0: " + \
diff --git a/src/operators/rx.cc b/src/operators/rx.cc
@@ -58,7 +58,7 @@ bool Rx::evaluate(Transaction *transaction,
     std::vector<Utils::SMatchCapture> captures;
     // FIXME: searchOneMatch should accept string_view.
     re->searchOneMatch(input.c_str(), captures);
-    if (rule && rule->hasCaptureAction() && transaction) {
+    if (rule && rule->hasCapture() && transaction) {
         for (const Utils::SMatchCapture& capture : captures) {
             const std::string capture_substring(input.substr(capture.m_offset,capture.m_length));
             transaction->m_collections.m_tx_collection->storeOrUpdateFirst(
diff --git a/src/operators/verify_cc.cc b/src/operators/verify_cc.cc
@@ -145,7 +145,7 @@ bool VerifyCC::evaluate(Transaction *transaction,
             int is_cc = luhnVerify(match.c_str(), match.size());
             if (is_cc) {
                 if (transaction) {
-                    if (rule && rule->hasCaptureAction()) {
+                    if (rule && rule->hasCapture()) {
                         transaction->m_collections.m_tx_collection->storeOrUpdateFirst(
                             "0", std::string(match));
                         ms_dbg_a(transaction, 7, "Added VerifyCC match TX.0: " + \
diff --git a/src/operators/verify_cpf.cc b/src/operators/verify_cpf.cc
@@ -128,7 +128,7 @@ bool VerifyCPF::evaluate(Transaction *transaction,
             is_cpf = verify(m.str().c_str(), m.str().size());
             if (is_cpf) {
                 logOffset(ruleMessage, m.offset(), m.str().size());
-                if (rule && transaction && rule->hasCaptureAction()) {
+                if (rule && transaction && rule->hasCapture()) {
                     transaction->m_collections.m_tx_collection->storeOrUpdateFirst(
                         "0", m.str());
                     ms_dbg_a(transaction, 7, "Added VerifyCPF match TX.0: " + \
diff --git a/src/operators/verify_ssn.cc b/src/operators/verify_ssn.cc
@@ -130,7 +130,7 @@ bool VerifySSN::evaluate(Transaction *transaction,
             is_ssn = verify(j.str().c_str(), j.str().size());
             if (is_ssn) {
                 logOffset(ruleMessage, j.offset(), j.str().size());
-                if (rule && transaction && rule->hasCaptureAction()) {
+                if (rule && transaction && rule->hasCapture()) {
                     transaction->m_collections.m_tx_collection->storeOrUpdateFirst(
                         "0", j.str());
                     ms_dbg_a(transaction, 7, "Added VerifySSN match TX.0: " + \
diff --git a/src/operators/verify_svnr.cc b/src/operators/verify_svnr.cc
@@ -97,7 +97,7 @@ bool VerifySVNR::evaluate(Transaction *t,
             is_svnr = verify(j.str().c_str(), j.str().size());
             if (is_svnr) {
                 logOffset(ruleMessage, j.offset(), j.str().size());
-                if (rule && t && rule->hasCaptureAction()) {
+                if (rule && t && rule->hasCapture()) {
                     t->m_collections.m_tx_collection->storeOrUpdateFirst(
                         "0", j.str());
                     ms_dbg_a(t, 7, "Added VerifySVNR match TX.0: " + \
diff --git a/src/parser/driver.cc b/src/parser/driver.cc
@@ -109,59 +109,62 @@ int Driver::addSecRule(std::unique_ptr<RuleWithActions> r) {
                     );
                     firstRule->setLogDataAction(nullptr);
                 }
-                if (firstRule->hasSeverityAction()) {
+                if (firstRule->hasSeverity()) {
                     firstRule->getChainedParent()->setSeverity(
                         firstRule->getSeverity()
                     );
                 }
-                if (firstRule->hasRevisionAction()) {
+                if (firstRule->hasRevision()) {
                     firstRule->getChainedParent()->setRevision(
                         firstRule->getRevision()
                     );
                 }
-                if (firstRule->hasVersionAction()) {
+                if (firstRule->hasVersion()) {
                     firstRule->getChainedParent()->setVersion(
                         firstRule->getVersion()
                     );
                 }
-                if (firstRule->hasAccuracyAction()) {
+                if (firstRule->hasAccuracy()) {
                     firstRule->getChainedParent()->setAccuracy(
                         firstRule->getAccuracy()
                     );
                 }
-                if (firstRule->hasMaturityAction()) {
+                if (firstRule->hasMaturity()) {
                     firstRule->getChainedParent()->setMaturity(
                         firstRule->getMaturity()
                     );
                 }
 
-                if (firstRule->hasTagAction()) {
+                if (firstRule->hasTags()) {
                     firstRule->getChainedParent()->setTags(
-                        firstRule->getTagsAction()
+                        firstRule->getTags()
                     );
-                    firstRule->cleanTags();
+                    firstRule->clearTags();
                 }
 
+                /* disruptive can only be set on the first rule
                 if (firstRule->hasDisruptiveAction()) {
                     firstRule->getChainedParent()->setDisruptiveAction(
                         firstRule->getDisruptiveAction()
                     );
                     firstRule->setDisruptiveAction(nullptr);
                 }
-                firstRule->getChainedParent()->setHasBlockAction(
-                    firstRule->hasBlockAction()
+                */
+
+                firstRule->getChainedParent()->setBlock(
+                    firstRule->hasBlock()
                 );
-                firstRule->getChainedParent()->setHasLogAction(
-                    firstRule->hasLogAction()
+                firstRule->getChainedParent()->setLog(
+                    firstRule->hasLog()
                 );
-                firstRule->getChainedParent()->setHasLogAction(
-                    firstRule->hasNoLogAction()
+                firstRule->getChainedParent()->setNoLog(
+                    firstRule->hasNoLog()
                 );
-                firstRule->getChainedParent()->setHasAuditLogAction(
-                    firstRule->hasAuditLogAction()
+                firstRule->getChainedParent()->setAuditLog(
+                    firstRule->hasAuditLog()
                 );
-                firstRule->getChainedParent()->setHasNoAuditLogAction(
-                    firstRule->hasNoAuditLogAction()
+                firstRule->getChainedParent()->setNoAuditLog(
+                    firstRule->hasNoAuditLog()
                 );
                 firstRule = firstRule->getChainedParent();
             }
diff --git a/src/rule_message.cc b/src/rule_message.cc
@@ -218,7 +218,7 @@ std::string RuleMessage::getUri() const {
 
 bool RuleMessage::isDisruptive() const {
     if (m_rule) {
-        return m_rule->hasDisruptiveAction();
+        return m_rule->isDisruptive();
     }
     return 0;
 }
diff --git a/src/rule_with_actions.cc b/src/rule_with_actions.cc
diff --git a/src/rule_with_actions.h b/src/rule_with_actions.h
diff --git a/src/rule_with_actions_properties.cc b/src/rule_with_actions_properties.cc
diff --git a/src/rule_with_actions_properties.h b/src/rule_with_actions_properties.h
diff --git a/src/rule_with_operator.cc b/src/rule_with_operator.cc
diff --git a/src/rules_set.cc b/src/rules_set.cc
diff --git a/src/run_time_string.h b/src/run_time_string.h
diff --git a/src/transformation_result.h b/src/transformation_result.h
diff --git a/src/variables/rule.h b/src/variables/rule.h
diff --git a/src/variables/rule_variable.h b/src/variables/rule_variable.h
diff --git a/src/variables/variable_with_runtime_string.h b/src/variables/variable_with_runtime_string.h

Original file line number	Diff line number	Diff line change
`@@ -43,14 +43,14 @@ class ActionWithRunTimeString : public virtual Action {`
`43`	`43`	`return *this;`
`44`	`44`	`}`
`45`	`45`
`46`		`- virtual void populate(RuleWithActions *rule) {`
	`46`	`+ virtual void populate(const RuleWithActions *rule) {`
`47`	`47`	`if (m_string) {`
`48`	`48`	`m_string->populate(rule);`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`std::string getEvaluatedRunTimeString(const Transaction *transaction) const noexcept {`
`53`		`- return (m_string == nullptr)?"":m_string->evaluate(transaction);`
	`53`	`+ return (!m_string)?"":m_string->evaluate(transaction);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`bool hasRunTimeString() const noexcept {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class AuditLog : public ActionTypeRuleMetaData,`
`36`	`36`	`{ }`
`37`	`37`
`38`	`38`	`void configure(RuleWithActions *rule) override {`
`39`		`- rule->setHasAuditLogAction(true);`
	`39`	`+ rule->setAuditLog(true);`
`40`	`40`	`}`
`41`	`41`	`};`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class Block : public ActionTypeRuleMetaData,`
`37`	`37`	`{ }`
`38`	`38`
`39`	`39`	`void configure(RuleWithActions *rule) override {`
`40`		`- rule->setHasBlockAction(true);`
	`40`	`+ rule->setBlock(true);`
`41`	`41`	`}`
`42`	`42`	`};`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class Capture : public ActionTypeRuleMetaData {`
`33`	`33`	`: Action("capture") { }`
`34`	`34`
`35`	`35`	`void configure(RuleWithActions *rule) override {`
`36`		`- rule->setHasCaptureAction(true);`
	`36`	`+ rule->setHasCapture(true);`
`37`	`37`	`}`
`38`	`38`	`};`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class Log : public ActionTypeRuleMetaData,`
`37`	`37`	`{ }`
`38`	`38`
`39`	`39`	`void configure(RuleWithActions *rule) override {`
`40`		`- rule->setHasLogAction(true);`
	`40`	`+ rule->setLog(true);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`};`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class MultiMatch : public ActionTypeRuleMetaData {`
`34`	`34`
`35`	`35`
`36`	`36`	`void configure(RuleWithActions *rule) override {`
`37`		`- rule->setHasMultimatchAction(true);`
	`37`	`+ rule->setMultiMatch(true);`
`38`	`38`	`}`
`39`	`39`	`};`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class NoAuditLog : public ActionTypeRuleMetaData,`
`36`	`36`	`{ }`
`37`	`37`
`38`	`38`	`void configure(RuleWithActions *rule) override {`
`39`		`- rule->setHasNoAuditLogAction(true);`
	`39`	`+ rule->setNoAuditLog(true);`
`40`	`40`	`}`
`41`	`41`	`};`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class NoLog : public ActionTypeRuleMetaData,`
`36`	`36`	`{ }`
`37`	`37`
`38`	`38`	`void configure(RuleWithActions *rule) override {`
`39`		`- rule->setHasNoLogAction(true);`
	`39`	`+ rule->setNoLog(true);`
`40`	`40`	`}`
`41`	`41`	`};`
`42`	`42`