Refactoring on Action - having RuleWithAction and RuleWithActionsProperties

Author: zimmerle

src/Makefile.am

@@ -288,6 +288,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 \

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 {

src/actions/audit_log.h

@@ -36,7 +36,7 @@ class AuditLog : public ActionTypeRuleMetaData,
     { }
 
     void configure(RuleWithActions *rule) override {
-        rule->setHasAuditLogAction(true);
+        rule->setAuditLog(true);
     }
 };
 

src/actions/block.h

@@ -37,7 +37,7 @@ class Block : public ActionTypeRuleMetaData,
     { }
 
     void configure(RuleWithActions *rule) override {
-        rule->setHasBlockAction(true);
+        rule->setBlock(true);
     }
 };
 

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);
     }
 };
 

src/actions/log.h

@@ -37,7 +37,7 @@ class Log : public ActionTypeRuleMetaData,
     { }
 
     void configure(RuleWithActions *rule) override {
-        rule->setHasLogAction(true);
+        rule->setLog(true);
     }
 
 };

src/actions/multi_match.h

@@ -34,7 +34,7 @@ class MultiMatch : public ActionTypeRuleMetaData {
 
 
     void configure(RuleWithActions *rule) override {
-        rule->setHasMultimatchAction(true);
+        rule->setMultiMatch(true);
     }
 };
 

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);
     }
 };
 

src/actions/no_log.h

@@ -36,7 +36,7 @@ class NoLog : public ActionTypeRuleMetaData,
     { }
 
     void configure(RuleWithActions *rule) override {
-        rule->setHasNoLogAction(true);
+        rule->setNoLog(true);
     }
 };
 

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 *>(