Renames class Assay to Transaction

src/actions/transformations/base64_decode.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -36,13 +36,13 @@ Base64Decode::Base64Decode(std::string action)
 }
 
 std::string Base64Decode::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     /**
      * @todo Implement the transformation base64decode
      */
-    if (assay) {
+    if (transaction) {
 #ifndef NO_LOGS
-        assay->debug(4, "Transformation 64 is not implemented yet.");
+        transaction->debug(4, "Transformation 64 is not implemented yet.");
 #endif
     }
     return value;

src/actions/transformations/base64_decode.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class Base64Decode : public Transformation {
  public:
     explicit Base64Decode(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/base64_decode_ext.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -36,13 +36,13 @@ Base64DecodeExt::Base64DecodeExt(std::string action)
 }
 
 std::string Base64DecodeExt::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     /**
      * @todo Implement the transformation Base64DecodeExt
      */
-    if (assay) {
+    if (transaction) {
 #ifndef NO_LOGS
-        assay->debug(4, "Transformation Base64DecodeExt is" \
+        transaction->debug(4, "Transformation Base64DecodeExt is" \
             " not implemented yet.");
 #endif
     }

src/actions/transformations/base64_decode_ext.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class Base64DecodeExt : public Transformation {
  public:
     explicit Base64DecodeExt(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/cmd_line.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -36,13 +36,13 @@ CmdLine::CmdLine(std::string action)
 }
 
 std::string CmdLine::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     /**
      * @todo Implement the transformation CmdLine
      */
-    if (assay) {
+    if (transaction) {
 #ifndef NO_LOGS
-        assay->debug(4, "Transformation CmdLine is not implemented yet.");
+        transaction->debug(4, "Transformation CmdLine is not implemented yet.");
 #endif
     }
     return value;

src/actions/transformations/cmd_line.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class CmdLine : public Transformation {
  public:
     explicit CmdLine(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/compress_whitespace.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -36,7 +36,7 @@ CompressWhitespace::CompressWhitespace(std::string action)
 }
 
 std::string CompressWhitespace::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
 
     std::string a;
     int inWhiteSpace = 0;

src/actions/transformations/compress_whitespace.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class CompressWhitespace : public Transformation {
  public:
     explicit CompressWhitespace(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/css_decode.cc

@@ -24,7 +24,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 #include "src/utils.h"
 
@@ -35,7 +35,7 @@ namespace transformations {
 
 
 std::string CssDecode::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
 
     char *tmp = reinterpret_cast<char *>(
         malloc(sizeof(char) * value.size() + 1));

src/actions/transformations/css_decode.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -34,7 +34,7 @@ class CssDecode : public Transformation {
     explicit CssDecode(std::string action)
         : Transformation(action) { }
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 

src/actions/transformations/escape_seq_decode.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 #include "src/utils.h"
 
@@ -140,7 +140,7 @@ int EscapeSeqDecode::ansi_c_sequences_decode_inplace(unsigned char *input,
 
 
 std::string EscapeSeqDecode::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
 
     unsigned char *tmp = (unsigned char *) malloc(sizeof(char)
         * value.size() + 1);

src/actions/transformations/escape_seq_decode.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class EscapeSeqDecode : public Transformation {
  public:
     explicit EscapeSeqDecode(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
     int ansi_c_sequences_decode_inplace(unsigned char *input, int input_len);
 };
 

src/actions/transformations/hex_decode.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -38,7 +38,7 @@ HexDecode::HexDecode(std::string action)
 
 
 std::string HexDecode::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     int len = value.length();
     std::string newString;
 

src/actions/transformations/hex_decode.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class HexDecode : public Transformation {
  public:
     explicit HexDecode(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/hex_encode.cc

@@ -23,7 +23,7 @@
 #include <locale>
 #include <iterator>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -37,7 +37,7 @@ HexEncode::HexEncode(std::string action)
 }
 
 std::string HexEncode::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
 
     std::stringstream result;
     for (std::size_t i=0; i < value.length(); i++) {

src/actions/transformations/hex_encode.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class HexEncode : public Transformation {
  public:
     explicit HexEncode(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/html_entity_decode.cc

@@ -24,7 +24,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 #include "src/utils.h"
 
@@ -35,7 +35,7 @@ namespace transformations {
 
 
 std::string HtmlEntityDecode::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
 
     if (HtmlEntityDecodeInstantCache::getInstance().count(value) > 0) {
         return HtmlEntityDecodeInstantCache::getInstance().at(value);

src/actions/transformations/html_entity_decode.h

@@ -24,7 +24,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -55,7 +55,7 @@ class HtmlEntityDecode : public Transformation {
         : Transformation(action) { }
 
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 

src/actions/transformations/js_decode.cc

@@ -24,7 +24,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 #include "src/utils.h"
 
@@ -35,7 +35,7 @@ namespace transformations {
 
 
 std::string JsDecode::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
 
     char *val = reinterpret_cast<char *>(
         malloc(sizeof(char) * value.size() + 1));

src/actions/transformations/js_decode.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -34,7 +34,7 @@ class JsDecode : public Transformation {
         : Transformation(action) { }
 
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/length.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -36,7 +36,7 @@ Length::Length(std::string action)
 }
 
 std::string Length::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
 
     return std::to_string(value.size());
 }

src/actions/transformations/length.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class Length : public Transformation {
  public:
     explicit Length(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/lower_case.cc

@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <string>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 #include "actions/action.h"
 
@@ -32,7 +32,7 @@ LowerCase::LowerCase(std::string a)
 }
 
 std::string LowerCase::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     std::locale loc;
 
     if (LowerCaseInstantCache::getInstance().count(value) > 0) {

src/actions/transformations/lower_case.h

@@ -25,7 +25,7 @@
 #ifdef __cplusplus
 
 namespace modsecurity {
-class Assay;
+class Transaction;
 namespace actions {
 namespace transformations {
 
@@ -52,7 +52,7 @@ class LowerCase : public Transformation {
  public:
     explicit LowerCase(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/md5.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -36,13 +36,13 @@ Md5::Md5(std::string action)
 }
 
 std::string Md5::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     /**
      * @todo Implement the transformation Md5
      */
-    if (assay) {
+    if (transaction) {
 #ifndef NO_LOGS
-        assay->debug(4, "Transformation Md5 is not implemented yet.");
+        transaction->debug(4, "Transformation Md5 is not implemented yet.");
 #endif
     }
     return value;

src/actions/transformations/md5.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -33,7 +33,7 @@ class Md5 : public Transformation {
     explicit Md5(std::string action);
     std::string
     evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/none.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -32,7 +32,7 @@ namespace transformations {
 
 
 std::string None::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     return value;
 }
 

src/actions/transformations/none.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -35,7 +35,7 @@ class None : public Transformation {
         { m_isNone = true; }
 
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/normalise_path.cc

@@ -24,7 +24,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 #include "src/utils.h"
 
@@ -39,7 +39,7 @@ NormalisePath::NormalisePath(std::string action)
 }
 
 std::string NormalisePath::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     int changed = 0;
 
     char *tmp = reinterpret_cast<char *>(

src/actions/transformations/normalise_path.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class NormalisePath : public Transformation {
  public:
     explicit NormalisePath(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/normalise_path_win.cc

@@ -24,7 +24,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 #include "src/utils.h"
 
@@ -35,7 +35,7 @@ namespace transformations {
 
 
 std::string NormalisePathWin::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     int changed;
 
     char *tmp = reinterpret_cast<char *>(

src/actions/transformations/normalise_path_win.h

@@ -23,7 +23,7 @@
 
 
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -34,7 +34,7 @@ class NormalisePathWin : public Transformation {
         : Transformation(action) { }
 
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/parity_even_7bit.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -36,13 +36,13 @@ ParityEven7bit::ParityEven7bit(std::string action)
 }
 
 std::string ParityEven7bit::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     /**
      * @todo Implement the transformation ParityEven7bit
      */
-    if (assay) {
+    if (transaction) {
 #ifndef NO_LOGS
-        assay->debug(4, "Transformation ParityEven7bit is not" \
+        transaction->debug(4, "Transformation ParityEven7bit is not" \
             " implemented yet.");
 #endif
     }

src/actions/transformations/parity_even_7bit.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class ParityEven7bit : public Transformation {
  public:
     explicit ParityEven7bit(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/parity_odd_7bit.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -36,13 +36,13 @@ ParityOdd7bit::ParityOdd7bit(std::string action)
 }
 
 std::string ParityOdd7bit::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     /**
      * @todo Implement the transformation ParityOdd7bit
      */
-    if (assay) {
+    if (transaction) {
 #ifndef NO_LOGS
-        assay->debug(4, "Transformation ParityOdd7bit is not " \
+        transaction->debug(4, "Transformation ParityOdd7bit is not " \
             "implemented yet.");
 #endif
     }

src/actions/transformations/parity_odd_7bit.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class ParityOdd7bit : public Transformation {
  public:
     explicit ParityOdd7bit(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/parity_zero_7bit.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -36,13 +36,13 @@ ParityZero7bit::ParityZero7bit(std::string action)
 }
 
 std::string ParityZero7bit::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     /**
      * @todo Implement the transformation ParityZero7bit
      */
-    if (assay) {
+    if (transaction) {
 #ifndef NO_LOGS
-        assay->debug(4, "Transformation ParityZero7bit is not" \
+        transaction->debug(4, "Transformation ParityZero7bit is not" \
             "implemented yet.");
 #endif
     }

src/actions/transformations/parity_zero_7bit.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class ParityZero7bit : public Transformation {
  public:
     explicit ParityZero7bit(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/remove_comments.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -36,13 +36,13 @@ RemoveComments::RemoveComments(std::string action)
 }
 
 std::string RemoveComments::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     /**
      * @todo Implement the transformation RemoveComments
      */
-    if (assay) {
+    if (transaction) {
 #ifndef NO_LOGS
-        assay->debug(4, "Transformation RemoveComments is not " \
+        transaction->debug(4, "Transformation RemoveComments is not " \
             "implemented yet.");
 #endif
     }

src/actions/transformations/remove_comments.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class RemoveComments : public Transformation {
  public:
     explicit RemoveComments(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/remove_comments_char.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -36,13 +36,13 @@ RemoveCommentsChar::RemoveCommentsChar(std::string action)
 }
 
 std::string RemoveCommentsChar::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     /**
      * @todo Implement the transformation RemoveCommentsChar
      */
-    if (assay) {
+    if (transaction) {
 #ifndef NO_LOGS
-        assay->debug(4, "Transformation RemoveCommentsChar " \
+        transaction->debug(4, "Transformation RemoveCommentsChar " \
             "is not implemented yet.");
 #endif
     }

src/actions/transformations/remove_comments_char.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class RemoveCommentsChar : public Transformation {
  public:
     explicit RemoveCommentsChar(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/remove_nulls.cc

@@ -24,7 +24,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 #include "src/utils.h"
 
@@ -34,7 +34,7 @@ namespace transformations {
 
 
 std::string RemoveNulls::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     int64_t i;
 
     i = 0;

src/actions/transformations/remove_nulls.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -34,7 +34,7 @@ class RemoveNulls : public Transformation {
         : Transformation(action) { }
 
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/remove_whitespace.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -36,13 +36,13 @@ RemoveWhitespace::RemoveWhitespace(std::string action)
 }
 
 std::string RemoveWhitespace::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     /**
      * @todo Implement the transformation RemoveWhitespace
      */
-    if (assay) {
+    if (transaction) {
 #ifndef NO_LOGS
-        assay->debug(4, "Transformation RemoveWhitespace is " \
+        transaction->debug(4, "Transformation RemoveWhitespace is " \
             "not implemented yet.");
 #endif
     }

src/actions/transformations/remove_whitespace.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class RemoveWhitespace : public Transformation {
  public:
     explicit RemoveWhitespace(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/replace_comments.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 #include "src/utils.h"
 
@@ -37,7 +37,7 @@ ReplaceComments::ReplaceComments(std::string action)
 }
 
 std::string ReplaceComments::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     uint64_t i, j, incomment;
 
     char *input = reinterpret_cast<char *>(

src/actions/transformations/replace_comments.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class ReplaceComments : public Transformation {
  public:
     explicit ReplaceComments(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/replace_nulls.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -36,7 +36,7 @@ ReplaceNulls::ReplaceNulls(std::string action)
 }
 
 std::string ReplaceNulls::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     int64_t i;
 
     i = 0;

src/actions/transformations/replace_nulls.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class ReplaceNulls : public Transformation {
  public:
     explicit ReplaceNulls(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/sha1.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 #include "utils/sha1.h"
 #include "src/utils.h"
@@ -38,7 +38,7 @@ Sha1::Sha1(std::string action)
 }
 
 std::string Sha1::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
 
     Utils::SHA1 sha1;
     sha1.update(&value);

src/actions/transformations/sha1.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class Sha1 : public Transformation {
  public:
     explicit Sha1(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/sql_hex_decode.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -36,13 +36,14 @@ SqlHexDecode::SqlHexDecode(std::string action)
 }
 
 std::string SqlHexDecode::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     /**
      * @todo Implement the transformation SqlHexDecode
      */
-    if (assay) {
+    if (transaction) {
 #ifndef NO_LOGS
-        assay->debug(4, "Transformation SqlHexDecode is not implemented yet.");
+        transaction->debug(4, "Transformation SqlHexDecode " \
+            "is not implemented yet.");
 #endif
     }
     return value;

src/actions/transformations/sql_hex_decode.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -33,7 +33,7 @@ class SqlHexDecode : public Transformation {
     explicit SqlHexDecode(std::string action);
     std::string
     evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/transformation.cc

@@ -20,7 +20,7 @@
 #include <iostream>
 #include <string>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/action.h"
 #include "actions/transformations/base64_decode_ext.h"
 #include "actions/transformations/base64_decode.h"
@@ -67,7 +67,7 @@ namespace transformations {
 
 
 std::string Transformation::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     return value;
 }
 

src/actions/transformations/transformation.h

@@ -23,7 +23,7 @@
 #ifdef __cplusplus
 
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -39,7 +39,7 @@ class Transformation : public Action {
     static Transformation* instantiate(std::string);
 
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/trim.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 #include "actions/action.h"
 
@@ -58,7 +58,7 @@ Trim::Trim(std::string action)
 
 std::string
 Trim::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     return *this->trim(&value);
 }
 

src/actions/transformations/trim.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class Trim : public Transformation {
  public:
     explicit Trim(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 
     std::string *ltrim(std::string *s);
     std::string *rtrim(std::string *s);

src/actions/transformations/trim_left.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 #include "actions/transformations/trim.h"
 #include "actions/action.h"
@@ -39,7 +39,7 @@ TrimLeft::TrimLeft(std::string action)
 }
 
 std::string TrimLeft::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     return *ltrim(&value);
 }
 

src/actions/transformations/trim_left.h

@@ -24,7 +24,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -33,7 +33,7 @@ class TrimLeft : public Trim {
  public:
     explicit TrimLeft(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/trim_right.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 #include "actions/action.h"
 
@@ -37,7 +37,7 @@ TrimRight::TrimRight(std::string action)
 }
 
 std::string TrimRight::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     return *this->rtrim(&value);
 }
 

src/actions/transformations/trim_right.h

@@ -24,7 +24,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -33,7 +33,7 @@ class TrimRight : public Trim {
  public:
     explicit TrimRight(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/url_decode.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 #include "src/utils.h"
 
@@ -95,7 +95,7 @@ UrlDecode::UrlDecode(std::string action)
 }
 
 std::string UrlDecode::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     unsigned char *val = NULL;
     int invalid_count;
     int changed;

src/actions/transformations/url_decode.h

@@ -24,7 +24,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -52,7 +52,7 @@ class UrlDecode : public Transformation {
  public:
     explicit UrlDecode(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 
     int urldecode_nonstrict_inplace(unsigned char *input, uint64_t input_len,
         int *invalid_count, int *changed);

src/actions/transformations/url_decode_uni.cc

@@ -24,7 +24,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 #include "src/utils.h"
 
@@ -35,10 +35,10 @@ namespace transformations {
 
 
 std::string UrlDecodeUni::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     int changed = 0;
     char *tmp = strdup(value.c_str());
-    urldecode_uni_nonstrict_inplace_ex(assay, (unsigned char *)tmp,
+    urldecode_uni_nonstrict_inplace_ex(transaction, (unsigned char *)tmp,
         value.size(), &changed);
     std::string ret("");
     ret.assign(tmp);

src/actions/transformations/url_decode_uni.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -34,7 +34,7 @@ class UrlDecodeUni : public Transformation {
         : Transformation(action) { }
 
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations

src/actions/transformations/url_encode.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 #include "src/utils.h"
 
@@ -88,7 +88,7 @@ std::string UrlEncode::url_enc(const char *input,
 
 
 std::string UrlEncode::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     int changed;
 
     std::string ret = url_enc(value.c_str(), value.size(), &changed);

src/actions/transformations/url_encode.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class UrlEncode : public Transformation {
  public:
     explicit UrlEncode(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 
     std::string url_enc(const char *input,
         unsigned int input_len, int *changed);

src/actions/transformations/utf8_to_unicode.cc

@@ -22,7 +22,7 @@
 #include <cctype>
 #include <locale>
 
-#include "modsecurity/assay.h"
+#include "modsecurity/transaction.h"
 #include "actions/transformations/transformation.h"
 
 
@@ -36,13 +36,14 @@ Utf8Unicode::Utf8Unicode(std::string action)
 }
 
 std::string Utf8Unicode::evaluate(std::string value,
-    Assay *assay) {
+    Transaction *transaction) {
     /**
      * @todo Implement the transformation Utf8Unicode
      */
-    if (assay) {
+    if (transaction) {
 #ifndef NO_LOGS
-        assay->debug(4, "Transformation Utf8Unicode is not implemented yet.");
+        transaction->debug(4, "Transformation Utf8Unicode is " \
+            "not implemented yet.");
 #endif
     }
     return value;

src/actions/transformations/utf8_to_unicode.h

@@ -23,7 +23,7 @@
 
 #ifdef __cplusplus
 namespace modsecurity {
-class Assay;
+class Transaction;
 
 namespace actions {
 namespace transformations {
@@ -32,7 +32,7 @@ class Utf8Unicode : public Transformation {
  public:
     explicit Utf8Unicode(std::string action);
     std::string evaluate(std::string exp,
-        Assay *assay) override;
+        Transaction *transaction) override;
 };
 
 }  // namespace transformations