Merge pull request #3231 from eduar-hte/remove-copies-transformations

Remove unnecessary heap allocated copies in Transformation actions

headers/modsecurity/actions/action.h

@@ -13,41 +13,66 @@
  *
  */
 
-#ifdef __cplusplus
-
-#include <string>
-#include <iostream>
-#include <memory>
-
-#endif
-
-#include "modsecurity/intervention.h"
-#include "modsecurity/rule.h"
-#include "modsecurity/rule_with_actions.h"
-
 #ifndef HEADERS_MODSECURITY_ACTIONS_ACTION_H_
 #define HEADERS_MODSECURITY_ACTIONS_ACTION_H_
 
 #ifdef __cplusplus
 
+#include <string>
+#include <memory>
+
 namespace modsecurity {
 class Transaction;
 class RuleWithOperator;
+class RuleWithActions;
+class RuleMessage;
 
 namespace actions {
 
 
 class Action {
  public:
+    /**
+     *
+     * Define the action kind regarding to the execution time.
+     * 
+     * 
+     */
+    enum class Kind {
+    /**
+     *
+     * Action that are executed while loading the configuration. For instance
+     * the rule ID or the rule phase.
+     *
+     */
+     ConfigurationKind,
+    /**
+     *
+     * Those are actions that demands to be executed before call the operator.
+     * For instance the tranformations.
+     *
+     *
+     */
+     RunTimeBeforeMatchAttemptKind,
+    /**
+     *
+     * Actions that are executed after the execution of the operator, only if
+     * the operator returned Match (or True). For instance the disruptive
+     * actions.
+     *
+     */
+     RunTimeOnlyIfMatchKind,
+    };
+
     explicit Action(const std::string& _action)
         : m_isNone(false),
         temporaryAction(false),
-        action_kind(2),
+        action_kind(Kind::RunTimeOnlyIfMatchKind),
         m_name(nullptr),
         m_parser_payload("") {
             set_name_and_payload(_action);
         }
-    explicit Action(const std::string& _action, int kind)
+    explicit Action(const std::string& _action, Kind kind)
         : m_isNone(false),
         temporaryAction(false),
         action_kind(kind),
@@ -74,8 +99,6 @@ class Action {
 
     virtual ~Action() { }
 
-    virtual std::string evaluate(const std::string &exp,
-        Transaction *transaction);
     virtual bool evaluate(RuleWithActions *rule, Transaction *transaction);
     virtual bool evaluate(RuleWithActions *rule, Transaction *transaction,
         std::shared_ptr<RuleMessage> ruleMessage) {
@@ -87,9 +110,9 @@ class Action {
 
     void set_name_and_payload(const std::string& data) {
         size_t pos = data.find(":");
-        std::string t = "t:";
+        const char t[] = "t:";
 
-        if (data.compare(0, t.length(), t) == 0) {
+        if (data.compare(0, std::size(t) - 1, t) == 0) {
             pos = data.find(":", 2);
         }
 
@@ -109,41 +132,9 @@ class Action {
 
     bool m_isNone;
     bool temporaryAction;
-    int action_kind;
+    Kind action_kind;
     std::shared_ptr<std::string> m_name;
     std::string m_parser_payload;
-
-    /**
-     *
-     * Define the action kind regarding to the execution time.
-     * 
-     * 
-     */
-    enum Kind {
-    /**
-     *
-     * Action that are executed while loading the configuration. For instance
-     * the rule ID or the rule phase.
-     *
-     */
-     ConfigurationKind,
-    /**
-     *
-     * Those are actions that demands to be executed before call the operator.
-     * For instance the tranformations.
-     *
-     *
-     */
-     RunTimeBeforeMatchAttemptKind,
-    /**
-     *
-     * Actions that are executed after the execution of the operator, only if
-     * the operator returned Match (or True). For instance the disruptive
-     * actions.
-     *
-     */
-     RunTimeOnlyIfMatchKind,
-    };
  };
 
 

headers/modsecurity/rule.h

@@ -52,7 +52,7 @@ namespace operators {
 class Operator;
 }
 
-using TransformationResult = std::pair<std::shared_ptr<std::string>,
+using TransformationResult = std::pair<std::string,
     std::shared_ptr<std::string>>;
 using TransformationResults = std::list<TransformationResult>;
 

headers/modsecurity/rule_with_actions.h

@@ -119,16 +119,7 @@ class RuleWithActions : public Rule {
 
 
     void executeTransformations(
-        Transaction *trasn, const std::string &value, TransformationResults &ret);
+        const Transaction *trasn, const std::string &value, TransformationResults &ret);
-
-    inline void executeTransformation(
-        actions::transformations::Transformation *a,
-        std::shared_ptr<std::string> *value,
-        Transaction *trans,
-        TransformationResults *ret,
-        std::string *path,
-        int *nth) const;
-
 
     void performLogging(Transaction *trans,
         std::shared_ptr<RuleMessage> ruleMessage,
@@ -166,6 +157,14 @@ class RuleWithActions : public Rule {
     RuleWithActions *m_chainedRuleParent;
 
  private:
+    inline void executeTransformation(
+        const actions::transformations::Transformation &a,
+        std::string &value,
+        const Transaction *trans,
+        TransformationResults &ret,
+        std::string &path,
+        int &nth) const;
+
     /* actions */
     actions::Action *m_disruptiveAction;
     actions::LogData *m_logData;

src/Makefile.am

@@ -247,11 +247,9 @@ UTILS = \
 	utils/geo_lookup.cc \
 	utils/https_client.cc \
 	utils/ip_tree.cc \
-	utils/md5.cc \
 	utils/msc_tree.cc \
 	utils/random.cc \
 	utils/regex.cc \
-	utils/sha1.cc \
 	utils/system.cc \
 	utils/shared_files.cc
 

src/actions/accuracy.cc

@@ -15,16 +15,10 @@
 
 #include "src/actions/accuracy.h"
 
-#include <iostream>
+#include "modsecurity/rule_with_actions.h"
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "modsecurity/transaction.h"
-#include "modsecurity/rule.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions {
-namespace actions {
 
 
 bool Accuracy::init(std::string *error) {
@@ -45,5 +39,4 @@ bool Accuracy::evaluate(RuleWithActions *rule, Transaction *transaction) {
 }
 
 
-}  // namespace actions
+}  // namespace modsecurity::actions
-}  // namespace modsecurity

src/actions/accuracy.h

@@ -30,7 +30,7 @@ namespace actions {
 class Accuracy : public Action {
  public:
     explicit Accuracy(const std::string &action) 
-        : Action(action, ConfigurationKind),
+        : Action(action, Kind::ConfigurationKind),
         m_accuracy(0) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;

src/actions/action.cc

@@ -45,12 +45,6 @@ namespace modsecurity {
 namespace actions {
 
 
-std::string Action::evaluate(const std::string &value,
-    Transaction *transaction) {
-    return value;
-}
-
-
 bool Action::evaluate(RuleWithActions *rule, Transaction *transaction) {
     return true;
 }

src/actions/audit_log.h

@@ -33,7 +33,7 @@ namespace actions {
 class AuditLog : public Action {
  public:
     explicit AuditLog(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind) { }
+        : Action(action) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction,
         std::shared_ptr<RuleMessage> rm) override;

src/actions/capture.h

@@ -29,7 +29,7 @@ namespace actions {
 class Capture : public Action {
  public:
     explicit Capture(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind) { }
+        : Action(action) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;
 };

src/actions/chain.cc

@@ -15,14 +15,9 @@
 
 #include "src/actions/chain.h"
 
-#include <iostream>
+#include "modsecurity/rule_with_actions.h"
-#include <string>
 
-#include "modsecurity/transaction.h"
+namespace modsecurity::actions {
-#include "modsecurity/rule.h"
-
-namespace modsecurity {
-namespace actions {
 
 
 bool Chain::evaluate(RuleWithActions *rule, Transaction *transaction) {
@@ -31,5 +26,4 @@ bool Chain::evaluate(RuleWithActions *rule, Transaction *transaction) {
 }
 
 
-}  // namespace actions
+}  // namespace modsecurity::actions
-}  // namespace modsecurity

src/actions/chain.h

@@ -33,7 +33,7 @@ namespace actions {
 class Chain : public Action {
  public:
     explicit Chain(const std::string &action) 
-        : Action(action, ConfigurationKind) { }
+        : Action(action, Kind::ConfigurationKind) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;
 };

src/actions/ctl/audit_engine.h

@@ -34,7 +34,7 @@ namespace ctl {
 class AuditEngine : public Action {
  public:
     explicit AuditEngine(const std::string &action)
-        : Action(action, RunTimeOnlyIfMatchKind),
+        : Action(action),
         m_auditEngine(audit_log::AuditLog::AuditLogStatus::NotSetLogStatus) { }
 
     bool init(std::string *error) override;

src/actions/ctl/audit_log_parts.h

@@ -29,7 +29,7 @@ namespace ctl {
 class AuditLogParts : public Action {
  public:
     explicit AuditLogParts(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind),
+        : Action(action),
         mPartsAction(0),
         mParts("") { }
 

src/actions/ctl/request_body_access.h

@@ -30,7 +30,7 @@ namespace ctl {
 class RequestBodyAccess : public Action {
  public:
     explicit RequestBodyAccess(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind),
+        : Action(action),
         m_request_body_access(false) { }
 
     bool init(std::string *error) override;

src/actions/ctl/request_body_processor_json.h

@@ -29,7 +29,7 @@ namespace ctl {
 class RequestBodyProcessorJSON : public Action {
  public:
     explicit RequestBodyProcessorJSON(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind) { }
+        : Action(action) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;
 };

src/actions/ctl/request_body_processor_urlencoded.h

@@ -29,7 +29,7 @@ namespace ctl {
 class RequestBodyProcessorURLENCODED : public Action {
  public:
     explicit RequestBodyProcessorURLENCODED(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind) { }
+        : Action(action) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;
 };

src/actions/ctl/request_body_processor_xml.h

@@ -29,7 +29,7 @@ namespace ctl {
 class RequestBodyProcessorXML : public Action {
  public:
     explicit RequestBodyProcessorXML(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind) { }
+        : Action(action) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;
 };

src/actions/ctl/rule_engine.h

@@ -31,7 +31,7 @@ namespace ctl {
 class RuleEngine : public Action {
  public:
     explicit RuleEngine(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind),
+        : Action(action),
         m_ruleEngine(RulesSetProperties::PropertyNotSetRuleEngine) { }
 
     bool init(std::string *error) override;

src/actions/ctl/rule_remove_by_id.h

@@ -30,7 +30,7 @@ namespace ctl {
 class RuleRemoveById : public Action {
  public:
     explicit RuleRemoveById(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind) { }
+        : Action(action) { }
 
     bool init(std::string *error) override;
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;

src/actions/ctl/rule_remove_by_tag.h

@@ -30,7 +30,7 @@ namespace ctl {
 class RuleRemoveByTag : public Action {
  public:
     explicit RuleRemoveByTag(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind),
+        : Action(action),
         m_tag("") { }
 
     bool init(std::string *error) override;

src/actions/ctl/rule_remove_target_by_id.h

@@ -30,7 +30,7 @@ namespace ctl {
 class RuleRemoveTargetById : public Action {
  public:
     explicit RuleRemoveTargetById(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind),
+        : Action(action),
         m_id(0),
         m_target("") { }
 

src/actions/ctl/rule_remove_target_by_tag.h

@@ -30,7 +30,7 @@ namespace ctl {
 class RuleRemoveTargetByTag : public Action {
  public:
     explicit RuleRemoveTargetByTag(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind) { }
+        : Action(action) { }
 
     bool init(std::string *error) override;
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;

src/actions/data/status.h

@@ -33,8 +33,8 @@ namespace data {
 
 class Status : public Action {
  public:
-    explicit Status(const std::string &action) : Action(action, 2),
+    explicit Status(const std::string &action)
-    m_status(0) { }
+        : Action(action), m_status(0) { }
 
     bool init(std::string *error) override;
     bool evaluate(RuleWithActions *rule, Transaction *transaction,

src/actions/disruptive/allow.h

@@ -54,7 +54,7 @@ enum AllowType : int {
 class Allow : public Action {
  public:
     explicit Allow(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind),
+        : Action(action),
         m_allowType(NoneAllowType) { }
 
 

src/actions/disruptive/redirect.h

@@ -37,12 +37,12 @@ namespace disruptive {
 class Redirect : public Action {
  public:
     explicit Redirect(const std::string &action)
-        : Action(action, RunTimeOnlyIfMatchKind),
+        : Action(action),
         m_status(0),
         m_string(nullptr) { }
 
     explicit Redirect(std::unique_ptr<RunTimeString> z)
-        : Action("redirert", RunTimeOnlyIfMatchKind),
+        : Action("redirert"),
             m_status(0),
             m_string(std::move(z)) { }
 

src/actions/expire_var.h

@@ -36,7 +36,7 @@ class ExpireVar : public Action {
     explicit ExpireVar(const std::string &action) : Action(action) { }
 
     explicit ExpireVar(std::unique_ptr<RunTimeString> z)
-        : Action("expirevar", RunTimeOnlyIfMatchKind),
+        : Action("expirevar"),
             m_string(std::move(z)) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;

src/actions/init_col.h

@@ -35,7 +35,7 @@ class InitCol : public Action {
     explicit InitCol(const std::string &action) : Action(action) { }
 
     InitCol(const std::string &action, std::unique_ptr<RunTimeString> z)
-        : Action(action, RunTimeOnlyIfMatchKind),
+        : Action(action),
             m_string(std::move(z)) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;

src/actions/log.h

@@ -31,7 +31,7 @@ namespace actions {
 class Log : public Action {
  public:
     explicit Log(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind) { }
+        : Action(action) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction,
         std::shared_ptr<RuleMessage> rm) override;

src/actions/log_data.h

@@ -33,10 +33,10 @@ namespace actions {
 class LogData : public Action {
  public:
     explicit LogData(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind) { }
+        : Action(action) { }
 
     explicit LogData(std::unique_ptr<RunTimeString> z)
-        : Action("logdata", RunTimeOnlyIfMatchKind),
+        : Action("logdata"),
             m_string(std::move(z)) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction,

src/actions/maturity.cc

@@ -15,16 +15,10 @@
 
 #include "src/actions/maturity.h"
 
-#include <iostream>
+#include "modsecurity/rule_with_actions.h"
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "modsecurity/transaction.h"
-#include "modsecurity/rule.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions {
-namespace actions {
 
 
 bool Maturity::init(std::string *error) {
@@ -45,5 +39,4 @@ bool Maturity::evaluate(RuleWithActions *rule, Transaction *transaction) {
 }
 
 
-}  // namespace actions
+}  // namespace modsecurity::actions
-}  // namespace modsecurity

src/actions/maturity.h

@@ -30,7 +30,7 @@ namespace actions {
 class Maturity : public Action {
  public:
     explicit Maturity(const std::string &action) 
-        : Action(action, ConfigurationKind),
+        : Action(action, Kind::ConfigurationKind),
         m_maturity(0) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;

src/actions/msg.h

@@ -34,10 +34,10 @@ namespace actions {
 class Msg : public Action {
  public:
     explicit Msg(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind) { }
+        : Action(action) { }
 
     explicit Msg(std::unique_ptr<RunTimeString> z)
-        : Action("msg", RunTimeOnlyIfMatchKind),
+        : Action("msg"),
             m_string(std::move(z)) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction,

src/actions/multi_match.h

@@ -33,7 +33,7 @@ namespace actions {
 class MultiMatch : public Action {
  public:
     explicit MultiMatch(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind) { }
+        : Action(action) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;
 };

src/actions/no_audit_log.h

@@ -33,7 +33,7 @@ namespace actions {
 class NoAuditLog : public Action {
  public:
     explicit NoAuditLog(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind) { }
+        : Action(action) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction,
         std::shared_ptr<RuleMessage> rm) override;

src/actions/no_log.h

@@ -31,7 +31,7 @@ namespace actions {
 class NoLog : public Action {
  public:
     explicit NoLog(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind) { }
+        : Action(action) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction,
         std::shared_ptr<RuleMessage> rm) override;

src/actions/phase.cc

@@ -15,20 +15,15 @@
 
 #include "src/actions/phase.h"
 
-#include <iostream>
+#include "modsecurity/rule_with_actions.h"
-#include <string>
-
-#include "modsecurity/transaction.h"
-#include "modsecurity/rule.h"
-#include "modsecurity/modsecurity.h"
 #include "src/utils/string.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions {
-namespace actions {
+
 
 bool Phase::init(std::string *error) {
-    std::string a = utils::string::tolower(m_parser_payload);
+    const auto a = utils::string::tolower(m_parser_payload);
     m_phase = -1;
 
     try {
@@ -77,5 +72,5 @@ bool Phase::evaluate(RuleWithActions *rule, Transaction *transaction) {
     return true;
 }
 
-}  // namespace actions
+
-}  // namespace modsecurity
+}  // namespace modsecurity::actions

src/actions/phase.h

@@ -32,7 +32,7 @@ namespace actions {
 
 class Phase : public Action {
  public:
-    explicit Phase(const std::string &action) : Action(action, ConfigurationKind),
+    explicit Phase(const std::string &action) : Action(action, Kind::ConfigurationKind),
         m_phase(0),
         m_secRulesPhase(0) { }
 

src/actions/rev.cc

@@ -15,16 +15,10 @@
 
 #include "src/actions/rev.h"
 
-#include <iostream>
+#include "modsecurity/rule_with_actions.h"
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "modsecurity/transaction.h"
-#include "modsecurity/rule.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions {
-namespace actions {
 
 
 bool Rev::init(std::string *error) {
@@ -39,5 +33,4 @@ bool Rev::evaluate(RuleWithActions *rule, Transaction *transaction) {
 }
 
 
-}  // namespace actions
+}  // namespace modsecurity::actions
-}  // namespace modsecurity

src/actions/rev.h

@@ -29,7 +29,7 @@ namespace actions {
 
 class Rev : public Action {
  public:
-    explicit Rev(const std::string &action) : Action(action, ConfigurationKind) { }
+    explicit Rev(const std::string &action) : Action(action, Kind::ConfigurationKind) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;
     bool init(std::string *error) override;

src/actions/rule_id.cc

@@ -15,14 +15,10 @@
 
 #include "src/actions/rule_id.h"
 
-#include <iostream>
+#include "modsecurity/rule_with_actions.h"
-#include <string>
 
-#include "modsecurity/transaction.h"
-#include "modsecurity/rule.h"
 
-namespace modsecurity {
+namespace modsecurity::actions {
-namespace actions {
 
 
 bool RuleId::init(std::string *error) {
@@ -54,5 +50,4 @@ bool RuleId::evaluate(RuleWithActions *rule, Transaction *transaction) {
 }
 
 
-}  // namespace actions
+}  // namespace modsecurity::actions
-}  // namespace modsecurity

src/actions/rule_id.h

@@ -33,7 +33,7 @@ namespace actions {
 class RuleId : public Action {
  public:
     explicit RuleId(const std::string &action) 
-        : Action(action, ConfigurationKind),
+        : Action(action, Kind::ConfigurationKind),
         m_ruleId(0) { }
 
     bool init(std::string *error) override;

src/actions/set_env.h

@@ -36,7 +36,7 @@ class SetENV : public Action {
         : Action(_action) { }
 
     explicit SetENV(std::unique_ptr<RunTimeString> z)
-        : Action("setenv", RunTimeOnlyIfMatchKind),
+        : Action("setenv"),
             m_string(std::move(z)) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;

src/actions/set_rsc.h

@@ -36,7 +36,7 @@ class SetRSC : public Action {
         : Action(_action) { }
 
     explicit SetRSC(std::unique_ptr<RunTimeString> z)
-        : Action("setsrc", RunTimeOnlyIfMatchKind),
+        : Action("setsrc"),
             m_string(std::move(z)) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;

src/actions/set_sid.h

@@ -36,7 +36,7 @@ class SetSID : public Action {
         : Action(_action) { }
 
     explicit SetSID(std::unique_ptr<RunTimeString> z)
-        : Action("setsid", RunTimeOnlyIfMatchKind),
+        : Action("setsid"),
             m_string(std::move(z)) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;

src/actions/set_uid.h

@@ -36,7 +36,7 @@ class SetUID : public Action {
         : Action(_action) { }
 
     explicit SetUID(std::unique_ptr<RunTimeString> z)
-        : Action("setuid", RunTimeOnlyIfMatchKind),
+        : Action("setuid"),
             m_string(std::move(z)) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;

src/actions/skip.h

@@ -30,7 +30,7 @@ namespace actions {
 class Skip : public Action {
  public:
     explicit Skip(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind),
+        : Action(action),
         m_skip_next(0) { }
 
     bool init(std::string *error) override;

src/actions/skip_after.h

@@ -31,7 +31,7 @@ namespace actions {
 class SkipAfter : public Action {
  public:
     explicit SkipAfter(const std::string &action) 
-        : Action(action, RunTimeOnlyIfMatchKind),
+        : Action(action),
         m_skipName(std::make_shared<std::string>(m_parser_payload)) { }
 
     bool evaluate(RuleWithActions *rule, Transaction *transaction) override;

src/actions/tag.h

@@ -33,7 +33,7 @@ namespace actions {
 class Tag : public Action {
  public:
     explicit Tag(std::unique_ptr<RunTimeString> z)
-        : Action("tag", RunTimeOnlyIfMatchKind),
+        : Action("tag"),
         m_string(std::move(z)) { }
 
     std::string getName(Transaction *transaction);

src/actions/transformations/base64_decode.cc

@@ -13,33 +13,19 @@
  *
  */
 
-#include "src/actions/transformations/base64_decode.h"
+#include "base64_decode.h"
 
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 #include "src/utils/base64.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
 
-std::string Base64Decode::evaluate(const std::string &value,
+bool Base64Decode::transform(std::string &value, const Transaction *trans) const {
-    Transaction *transaction) {
+    if (value.empty()) return false;
-    std::string ret = Utils::Base64::decode(value);
+    value = Utils::Base64::decode(value);
-
+    return true;
-    return ret;
 }
 
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity

src/actions/transformations/base64_decode.h

@@ -13,33 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_BASE64_DECODE_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_BASE64_DECODE_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class Base64Decode : public Transformation {
  public:
-    explicit Base64Decode(const std::string &action)  : Transformation(action) { }
+    using Transformation::Transformation;
 
-    std::string evaluate(const std::string &exp,
+    bool transform(std::string &value, const Transaction *trans) const override;
-        Transaction *transaction) override;
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_BASE64_DECODE_H_

src/actions/transformations/base64_decode_ext.cc

@@ -13,33 +13,19 @@
  *
  */
 
-#include "src/actions/transformations/base64_decode_ext.h"
+#include "base64_decode_ext.h"
 
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 #include "src/utils/base64.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
 
-std::string Base64DecodeExt::evaluate(const std::string &value,
+bool Base64DecodeExt::transform(std::string &value, const Transaction *trans) const {
-    Transaction *transaction) {
+    if (value.empty()) return false;
-    std::string ret = Utils::Base64::decode_forgiven(value);
+    value = Utils::Base64::decode_forgiven(value);
-
+    return true;
-    return ret;
 }
 
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity

src/actions/transformations/base64_decode_ext.h

@@ -13,33 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_BASE64_DECODE_EXT_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_BASE64_DECODE_EXT_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class Base64DecodeExt : public Transformation {
  public:
-    explicit Base64DecodeExt(const std::string &action)  : Transformation(action) { }
+    using Transformation::Transformation;
 
-    std::string evaluate(const std::string &exp,
+    bool transform(std::string &value, const Transaction *trans) const override;
-        Transaction *transaction) override;
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_BASE64_DECODE_EXT_H_

src/actions/transformations/base64_encode.cc

@@ -13,33 +13,19 @@
  *
  */
 
-#include "src/actions/transformations/base64_encode.h"
+#include "base64_encode.h"
 
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 #include "src/utils/base64.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
 
-std::string Base64Encode::evaluate(const std::string &value,
+bool Base64Encode::transform(std::string &value, const Transaction *trans) const {
-    Transaction *transaction) {
+    if (value.empty()) return false;
-    std::string ret = Utils::Base64::encode(value);
+    value = Utils::Base64::encode(value);
-
+    return true;
-    return ret;
 }
 
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity

src/actions/transformations/base64_encode.h

@@ -13,33 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_BASE64_ENCODE_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_BASE64_ENCODE_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class Base64Encode : public Transformation {
  public:
-    explicit Base64Encode(const std::string &action)  : Transformation(action) { }
+    using Transformation::Transformation;
 
-    std::string evaluate(const std::string &exp,
+    bool transform(std::string &value, const Transaction *trans) const override;
-        Transaction *transaction) override;
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_BASE64_ENCODE_H_

src/actions/transformations/cmd_line.cc

@@ -13,30 +13,17 @@
  *
  */
 
-#include "src/actions/transformations/cmd_line.h"
+#include "cmd_line.h"
-
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
 
-std::string CmdLine::evaluate(const std::string &value,
+bool CmdLine::transform(std::string &value, const Transaction *trans) const {
-    Transaction *transaction) {
+    char *d = value.data();
-    std::string ret;
+    bool space = false;
-    int space = 0;
 
-    for (auto& a : value) {
+    for (const auto& a : value) {
         switch (a) {
             /* remove some characters */
             case '"':
@@ -52,9 +39,9 @@ std::string CmdLine::evaluate(const std::string &value,
             case '\t':
             case '\r':
             case '\n':
-                if (space == 0) {
+                if (space == false) {
-                    ret.append(" ");
+                    *d++ = ' ';
-                    space++;
+                    space = true;
                 }
                 break;
 
@@ -62,26 +49,27 @@ std::string CmdLine::evaluate(const std::string &value,
             case '/':
             case '(':
                 if (space) {
-                    ret.pop_back();
+                    d--;
                 }
-                space = 0;
+                space = false;
-                ret.append(&a, 1);
+                *d++ = a;
                 break;
 
             /* copy normal characters */
             default :
                 char b = std::tolower(a);
-                ret.append(&b, 1);
+                *d++ = b;
-                space = 0;
+                space = false;
                 break;
         }
     }
 
-    return ret;
+    const auto new_len = d - value.c_str();
+    const auto changed = new_len != value.length();
+    value.resize(new_len);
+    return changed;
 }
 
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
 

src/actions/transformations/cmd_line.h

@@ -13,35 +13,21 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_CMD_LINE_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_CMD_LINE_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class CmdLine : public Transformation {
  public:
-    explicit CmdLine(const std::string &action) 
+    using Transformation::Transformation;
-        : Transformation(action) { }
 
-    std::string evaluate(const std::string &exp,
+    bool transform(std::string &value, const Transaction *trans) const override;
-        Transaction *transaction) override;
 };
 
-}  // namespace transformations
+}  // modsecurity::namespace actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_CMD_LINE_H_
 

src/actions/transformations/compress_whitespace.cc

@@ -13,54 +13,36 @@
  *
  */
 
-#include "src/actions/transformations/compress_whitespace.h"
+#include "compress_whitespace.h"
-
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
-CompressWhitespace::CompressWhitespace(const std::string &action) 
-    : Transformation(action) {
-    this->action_kind = 1;
-}
 
-std::string CompressWhitespace::evaluate(const std::string &value,
+bool CompressWhitespace::transform(std::string &value, const Transaction *trans) const {
-    Transaction *transaction) {
+    bool inWhiteSpace = false;
 
-    std::string a;
+    auto d = value.data();
-    int inWhiteSpace = 0;
-    int i = 0;
 
-    while (i < value.size()) {
+    for(const auto c : value) {
-        if (isspace(value[i])) {
+        if (isspace(c)) {
             if (inWhiteSpace) {
-                i++;
                 continue;
             } else {
-                inWhiteSpace = 1;
+                inWhiteSpace = true;
-                a.append(" ", 1);
+                *d++ = ' ';
             }
         } else {
-            inWhiteSpace = 0;
+            inWhiteSpace = false;
-            a.append(&value.at(i), 1);
+            *d++ = c;
         }
-        i++;
     }
 
-    return a;
+    const auto new_len = d - value.c_str();
+    const auto changed = new_len != value.length();
+    value.resize(new_len);
+    return changed;
 }
 
-}  // namespace transformations
+
-}  // namespace actions
+}  // namespace modsecurity::actions::transformations
-}  // namespace modsecurity

src/actions/transformations/compress_whitespace.h

@@ -13,34 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_COMPRESS_WHITESPACE_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_COMPRESS_WHITESPACE_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class CompressWhitespace : public Transformation {
  public:
+    using Transformation::Transformation;
 
-    explicit CompressWhitespace(const std::string &action) ;
+    bool transform(std::string &value, const Transaction *trans) const override;
-
-    std::string evaluate(const std::string &exp,
-        Transaction *transaction) override;
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_COMPRESS_WHITESPACE_H_

src/actions/transformations/css_decode.cc

@@ -13,42 +13,13 @@
  *
  */
 
-#include "src/actions/transformations/css_decode.h"
+#include "css_decode.h"
 
-#include <string.h>
-
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 #include "src/utils/string.h"
 
+using namespace modsecurity::utils::string;
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
-
-
-std::string CssDecode::evaluate(const std::string &value,
-    Transaction *transaction) {
-
-    char *tmp = reinterpret_cast<char *>(
-        malloc(sizeof(char) * value.size() + 1));
-    memcpy(tmp, value.c_str(), value.size() + 1);
-    tmp[value.size()] = '\0';
-
-    CssDecode::css_decode_inplace(reinterpret_cast<unsigned char *>(tmp),
-        value.size());
-
-    std::string ret(tmp, 0, value.size());
-    free(tmp);
-    return ret;
-}
 
 
 /**
@@ -58,15 +29,13 @@ std::string CssDecode::evaluate(const std::string &value,
  *     http://www.w3.org/TR/REC-CSS2/syndata.html#q4
  *     http://www.unicode.org/roadmaps/
  */
-int CssDecode::css_decode_inplace(unsigned char *input, int64_t input_len) {
+static inline bool css_decode_inplace(std::string &val) {
-    unsigned char *d = (unsigned char *)input;
+    const auto input_len = val.length();
-    int64_t i, j, count;
+    auto input = reinterpret_cast<unsigned char *>(val.data());
+    auto d = input;
+    bool changed = false;
 
-    if (input == NULL) {
+    std::string::size_type i = 0;
-        return -1;
-    }
-
-    i = count = 0;
     while (i < input_len) {
         /* Is the character a backslash? */
         if (input[i] == '\\') {
@@ -75,7 +44,7 @@ int CssDecode::css_decode_inplace(unsigned char *input, int64_t input_len) {
                 i++; /* We are not going to need the backslash. */
 
                 /* Check for 1-6 hex characters following the backslash */
-                j = 0;
+                std::string::size_type j = 0;
                 while ((j < 6)
                         && (i + j < input_len)
                         && (VALID_HEX(input[i + j]))) {
@@ -157,40 +126,45 @@ int CssDecode::css_decode_inplace(unsigned char *input, int64_t input_len) {
                     }
 
                     /* Move over. */
-                    count++;
                     i += j;
+
+                    changed = true;
                 } else if (input[i] == '\n') {
                 /* No hexadecimal digits after backslash */
                     /* A newline character following backslash is ignored. */
                     i++;
+                    changed = true;
                 } else {
                 /* The character after backslash is not a hexadecimal digit,
                  * nor a newline. */
                     /* Use one character after backslash as is. */
                     *d++ = input[i++];
-                    count++;
                 }
             } else {
             /* No characters after backslash. */
                 /* Do not include backslash in output
                  *(continuation to nothing) */
                 i++;
+                changed = true;
             }
         } else {
         /* Character is not a backslash. */
             /* Copy one normal character to output. */
             *d++ = input[i++];
-            count++;
         }
     }
 
     /* Terminate output string. */
     *d = '\0';
 
-    return count;
+    val.resize(d - input);
+    return changed;
 }
 
 
-}  // namespace transformations
+bool CssDecode::transform(std::string &value, const Transaction *trans) const {
-}  // namespace actions
+    return css_decode_inplace(value);
-}  // namespace modsecurity
+}
+
+
+}  // namespace modsecurity::actions::transformations

src/actions/transformations/css_decode.h

@@ -13,37 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_CSS_DECODE_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_CSS_DECODE_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
-
-namespace actions {
-namespace transformations {
 
+namespace modsecurity::actions::transformations {
 
 class CssDecode : public Transformation {
  public:
-    explicit CssDecode(const std::string &action) 
+    using Transformation::Transformation;
-        : Transformation(action) { }
-    std::string evaluate(const std::string &exp,
-        Transaction *transaction) override;
 
-    static int css_decode_inplace(unsigned char *input, int64_t input_len);
+    bool transform(std::string &value, const Transaction *trans) const override;
 };
 
-
+}  // namespace modsecurity::actions::transformations
-}  // namespace transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_CSS_DECODE_H_

src/actions/transformations/escape_seq_decode.cc

@@ -13,36 +13,22 @@
  *
  */
 
-#include "src/actions/transformations/escape_seq_decode.h"
+#include "escape_seq_decode.h"
 
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-#include <cstring>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 #include "src/utils/string.h"
 
-namespace modsecurity {
+using namespace modsecurity::utils::string;
-namespace actions {
-namespace transformations {
 
-EscapeSeqDecode::EscapeSeqDecode(const std::string &action) 
+namespace modsecurity::actions::transformations {
-    : Transformation(action) {
-    this->action_kind = 1;
-}
 
 
-int EscapeSeqDecode::ansi_c_sequences_decode_inplace(unsigned char *input,
+static inline int ansi_c_sequences_decode_inplace(std::string &value) {
-    int input_len) {
+    auto d = reinterpret_cast<unsigned char *>(value.data());
-    unsigned char *d = input;
+    const unsigned char* input = d;
-    int i, count;
+    const auto input_len = value.length();
 
-    i = count = 0;
+    bool changed = false;
+    std::string::size_type i = 0;
     while (i < input_len) {
         if ((input[i] == '\\') && (i + 1 < input_len)) {
             int c = -1;
@@ -120,43 +106,29 @@ int EscapeSeqDecode::ansi_c_sequences_decode_inplace(unsigned char *input,
             if (c == -1) {
                 /* Didn't recognise encoding, copy raw bytes. */
                 *d++ = input[i + 1];
-                count++;
                 i += 2;
             } else {
                 /* Converted the encoding. */
                 *d++ = c;
-                count++;
             }
+
+            changed = true;
         } else {
             /* Input character not a backslash, copy it. */
             *d++ = input[i++];
-            count++;
         }
     }
 
     *d = '\0';
 
-    return count;
+    value.resize(d - input);
+    return changed;
 }
 
 
-std::string EscapeSeqDecode::evaluate(const std::string &value,
+bool EscapeSeqDecode::transform(std::string &value, const Transaction *trans) const {
-    Transaction *transaction) {
+    return ansi_c_sequences_decode_inplace(value);
-
-    unsigned char *tmp = (unsigned char *) malloc(sizeof(char)
-        * value.size() + 1);
-    memcpy(tmp, value.c_str(), value.size() + 1);
-    tmp[value.size()] = '\0';
-
-    int size = ansi_c_sequences_decode_inplace(tmp, value.size());
-
-    std::string ret("");
-    ret.assign(reinterpret_cast<char *>(tmp), size);
-    free(tmp);
-
-    return ret;
 }
 
-}  // namespace transformations
+
-}  // namespace actions
+}  // namespace modsecurity::actions::transformations
-}  // namespace modsecurity

src/actions/transformations/escape_seq_decode.h

@@ -13,35 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_ESCAPE_SEQ_DECODE_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_ESCAPE_SEQ_DECODE_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class EscapeSeqDecode : public Transformation {
  public:
+    using Transformation::Transformation;
 
-    explicit EscapeSeqDecode(const std::string &action) ;
+    bool transform(std::string &value, const Transaction *trans) const override;
-
-    std::string evaluate(const std::string &exp,
-        Transaction *transaction) override;
-    int ansi_c_sequences_decode_inplace(unsigned char *input, int input_len);
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_ESCAPE_SEQ_DECODE_H_

src/actions/transformations/hex_decode.cc

@@ -13,67 +13,35 @@
  *
  */
 
-#include "src/actions/transformations/hex_decode.h"
+#include "hex_decode.h"
 
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-#include <cstring>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 #include "src/utils/string.h"
 
-namespace modsecurity {
+
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 
-std::string HexDecode::evaluate(const std::string &value,
+static inline int inplace(std::string &value) {
-    Transaction *transaction) {
+    if (value.empty()) return false;
-    std::string ret;
-    unsigned char *input;
-    int size = 0;
 
-    input = reinterpret_cast<unsigned char *>
+    const auto len = value.length();
-        (malloc(sizeof(char) * value.length()+1));
+    auto d = reinterpret_cast<unsigned char *>(value.data());
+    const auto data = d;
 
-    if (input == NULL) {
+    for (int i = 0; i <= len - 2; i += 2) {
-        return "";
-    }
-
-    memcpy(input, value.c_str(), value.length()+1);
-
-    size = inplace(input, value.length());
-
-    ret.assign(reinterpret_cast<char *>(input), size);
-    free(input);
-
-    return ret;
-}
-
-
-int HexDecode::inplace(unsigned char *data, int len) {
-    unsigned char *d = data;
-    int count = 0;
-
-    if ((data == NULL) || (len == 0)) {
-        return 0;
-    }
-
-    for (int i = 0;i <= len - 2;i += 2) {
         *d++ = utils::string::x2c(&data[i]);
-        count++;
     }
+
     *d = '\0';
 
-    return count;
+    value.resize(d - data);
+    return true;
 }
 
 
-}  // namespace transformations
+bool HexDecode::transform(std::string &value, const Transaction *trans) const {
-}  // namespace actions
+    return inplace(value);
-}  // namespace modsecurity
+}
+
+
+}  // namespace modsecurity::actions::transformations

src/actions/transformations/hex_decode.h

@@ -13,35 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_HEX_DECODE_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_HEX_DECODE_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class HexDecode : public Transformation {
  public:
-    explicit HexDecode(const std::string &action)  : Transformation(action) { }
+    using Transformation::Transformation;
 
-    std::string evaluate(const std::string &exp,
+    bool transform(std::string &value, const Transaction *trans) const override;
-        Transaction *transaction) override;
-
-    static int inplace(unsigned char *data, int len);
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_HEX_DECODE_H_

src/actions/transformations/hex_encode.cc

@@ -13,41 +13,25 @@
  *
  */
 
-#include "src/actions/transformations/hex_encode.h"
+#include "hex_encode.h"
 
-#include <iostream>
+#include "modsecurity/rule_with_actions.h"
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-#include <iterator>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
-HexEncode::HexEncode(const std::string &action) 
-    : Transformation(action) {
-    this->action_kind = 1;
-}
 
-std::string HexEncode::evaluate(const std::string &value,
+bool HexEncode::transform(std::string &value, const Transaction *trans) const {
-    Transaction *transaction) {
+    if (value.empty()) return false;
 
     std::stringstream result;
-    for (std::size_t i=0; i < value.length(); i++) {
+    for (const auto c : value) {
-        unsigned int ii = (unsigned char)(value[i]);
+        unsigned int ii = (unsigned char)c;
         result << std::setw(2) << std::setfill('0') << std::hex << ii;
     }
 
-    return result.str();
+    value = result.str();
+    return true;
 }
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity

src/actions/transformations/hex_encode.h

@@ -13,34 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_HEX_ENCODE_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_HEX_ENCODE_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class HexEncode : public Transformation {
  public:
+    using Transformation::Transformation;
 
-    explicit HexEncode(const std::string &action);
+    bool transform(std::string &value, const Transaction *trans) const override;
-
-    std::string evaluate(const std::string &exp,
-        Transaction *transaction) override;
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_HEX_ENCODE_H_

src/actions/transformations/html_entity_decode.cc

@@ -13,70 +13,36 @@
  *
  */
 
-#include "src/actions/transformations/html_entity_decode.h"
+#include "html_entity_decode.h"
 
-#include <string.h>
+#include <cstring>
 
-#include <iostream>
+#include "src/utils/string.h"
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 
 #ifdef WIN32
 #include "src/compat/msvc.h"
 #endif
 
+using namespace modsecurity::utils::string;
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
 
-std::string HtmlEntityDecode::evaluate(const std::string &value,
+static inline bool inplace(std::string &value) {
-    Transaction *transaction) {
+    const auto input_len = value.length();
-    std::string ret;
+    auto d = reinterpret_cast<unsigned char*>(value.data());
-    unsigned char *input;
+    const unsigned char *input = d;
+    const unsigned char *end = input + input_len;
 
-    input = reinterpret_cast<unsigned char *>
+    std::string::size_type i = 0;
-        (malloc(sizeof(char) * value.length()+1));
+    while (i < input_len) {
-
+        std::string::size_type copy = 1;
-    if (input == NULL) {
-        return "";
-    }
-
-    memcpy(input, value.c_str(), value.length()+1);
-
-    size_t i = inplace(input, value.length());
-
-    ret.assign(reinterpret_cast<char *>(input), i);
-    free(input);
-
-    return ret;
-}
-
-
-int HtmlEntityDecode::inplace(unsigned char *input, uint64_t input_len) {
-    unsigned char *d = input;
-    int i, count;
-
-    if ((input == NULL) || (input_len == 0)) {
-        return 0;
-    }
-
-    i = count = 0;
-    while ((i < input_len) && (count < input_len)) {
-        int z, copy = 1;
 
         /* Require an ampersand and at least one character to
          * start looking into the entity.
          */
         if ((input[i] == '&') && (i + 1 < input_len)) {
-            int k, j = i + 1;
+            auto j = i + 1;
 
             if (input[j] == '#') {
                 /* Numerical entity. */
@@ -96,19 +62,18 @@ int HtmlEntityDecode::inplace(unsigned char *input, uint64_t input_len) {
                     }
                     j++; /* j is the position of the first digit now. */
 
-                    k = j;
+                    constexpr int MAX_HEX_DIGITS = 2;   // supports only bytes (max value 0xff)
-                    while ((j < input_len) && (isxdigit(input[j]))) {
+                    auto k = j;
+                    while ((j - k < MAX_HEX_DIGITS) && (j < input_len) && (isxdigit(input[j]))) {
                         j++;
                     }
                     if (j > k) { /* Do we have at least one digit? */
                         /* Decode the entity. */
-                        char *x;
+                        char x[MAX_HEX_DIGITS + 1];
-                        x = reinterpret_cast<char *>(calloc(sizeof(char),
-                            ((j - k) + 1)));
                         memcpy(x, (const char *)&input[k], j - k);
-                        *d++ = (unsigned char)strtol(x, NULL, 16);
+                        x[j - k] = '\0';
-                        free(x);
+
-                        count++;
+                        *d++ = (unsigned char)strtol(x, nullptr, 16);
 
                         /* Skip over the semicolon if it's there. */
                         if ((j < input_len) && (input[j] == ';')) {
@@ -122,19 +87,18 @@ int HtmlEntityDecode::inplace(unsigned char *input, uint64_t input_len) {
                     }
                 } else {
                     /* Decimal entity. */
-                    k = j;
+                    constexpr int MAX_DEC_DIGITS = 3;   // supports only bytes (max value 255)
-                    while ((j < input_len) && (isdigit(input[j]))) {
+                    auto k = j;
+                    while ((j - k < MAX_DEC_DIGITS) && (j < input_len) && (isdigit(input[j]))) {
                         j++;
                     }
                     if (j > k) { /* Do we have at least one digit? */
                         /* Decode the entity. */
-                        char *x;
+                        char x[MAX_DEC_DIGITS + 1];
-                        x = reinterpret_cast<char *>(calloc(sizeof(char),
-                            ((j - k) + 1)));
                         memcpy(x, (const char *)&input[k], j - k);
-                        *d++ = (unsigned char)strtol(x, NULL, 10);
+                        x[j - k] = '\0';
-                        free(x);
+
-                        count++;
+                        *d++ = (unsigned char)strtol(x, nullptr, 10);
 
                         /* Skip over the semicolon if it's there. */
                         if ((j < input_len) && (input[j] == ';')) {
@@ -149,38 +113,31 @@ int HtmlEntityDecode::inplace(unsigned char *input, uint64_t input_len) {
                 }
             } else {
                 /* Text entity. */
-                k = j;
+                auto k = j;
                 while ((j < input_len) && (isalnum(input[j]))) {
                     j++;
                 }
                 if (j > k) { /* Do we have at least one digit? */
-                    char *x;
+                    const auto x = reinterpret_cast<const char*>(&input[k]);
-                    x = reinterpret_cast<char *>(calloc(sizeof(char),
-                        ((j - k) + 1)));
-                    memcpy(x, (const char *)&input[k], j - k);
 
                     /* Decode the entity. */
                     /* ENH What about others? */
-                    if (strcasecmp(x, "quot") == 0) {
+                    if (strncasecmp(x, "quot", 4) == 0) {
                         *d++ = '"';
-                    } else if (strcasecmp(x, "amp") == 0) {
+                    } else if (strncasecmp(x, "amp", 3) == 0) {
                         *d++ = '&';
-                    } else if (strcasecmp(x, "lt") == 0) {
+                    } else if (strncasecmp(x, "lt", 2) == 0) {
                         *d++ = '<';
-                    } else if (strcasecmp(x, "gt") == 0) {
+                    } else if (strncasecmp(x, "gt", 2) == 0) {
                         *d++ = '>';
-                    } else if (strcasecmp(x, "nbsp") == 0) {
+                    } else if (strncasecmp(x, "nbsp", 4) == 0) {
                         *d++ = NBSP;
                     } else {
                         /* We do no want to convert this entity,
                          * copy the raw data over. */
                         copy = j - k + 1;
-                        free(x);
                         goto HTML_ENT_OUT;
                     }
-                    free(x);
-
-                    count++;
 
                     /* Skip over the semicolon if it's there. */
                     if ((j < input_len) && (input[j] == ';')) {
@@ -196,17 +153,21 @@ int HtmlEntityDecode::inplace(unsigned char *input, uint64_t input_len) {
 
 HTML_ENT_OUT:
 
-        for (z = 0; ((z < copy) && (count < input_len)); z++) {
+        for (auto z = 0; z < copy; z++) {
             *d++ = input[i++];
-            count++;
         }
     }
 
     *d = '\0';
 
-    return count;
+    value.resize(d - input);
+    return d != end;
 }
 
-}  // namespace transformations
+
-}  // namespace actions
+bool HtmlEntityDecode::transform(std::string &value, const Transaction *trans) const {
-}  // namespace modsecurity
+    return inplace(value);
+}
+
+
+}  // namespace modsecurity::actions::transformations

src/actions/transformations/html_entity_decode.h

@@ -13,40 +13,20 @@
  *
  */
 
-#include <string>
-#include <unordered_map>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-#include "src/utils/string.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_HTML_ENTITY_DECODE_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_HTML_ENTITY_DECODE_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
-
-namespace actions {
-namespace transformations {
 
+namespace modsecurity::actions::transformations {
 
 class HtmlEntityDecode : public Transformation {
  public:
-    explicit HtmlEntityDecode(const std::string &action) 
+    using Transformation::Transformation;
-        : Transformation(action) { }
 
-    std::string evaluate(const std::string &exp,
+    bool transform(std::string &value, const Transaction *trans) const override;
-        Transaction *transaction) override;
-
-    static int inplace(unsigned char *input, uint64_t input_len);
 };
 
-
+}  // namespace modsecurity::actions::transformations
-}  // namespace transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_HTML_ENTITY_DECODE_H_

src/actions/transformations/js_decode.cc

@@ -13,55 +13,22 @@
  *
  */
 
-#include "src/actions/transformations/js_decode.h"
+#include "js_decode.h"
 
-#include <string.h>
-
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 #include "src/utils/string.h"
 
+using namespace modsecurity::utils::string;
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
 
-std::string JsDecode::evaluate(const std::string &value,
+static inline int inplace(std::string &value) {
-    Transaction *transaction) {
+    auto d = reinterpret_cast<unsigned char*>(value.data());
-    std::string ret;
+    const unsigned char *input = d;
-    unsigned char *input;
+    const auto input_len = value.length();
 
-    input = reinterpret_cast<unsigned char *>
+    bool changed = false;
-        (malloc(sizeof(char) * value.length()+1));
+    std::string::size_type i = 0;
-
-    if (input == NULL) {
-        return "";
-    }
-
-    memcpy(input, value.c_str(), value.length()+1);
-
-    size_t i = inplace(input, value.length());
-
-    ret.assign(reinterpret_cast<char *>(input), i);
-    free(input);
-
-    return ret;
-}
-
-
-int JsDecode::inplace(unsigned char *input, uint64_t input_len) {
-    unsigned char *d = (unsigned char *)input;
-    int64_t i, count;
-
-    i = count = 0;
     while (i < input_len) {
         if (input[i] == '\\') {
             /* Character is an escape. */
@@ -82,14 +49,14 @@ int JsDecode::inplace(unsigned char *input, uint64_t input_len) {
                 }
 
                 d++;
-                count++;
                 i += 6;
+                changed = true;
             } else if ((i + 3 < input_len) && (input[i + 1] == 'x')
                     && VALID_HEX(input[i + 2]) && VALID_HEX(input[i + 3])) {
                 /* \xHH */
                 *d++ = utils::string::x2c(&input[i + 2]);
-                count++;
                 i += 4;
+                changed = true;
             } else if ((i + 1 < input_len) && ISODIGIT(input[i + 1])) {
                 /* \OOO (only one byte, \000 - \377) */
                 char buf[4];
@@ -110,7 +77,7 @@ int JsDecode::inplace(unsigned char *input, uint64_t input_len) {
                     }
                     *d++ = (unsigned char)strtol(buf, NULL, 8);
                     i += 1 + j;
-                    count++;
+                    changed = true;
                 }
             } else if (i + 1 < input_len) {
                 /* \C */
@@ -144,25 +111,28 @@ int JsDecode::inplace(unsigned char *input, uint64_t input_len) {
 
                 *d++ = c;
                 i += 2;
-                count++;
+                changed = true;
             } else {
                 /* Not enough bytes */
                 while (i < input_len) {
                     *d++ = input[i++];
-                    count++;
                 }
             }
         } else {
             *d++ = input[i++];
-            count++;
         }
     }
 
     *d = '\0';
 
-    return count;
+    value.resize(d - input);
+    return changed;
 }
 
-}  // namespace transformations
+
-}  // namespace actions
+bool JsDecode::transform(std::string &value, const Transaction *trans) const {
-}  // namespace modsecurity
+    return inplace(value);
+}
+
+
+}  // namespace modsecurity::actions::transformations

src/actions/transformations/js_decode.h

@@ -13,35 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_JS_DECODE_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_JS_DECODE_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class JsDecode : public Transformation {
  public:
-    explicit JsDecode(const std::string &action) 
+    using Transformation::Transformation;
-        : Transformation(action) { }
 
-    std::string evaluate(const std::string &exp,
+    bool transform(std::string &value, const Transaction *trans) const override;
-        Transaction *transaction) override;
-    static int inplace(unsigned char *input, uint64_t input_len);
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_JS_DECODE_H_

src/actions/transformations/length.cc

@@ -13,34 +13,16 @@
  *
  */
 
-#include "src/actions/transformations/length.h"
+#include "length.h"
-
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
-Length::Length(const std::string &action) 
+
-    : Transformation(action) {
+bool Length::transform(std::string &value, const Transaction *trans) const {
-    this->action_kind = 1;
+    value = std::to_string(value.size());
+    return true;
 }
 
-std::string Length::evaluate(const std::string &value,
-    Transaction *transaction) {
 
-    return std::to_string(value.size());
+}  // namespace modsecurity::actions::transformations
-}
-
-}  // namespace transformations
-}  // namespace actions
-}  // namespace modsecurity

src/actions/transformations/length.h

@@ -13,34 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_LENGTH_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_LENGTH_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class Length : public Transformation {
  public:
+    using Transformation::Transformation;
 
-    explicit Length(const std::string &action);
+    bool transform(std::string &value, const Transaction *trans) const override;
-
-    std::string evaluate(const std::string &exp,
-        Transaction *transaction) override;
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_LENGTH_H_

src/actions/transformations/lower_case.cc

@@ -13,37 +13,19 @@
  *
  */
 
-#include "src/actions/transformations/lower_case.h"
 
-#include <algorithm>
+#include "lower_case.h"
-#include <string>
-#include <locale>
 
-#include "modsecurity/transaction.h"
+#include <cctype>
-#include "src/actions/transformations/transformation.h"
-#include "modsecurity/actions/action.h"
-
-namespace modsecurity {
-namespace actions {
-namespace transformations {
 
 
-LowerCase::LowerCase(const std::string &a)
+namespace modsecurity::actions::transformations {
-    : Transformation(a) {
+
+
+bool LowerCase::transform(std::string &value, const Transaction *trans) const {
+    return convert(value, [](auto c) {
+                    return std::tolower(c); });
 }
 
-std::string LowerCase::evaluate(const std::string &val,
-    Transaction *transaction) {
-    std::locale loc;
-    std::string value(val);
 
-    for (std::string::size_type i=0; i < value.length(); ++i) {
+}  // namespace modsecurity::actions::transformations
-        value[i] = std::tolower(value[i], loc);
-    }
-
-    return value;
-}
-
-}  // namespace transformations
-}  // namespace actions
-}  // namespace modsecurity

src/actions/transformations/lower_case.h

@@ -13,34 +13,35 @@
  *
  */
 
-#include <string>
-#include <unordered_map>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_LOWER_CASE_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_LOWER_CASE_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
 
-namespace modsecurity {
+#include <algorithm>
-class Transaction;
-namespace actions {
-namespace transformations {
 
+namespace modsecurity::actions::transformations {
 
 class LowerCase : public Transformation {
  public:
-    explicit LowerCase(const std::string &action);
+    using Transformation::Transformation;
-    std::string evaluate(const std::string &exp,
+
-        Transaction *transaction) override;
+    bool transform(std::string &value, const Transaction *trans) const override;
+
+    template<typename Operation>
+    static bool convert(std::string &val, Operation op) {
+        bool changed = false;
+
+        std::transform(val.begin(), val.end(), val.data(),
+                       [&](auto c) { 
+                            const auto nc = op(c);
+                            if(nc != c) changed = true; 
+                            return nc; });
+
+        return changed;
+    }
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_LOWER_CASE_H_

src/actions/transformations/md5.cc

@@ -13,32 +13,17 @@
  *
  */
 
-#include "src/actions/transformations/md5.h"
+#include "md5.h"
 
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 #include "src/utils/md5.h"
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
 
-std::string Md5::evaluate(const std::string &value,
+bool Md5::transform(std::string &value, const Transaction *trans) const {
-    Transaction *transaction) {
+    value = Utils::Md5::digest(value);
-    std::string ret = Utils::Md5::digest(value);
+    return true;
-
-    return ret;
 }
 
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity

src/actions/transformations/md5.h

@@ -13,33 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_MD5_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_MD5_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class Md5 : public Transformation {
  public:
-    explicit Md5(const std::string &action)  : Transformation(action) { }
+    using Transformation::Transformation;
 
-    std::string evaluate(const std::string &exp,
+    bool transform(std::string &value, const Transaction *trans) const override;
-        Transaction *transaction) override;
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_MD5_H_

src/actions/transformations/none.cc

@@ -13,30 +13,15 @@
  *
  */
 
-#include "src/actions/transformations/none.h"
+#include "none.h"
-
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
 
-std::string None::evaluate(const std::string &value,
+bool None::transform(std::string &value, const Transaction *trans) const {
-    Transaction *transaction) {
+    return false;
-    return value;
 }
 
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity

src/actions/transformations/none.h

@@ -13,20 +13,12 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_NONE_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_NONE_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class None : public Transformation {
  public:
@@ -34,14 +26,9 @@ class None : public Transformation {
         : Transformation(action)
         { m_isNone = true; }
 
-    std::string evaluate(const std::string &exp,
+    bool transform(std::string &value, const Transaction *trans) const override;
-        Transaction *transaction) override;
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_NONE_H_

src/actions/transformations/normalise_path.cc

@@ -13,47 +13,14 @@
  *
  */
 
-#include "src/actions/transformations/normalise_path.h"
+#include "normalise_path.h"
-
-#include <string.h>
-
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
-NormalisePath::NormalisePath(const std::string &action) 
-    : Transformation(action) {
-    this->action_kind = 1;
-}
 
-std::string NormalisePath::evaluate(const std::string &value,
+bool NormalisePath::transform(std::string &value, const Transaction *trans) const {
-    Transaction *transaction) {
+    return normalize_path_inplace(value, false);
-    int changed = 0;
-
-    char *tmp = reinterpret_cast<char *>(
-        malloc(sizeof(char) * value.size() + 1));
-    memcpy(tmp, value.c_str(), value.size() + 1);
-    tmp[value.size()] = '\0';
-
-    int i = normalize_path_inplace((unsigned char *)tmp,
-        value.size(), 0, &changed);
-
-    std::string ret("");
-    ret.assign(tmp, i);
-    free(tmp);
-
-    return ret;
 }
 
 
@@ -61,21 +28,22 @@ std::string NormalisePath::evaluate(const std::string &value,
  *
  * IMP1 Assumes NUL-terminated
  */
-int NormalisePath::normalize_path_inplace(unsigned char *input, int input_len,
+bool NormalisePath::normalize_path_inplace(std::string &val, const bool win) {
-    int win, int *changed) {
     unsigned char *src;
     unsigned char *dst;
     unsigned char *end;
-    int ldst = 0;
     int hitroot = 0;
     int done = 0;
     int relative;
     int trailing;
 
-    *changed = 0;
+    bool changed = false;
 
     /* Need at least one byte to normalize */
-    if (input_len <= 0) return 0;
+    if(val.empty()) return false;
+
+    auto input = reinterpret_cast<unsigned char*>(val.data());
+    const auto input_len = val.length();
 
     /*
      * ENH: Deal with UNC and drive letters?
@@ -83,7 +51,6 @@ int NormalisePath::normalize_path_inplace(unsigned char *input, int input_len,
 
     src = dst = input;
     end = input + (input_len - 1);
-    ldst = 1;
 
     relative = ((*input == '/') || (win && (*input == '\\'))) ? 0 : 1;
     trailing = ((*end == '/') || (win && (*end == '\\'))) ? 1 : 0;
@@ -94,11 +61,11 @@ int NormalisePath::normalize_path_inplace(unsigned char *input, int input_len,
         if (win) {
             if (*src == '\\') {
                 *src = '/';
-                *changed = 1;
+                changed = true;
             }
             if ((src < end) && (*(src + 1) == '\\')) {
                 *(src + 1) = '/';
-                *changed = 1;
+                changed = true;
             }
         }
 
@@ -116,7 +83,7 @@ int NormalisePath::normalize_path_inplace(unsigned char *input, int input_len,
         /* Could it be an empty path segment? */
         if ((src != end) && *src == '/') {
             /* Ignore */
-            *changed = 1;
+            changed = true;
             goto copy; /* Copy will take care of this. */
         } else if (*src == '.') {
         /* Could it be a back or self reference? */
@@ -153,25 +120,25 @@ int NormalisePath::normalize_path_inplace(unsigned char *input, int input_len,
                     }
                 }
 
-                if (done) goto length; /* Skip the copy. */
+                if (done) goto skip_copy; /* Skip the copy. */
                 src++;
 
-                *changed = 1;
+                changed = true;
             } else if (dst == input) {
                 /* Relative Self-reference? */
-                *changed = 1;
+                changed = true;
 
                 /* Ignore. */
 
-                if (done) goto length; /* Skip the copy. */
+                if (done) goto skip_copy; /* Skip the copy. */
                 src++;
             } else if (*(dst - 1) == '/') {
             /* Self-reference? */
-                *changed = 1;
+                changed = true;
 
                 /* Ignore. */
 
-                if (done) goto length; /* Skip the copy. */
+                if (done) goto skip_copy; /* Skip the copy. */
                 dst--;
                 src++;
             }
@@ -191,7 +158,7 @@ copy:
                 && ((*(src + 1) == '/') || (win && (*(src + 1) == '\\'))) ) {
                 src++;
             }
-            if (oldsrc != src) *changed = 1;
+            if (oldsrc != src) changed = true;
 
             /* Do not copy the forward slash to the root
              * if it is not a relative path.  Instead
@@ -199,30 +166,28 @@ copy:
              */
             if (relative && (dst == input)) {
                 src++;
-                goto length; /* Skip the copy */
+                goto skip_copy; /* Skip the copy */
             }
         }
 
         *(dst++) = *(src++);
 
-length:
+skip_copy:
-        ldst = (dst - input);
+        ;   // nop for the goto label to work
     }
     /* Make sure that there is not a trailing slash in the
      * normalized form if there was not one in the original form.
      */
     if (!trailing && (dst > input) && *(dst - 1) == '/') {
-        ldst--;
         dst--;
     }
 
     /* Always NUL terminate */
     *dst = '\0';
 
-    return ldst;
+    val.resize(dst - input);
+    return changed;
 }
 
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity

src/actions/transformations/normalise_path.h

@@ -13,37 +13,22 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_NORMALISE_PATH_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_NORMALISE_PATH_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class NormalisePath : public Transformation {
  public:
+    using Transformation::Transformation;
 
-    explicit NormalisePath(const std::string &action);
+    bool transform(std::string &value, const Transaction *trans) const override;
 
-    std::string evaluate(const std::string &exp,
+    static bool normalize_path_inplace(std::string &val, const bool win);
-        Transaction *transaction) override;
-
-    static int normalize_path_inplace(unsigned char *input, int input_len,
-        int win, int *changed);
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_NORMALISE_PATH_H_

src/actions/transformations/normalise_path_win.cc

@@ -13,48 +13,17 @@
  *
  */
 
-#include "src/actions/transformations/normalise_path_win.h"
+#include "normalise_path_win.h"
 
-#include <string.h>
+#include "normalise_path.h"
-
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
-#include "src/actions/transformations/normalise_path.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
 
-std::string NormalisePathWin::evaluate(const std::string &value,
+bool NormalisePathWin::transform(std::string &value, const Transaction *trans) const {
-    Transaction *transaction) {
+    return NormalisePath::normalize_path_inplace(value, true);
-    int changed;
-
-    char *tmp = reinterpret_cast<char *>(
-        malloc(sizeof(char) * value.size() + 1));
-    memcpy(tmp, value.c_str(), value.size() + 1);
-    tmp[value.size()] = '\0';
-
-    int i = NormalisePath::normalize_path_inplace(
-        reinterpret_cast<unsigned char *>(tmp),
-        value.size(), 1, &changed);
-
-    std::string ret("");
-    ret.assign(tmp, i);
-    free(tmp);
-
-    return ret;
 }
 
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity

src/actions/transformations/normalise_path_win.h

@@ -13,33 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_NORMALISE_PATH_WIN_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_NORMALISE_PATH_WIN_H_
 
+#include "transformation.h"
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-class Transaction;
-
-namespace actions {
-namespace transformations {
 
 class NormalisePathWin : public Transformation {
  public:
-    explicit NormalisePathWin(const std::string &action) 
+    using Transformation::Transformation;
-        : Transformation(action) { }
 
-    std::string evaluate(const std::string &exp,
+    bool transform(std::string &value, const Transaction *trans) const override;
-        Transaction *transaction) override;
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_NORMALISE_PATH_WIN_H_

src/actions/transformations/parity_even_7bit.cc

@@ -13,70 +13,15 @@
  *
  */
 
-#include "src/actions/transformations/parity_even_7bit.h"
+#include "parity_even_7bit.h"
-
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-#include <cstring>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
 
-std::string ParityEven7bit::evaluate(const std::string &value,
+bool ParityEven7bit::transform(std::string &value, const Transaction *trans) const {
-    Transaction *transaction) {
+    return ParityEven7bit::inplace<true>(value);
-    std::string ret;
-    unsigned char *input;
-
-    input = reinterpret_cast<unsigned char *>
-        (malloc(sizeof(char) * value.length()+1));
-
-    if (input == NULL) {
-        return "";
-    }
-
-    std::memcpy(input, value.c_str(), value.length()+1);
-
-    inplace(input, value.length());
-
-    ret.assign(reinterpret_cast<char *>(input), value.length());
-    free(input);
-
-    return ret;
-}
-
-bool ParityEven7bit::inplace(unsigned char *input, uint64_t input_len) {
-    uint64_t i;
-
-    i = 0;
-    while (i < input_len) {
-        unsigned int x = input[i];
-
-        input[i] ^= input[i] >> 4;
-        input[i] &= 0xf;
-
-        if ((0x6996 >> input[i]) & 1) {
-            input[i] = x | 0x80;
-        } else {
-            input[i] = x & 0x7f;
-        }
-        i++;
-    }
-
-    return true;
 }
 
 
-
+}  // namespace modsecurity::actions::transformations
-}  // namespace transformations
-}  // namespace actions
-}  // namespace modsecurity

src/actions/transformations/parity_even_7bit.h

@@ -13,33 +13,42 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_PARITY_EVEN_7BIT_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_PARITY_EVEN_7BIT_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class ParityEven7bit : public Transformation {
  public:
-    explicit ParityEven7bit(const std::string &action)  : Transformation(action) { }
+    using Transformation::Transformation;
 
-    std::string evaluate(const std::string &exp, Transaction *transaction) override;
+    bool transform(std::string &value, const Transaction *trans) const override;
-    static bool inplace(unsigned char *input, uint64_t input_len);
+
+    template<bool even>
+    static bool inplace(std::string &value) {
+        if (value.empty()) return false;
+
+        for(auto &c : value) {
+            auto &uc = reinterpret_cast<unsigned char&>(c);
+            unsigned int x = uc;
+
+            uc ^= uc >> 4;
+            uc &= 0xf;
+
+            const bool condition = (0x6996 >> uc) & 1;
+            if (even ? condition : !condition) {
+                uc = x | 0x80;
+            } else {
+                uc = x & 0x7f;
+            }
+        }
+
+        return true;
+    }
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_PARITY_EVEN_7BIT_H_

src/actions/transformations/parity_odd_7bit.cc

@@ -13,69 +13,16 @@
  *
  */
 
-#include "src/actions/transformations/parity_odd_7bit.h"
+#include "parity_odd_7bit.h"
-
+#include "parity_even_7bit.h"
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-#include <cstring>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
 
-std::string ParityOdd7bit::evaluate(const std::string &value,
+bool ParityOdd7bit::transform(std::string &value, const Transaction *trans) const {
-    Transaction *transaction) {
+    return ParityEven7bit::inplace<false>(value);
-    std::string ret;
-    unsigned char *input;
-
-    input = reinterpret_cast<unsigned char *>
-        (malloc(sizeof(char) * value.length()+1));
-
-    if (input == NULL) {
-        return "";
-    }
-
-    memcpy(input, value.c_str(), value.length()+1);
-
-    inplace(input, value.length());
-
-    ret.assign(reinterpret_cast<char *>(input), value.length());
-    free(input);
-
-    return ret;
-}
-
-bool ParityOdd7bit::inplace(unsigned char *input, uint64_t input_len) {
-    uint64_t i;
-
-    i = 0;
-    while (i < input_len) {
-        unsigned int x = input[i];
-
-        input[i] ^= input[i] >> 4;
-        input[i] &= 0xf;
-
-        if ((0x6996 >> input[i]) & 1) {
-            input[i] = x & 0x7f;
-        } else {
-            input[i] = x | 0x80;
-        }
-        i++;
-    }
-
-    return true;
 }
 
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity

src/actions/transformations/parity_odd_7bit.h

@@ -13,33 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_PARITY_ODD_7BIT_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_PARITY_ODD_7BIT_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class ParityOdd7bit : public Transformation {
  public:
-    explicit ParityOdd7bit(const std::string &action)  : Transformation(action) { }
+    using Transformation::Transformation;
 
-    std::string evaluate(const std::string &exp, Transaction *transaction) override;
+    bool transform(std::string &value, const Transaction *trans) const override;
-    static bool inplace(unsigned char *input, uint64_t input_len);
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_PARITY_ODD_7BIT_H_

src/actions/transformations/parity_zero_7bit.cc

@@ -13,61 +13,26 @@
  *
  */
 
-#include "src/actions/transformations/parity_zero_7bit.h"
+#include "parity_zero_7bit.h"
-
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-#include <cstring>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
 
-std::string ParityZero7bit::evaluate(const std::string &value,
+static inline bool inplace(std::string &value) {
-    Transaction *transaction) {
+    if (value.empty()) return false;
-    std::string ret;
-    unsigned char *input;
 
-    input = reinterpret_cast<unsigned char *>
+    for(auto &c : value) {
-        (malloc(sizeof(char) * value.length()+1));
+        ((unsigned char&)c) &= 0x7f;
-
-    if (input == NULL) {
-        return "";
-    }
-
-    memcpy(input, value.c_str(), value.length()+1);
-
-    inplace(input, value.length());
-
-    ret.assign(reinterpret_cast<char *>(input), value.length());
-    free(input);
-
-    return ret;
-}
-
-
-bool ParityZero7bit::inplace(unsigned char *input, uint64_t input_len) {
-    uint64_t i;
-
-    i = 0;
-    while (i < input_len) {
-        input[i] &= 0x7f;
-        i++;
     }
 
     return true;
 }
 
 
-}  // namespace transformations
+bool ParityZero7bit::transform(std::string &value, const Transaction *trans) const {
-}  // namespace actions
+    return inplace(value);
-}  // namespace modsecurity
+}
+
+
+}  // namespace modsecurity::actions::transformations

src/actions/transformations/parity_zero_7bit.h

@@ -13,33 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_PARITY_ZERO_7BIT_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_PARITY_ZERO_7BIT_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class ParityZero7bit : public Transformation {
  public:
-    explicit ParityZero7bit(const std::string &action)  : Transformation(action) { }
+    using Transformation::Transformation;
 
-    std::string evaluate(const std::string &exp, Transaction *transaction) override;
+    bool transform(std::string &value, const Transaction *trans) const override;
-    static bool inplace(unsigned char *input, uint64_t input_len);
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_PARITY_ZERO_7BIT_H_

src/actions/transformations/remove_comments.cc

@@ -13,61 +13,40 @@
  *
  */
 
-#include "src/actions/transformations/remove_comments.h"
+#include "remove_comments.h"
-
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-#include <cstring>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
 
-std::string RemoveComments::evaluate(const std::string &value,
+static inline int inplace(std::string &value) {
-    Transaction *transaction) {
+    auto input = reinterpret_cast<unsigned char*>(value.data());
-    std::string ret;
+    const auto input_len = value.length();
-    unsigned char *input;
+    bool changed = false, incomment = false;
+    std::string::size_type i = 0, j = 0;
 
-    input = reinterpret_cast<unsigned char *>
-        (malloc(sizeof(char) * value.length()+1));
-
-    if (input == NULL) {
-        return "";
-    }
-
-    memcpy(input, value.c_str(), value.length()+1);
-
-    uint64_t input_len = value.size();
-    uint64_t i, j, incomment;
-
-    i = j = incomment = 0;
     while (i < input_len) {
-        if (incomment == 0) {
+        if (!incomment) {
             if ((input[i] == '/') && (i + 1 < input_len)
                 && (input[i + 1] == '*')) {
-                incomment = 1;
+                incomment = true;
+                changed = true;
                 i += 2;
             } else if ((input[i] == '<') && (i + 1 < input_len)
                 && (input[i + 1] == '!') && (i + 2 < input_len)
                 && (input[i+2] == '-') && (i + 3 < input_len)
                 && (input[i + 3] == '-')) {
-                incomment = 1;
+                incomment = true;
+                changed = true;
                 i += 4;
             } else if ((input[i] == '-') && (i + 1 < input_len)
                 && (input[i + 1] == '-')) {
                 input[i] = ' ';
+                changed = true;
                 break;
             } else if (input[i] == '#') {
                 input[i] = ' ';
+                changed = true;
                 break;
             } else {
                 input[j] = input[i];
@@ -77,7 +56,7 @@ std::string RemoveComments::evaluate(const std::string &value,
         } else {
             if ((input[i] == '*') && (i + 1 < input_len)
                 && (input[i + 1] == '/')) {
-                incomment = 0;
+                incomment = false;
                 i += 2;
                 input[j] = input[i];
                 i++;
@@ -85,7 +64,7 @@ std::string RemoveComments::evaluate(const std::string &value,
             } else if ((input[i] == '-') && (i + 1 < input_len)
                 && (input[i + 1] == '-') && (i + 2 < input_len)
                 && (input[i+2] == '>'))   {
-                incomment = 0;
+                incomment = false;
                 i += 3;
                 input[j] = input[i];
                 i++;
@@ -100,13 +79,14 @@ std::string RemoveComments::evaluate(const std::string &value,
         input[j++] = ' ';
     }
 
-    ret.assign(reinterpret_cast<char *>(input), j);
+    value.resize(j);
-    free(input);
+    return changed;
-
-    return ret;
 }
 
 
-}  // namespace transformations
+bool RemoveComments::transform(std::string &value, const Transaction *trans) const {
-}  // namespace actions
+    return inplace(value);
-}  // namespace modsecurity
+}
+
+
+}  // namespace modsecurity::actions::transformations

src/actions/transformations/remove_comments.h

@@ -13,35 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_REMOVE_COMMENTS_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_REMOVE_COMMENTS_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
-
-namespace actions {
-namespace transformations {
 
+namespace modsecurity::actions::transformations {
 
 class RemoveComments : public Transformation {
  public:
-    explicit RemoveComments(const std::string &action)  : Transformation(action) { }
+    using Transformation::Transformation;
 
-    std::string evaluate(const std::string &exp,
+    bool transform(std::string &value, const Transaction *trans) const override;
-        Transaction *transaction) override;
 };
 
-
+}  // namespace modsecurity::actions::transformations
-}  // namespace transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_REMOVE_COMMENTS_H_

src/actions/transformations/remove_comments_char.cc

@@ -13,62 +13,51 @@
  *
  */
 
-#include "src/actions/transformations/remove_comments_char.h"
+#include "remove_comments_char.h"
-
-#include <string>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
-RemoveCommentsChar::RemoveCommentsChar(const std::string &action) 
-    : Transformation(action) {
-    this->action_kind = 1;
-}
 
-std::string RemoveCommentsChar::evaluate(const std::string &val,
+bool RemoveCommentsChar::transform(std::string &value, const Transaction *trans) const {
-    Transaction *transaction) {
+    char *d = value.data();
-    size_t i = 0;
+    const char *s = d;
-    std::string transformed_value;
+    const char *e = s + value.size();
-    transformed_value.reserve(val.size());
 
-    while (i < val.size()) {
+    while (s < e) {
-        if (val.at(i) == '/'
+        if (*s == '/'
-            && (i+1 < val.size()) && val.at(i+1) == '*') {
+            && (s+1 < e) && *(s+1) == '*') {
-            i += 2;
+            s += 2;
-        } else if (val.at(i) == '*'
+        } else if (*s == '*'
-            && (i+1 < val.size()) && val.at(i+1) == '/') {
+            && (s+1 < e) && *(s+1) == '/') {
-            i += 2;
+            s += 2;
-        } else if (val.at(i) == '<'
+        } else if (*s == '<'
-            && (i+1 < val.size())
+            && (s+1 < e)
-            && val.at(i+1) == '!'
+            && *(s+1) == '!'
-            && (i+2 < val.size())
+            && (s+2 < e)
-            && val.at(i+2) == '-'
+            && *(s+2) == '-'
-            && (i+3 < val.size())
+            && (s+3 < e)
-            && val.at(i+3) == '-') {
+            && *(s+3) == '-') {
-            i += 4;
+            s += 4;
-        } else if (val.at(i) == '-'
+        } else if (*s == '-'
-            && (i+1 < val.size()) && val.at(i+1) == '-'
+            && (s+1 < e) && *(s+1) == '-'
-            && (i+2 < val.size()) && val.at(i+2) == '>') {
+            && (s+2 < e) && *(s+2) == '>') {
-            i += 3;
+            s += 3;
-        } else if (val.at(i) == '-'
+        } else if (*s == '-'
-            && (i+1 < val.size()) && val.at(i+1) == '-') {
+            && (s+1 < e) && *(s+1) == '-') {
-            i += 2;
+            s += 2;
-        } else if (val.at(i) == '#') {
+        } else if (*s == '#') {
-            i += 1;
+            s += 1;
         } else {
-            transformed_value += val.at(i);
+            *d++ = *s++;
-            i++;
         }
     }
-    return transformed_value;
+
+    const auto changed = d != s;
+    const auto new_len = d - value.c_str();
+    value.resize(new_len);
+    return changed;
 }
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
 

src/actions/transformations/remove_comments_char.h

@@ -13,33 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_REMOVE_COMMENTS_CHAR_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_REMOVE_COMMENTS_CHAR_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class RemoveCommentsChar : public Transformation {
  public:
-    explicit RemoveCommentsChar(const std::string &action);
+    using Transformation::Transformation;
 
-    std::string evaluate(const std::string &exp,
+    bool transform(std::string &value, const Transaction *trans) const override;
-        Transaction *transaction) override;
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_REMOVE_COMMENTS_CHAR_H_

src/actions/transformations/remove_nulls.cc

@@ -13,40 +13,15 @@
  *
  */
 
-#include "src/actions/transformations/remove_nulls.h"
+#include "remove_nulls.h"
-
-#include <string.h>
-
-#include <string>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
 
-std::string RemoveNulls::evaluate(const std::string &val,
+bool RemoveNulls::transform(std::string &value, const Transaction *trans) const {
-    Transaction *transaction) {
+    return remove_if(value, [](const auto c) { return c == '\0'; });
-    size_t i = 0;
-    std::string transformed_value;
-    transformed_value.reserve(val.size());
-
-    while (i < val.size()) {
-        if (val.at(i) == '\0') {
-            // do nothing; continue on to next char in original val
-        } else {
-            transformed_value += val.at(i);
-        }
-        i++;
-    }
-
-    return transformed_value;
 }
 
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity

src/actions/transformations/remove_nulls.h

@@ -13,34 +13,34 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_REMOVE_NULLS_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_REMOVE_NULLS_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+#include <algorithm>
-namespace transformations {
+
+namespace modsecurity::actions::transformations {
 
 class RemoveNulls : public Transformation {
  public:
-    explicit RemoveNulls(const std::string &action) 
+    using Transformation::Transformation;
-        : Transformation(action) { }
 
-    std::string evaluate(const std::string &exp,
+    bool transform(std::string &value, const Transaction *trans) const override;
-        Transaction *transaction) override;
+
+    template<typename Pred>
+    static bool remove_if(std::string &val, Pred pred) {
+        const auto old_size = val.size();
+
+        val.erase(
+            std::remove_if(
+                val.begin(), val.end(), pred),
+            val.end());
+
+        return val.size() != old_size;
+    }
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_REMOVE_NULLS_H_

src/actions/transformations/remove_whitespace.cc

@@ -13,49 +13,27 @@
  *
  */
 
-#include "src/actions/transformations/remove_whitespace.h"
+#include "remove_whitespace.h"
 
-#include <string>
+#include "remove_nulls.h"
 
-#include "modsecurity/transaction.h"
+namespace modsecurity::actions::transformations {
-#include "src/actions/transformations/transformation.h"
 
 
-namespace modsecurity {
+bool RemoveWhitespace::transform(std::string &value, const Transaction *trans) const {
-namespace actions {
-namespace transformations {
-
-RemoveWhitespace::RemoveWhitespace(const std::string &action) 
-    : Transformation(action) {
-    this->action_kind = 1;
-}
-
-std::string RemoveWhitespace::evaluate(const std::string &val,
-    Transaction *transaction) {
-    std::string transformed_value;
-    transformed_value.reserve(val.size());
-
-    size_t i = 0;
     const char nonBreakingSpaces = 0xa0;
     const char nonBreakingSpaces2 = 0xc2;
 
-    // loop through all the chars
+    auto pred = [](const auto c) {
-    while (i < val.size()) {
         // remove whitespaces and non breaking spaces (NBSP)
-        if (std::isspace(static_cast<unsigned char>(val[i]))
+        return std::isspace(static_cast<unsigned char>(c))
-            || (val[i] == nonBreakingSpaces)
+            || c == nonBreakingSpaces
-            || val[i] == nonBreakingSpaces2) {
+            || c == nonBreakingSpaces2;
-            // don't copy; continue on to next char in original val
+    };
-        } else {
-            transformed_value += val.at(i);
-        }
-        i++;
-    }
 
-    return transformed_value;
+    return RemoveNulls::remove_if(value, pred);
 }
 
-}  // namespace transformations
+
-}  // namespace actions
+}  // namespace modsecurity::actions::transformations
-}  // namespace modsecurity
 

src/actions/transformations/remove_whitespace.h

@@ -13,33 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_REMOVE_WHITESPACE_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_REMOVE_WHITESPACE_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class RemoveWhitespace : public Transformation {
  public:
-    explicit RemoveWhitespace(const std::string &action);
+    using Transformation::Transformation;
 
-    std::string evaluate(const std::string &exp,
+    bool transform(std::string &value, const Transaction *trans) const override;
-        Transaction *transaction) override;
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_REMOVE_WHITESPACE_H_

src/actions/transformations/replace_comments.cc

@@ -13,54 +13,34 @@
  *
  */
 
-#include "src/actions/transformations/replace_comments.h"
+#include "replace_comments.h"
-
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <functional>
-#include <cctype>
-#include <locale>
-#include <cstring>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
-ReplaceComments::ReplaceComments(const std::string &action) 
-    : Transformation(action) {
-    this->action_kind = 1;
-}
 
-std::string ReplaceComments::evaluate(const std::string &value,
+static inline bool inplace(std::string &value) {
-    Transaction *transaction) {
+    auto input = reinterpret_cast<unsigned char*>(value.data());
-    uint64_t i, j, incomment;
+    const auto input_len = value.length();
+    bool changed = false, incomment = false;
+    std::string::size_type i = 0, j = 0;
 
-    char *input = reinterpret_cast<char *>(
+    while (i < input_len) {
-        malloc(sizeof(char) * value.size() + 1));
+        if (!incomment) {
-    memcpy(input, value.c_str(), value.size() + 1);
+            if ((input[i] == '/') && (i + 1 < input_len)
-    input[value.size()] = '\0';
-
-    i = j = incomment = 0;
-    while (i < value.size()) {
-        if (incomment == 0) {
-            if ((input[i] == '/') && (i + 1 < value.size())
                 && (input[i + 1] == '*')) {
-                incomment = 1;
+                incomment = true;
                 i += 2;
+                changed = true;
             } else {
                 input[j] = input[i];
                 i++;
                 j++;
             }
         } else {
-            if ((input[i] == '*') && (i + 1 < value.size())
+            if ((input[i] == '*') && (i + 1 < input_len)
                 && (input[i + 1] == '/')) {
-                incomment = 0;
+                incomment = false;
                 i += 2;
                 input[j] = ' ';
                 j++;
@@ -74,15 +54,14 @@ std::string ReplaceComments::evaluate(const std::string &value,
         input[j++] = ' ';
     }
 
-
+    value.resize(j);
-    std::string resp;
+    return changed;
-    resp.append(reinterpret_cast<char *>(input), j);
-
-    free(input);
-
-    return resp;
 }
 
-}  // namespace transformations
+
-}  // namespace actions
+bool ReplaceComments::transform(std::string &value, const Transaction *trans) const {
-}  // namespace modsecurity
+    return inplace(value);
+}
+
+
+}  // namespace modsecurity::actions::transformations

src/actions/transformations/replace_comments.h

@@ -13,34 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_REPLACE_COMMENTS_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_REPLACE_COMMENTS_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class ReplaceComments : public Transformation {
  public:
+    using Transformation::Transformation;
 
-    explicit ReplaceComments(const std::string &action) ;
+    bool transform(std::string &value, const Transaction *trans) const override;
-
-    std::string evaluate(const std::string &exp,
-        Transaction *transaction) override;
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_REPLACE_COMMENTS_H_

src/actions/transformations/replace_nulls.cc

@@ -13,40 +13,23 @@
  *
  */
 
-#include "src/actions/transformations/replace_nulls.h"
+#include "replace_nulls.h"
-
-#include <string>
-
-#include "modsecurity/transaction.h"
-#include "src/actions/transformations/transformation.h"
 
 
-namespace modsecurity {
+namespace modsecurity::actions::transformations {
-namespace actions {
-namespace transformations {
 
-ReplaceNulls::ReplaceNulls(const std::string &action) 
-    : Transformation(action) {
-    this->action_kind = 1;
-}
 
-std::string ReplaceNulls::evaluate(const std::string &val,
+bool ReplaceNulls::transform(std::string &value, const Transaction *trans) const {
-    Transaction *transaction) {
+    bool changed = false;
-    int64_t i;
-    std::string value(val);
 
-    i = 0;
+    for(auto &c : value) {
-    while (i < value.size()) {
+        if (c == '\0') {
-        if (value.at(i) == '\0') {
+            c = ' ';
-            value[i] = ' ';
+            changed = true;
-        } else {
-            i++;
         }
     }
 
-    return value;
+    return changed;
 }
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity

src/actions/transformations/replace_nulls.h

@@ -13,34 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_REPLACE_NULLS_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_REPLACE_NULLS_H_
 
-#ifdef __cplusplus
+#include "transformation.h"
-namespace modsecurity {
-class Transaction;
 
-namespace actions {
+namespace modsecurity::actions::transformations {
-namespace transformations {
 
 class ReplaceNulls : public Transformation {
  public:
+    using Transformation::Transformation;
 
-    explicit ReplaceNulls(const std::string &action) ;
+    bool transform(std::string &value, const Transaction *trans) const override;
-
-    std::string evaluate(const std::string &exp,
-        Transaction *transaction) override;
 };
 
-}  // namespace transformations
+}  // namespace modsecurity::actions::transformations
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
 
 #endif  // SRC_ACTIONS_TRANSFORMATIONS_REPLACE_NULLS_H_