Fix log while displaying the name of a dict selection by regex

Felipe Zimmerle · Felipe Zimmerle · commit c4fcb36f4cdd · 2017-10-20T21:46:24.000-03:00
diff --git a/src/variables/args_get.h b/src/variables/args_get.h
@@ -61,7 +61,7 @@ class ArgsGet_NoDictElement : public Variable {
 class ArgsGet_DictElementRegexp : public Variable {
  public:
     explicit ArgsGet_DictElementRegexp(std::string dictElement)
-        : Variable("ARGS_GET"),
+        : Variable("ARGS_GET:regex(" + dictElement + ")"),
         m_r(dictElement) { }
 
     void evaluate(Transaction *transaction,
diff --git a/src/variables/args_get_names.h b/src/variables/args_get_names.h
@@ -60,7 +60,7 @@ class ArgsGetNames_NoDictElement : public Variable {
 class ArgsGetNames_DictElementRegexp : public Variable {
  public:
     explicit ArgsGetNames_DictElementRegexp(std::string dictElement)
-        : Variable("ARGS_GET_NAMES"),
+        : Variable("ARGS_GET_NAMES:regex(" + dictElement + ")"),
         m_r(dictElement) { }
 
     void evaluate(Transaction *transaction,
diff --git a/src/variables/args_names.h b/src/variables/args_names.h
@@ -60,7 +60,7 @@ class ArgsNames_NoDictElement : public Variable {
 class ArgsNames_DictElementRegexp : public Variable {
  public:
     explicit ArgsNames_DictElementRegexp(std::string dictElement)
-        : Variable("ARGS_NAMES"),
+        : Variable("ARGS_NAMES:regex(" + dictElement + ")"),
         m_r(dictElement) { }
 
     void evaluate(Transaction *transaction,
diff --git a/src/variables/args_post.h b/src/variables/args_post.h
@@ -61,7 +61,7 @@ class ArgsPost_NoDictElement : public Variable {
 class ArgsPost_DictElementRegexp : public Variable {
  public:
     explicit ArgsPost_DictElementRegexp(std::string dictElement)
-        : Variable("ARGS_POST"),
+        : Variable("ARGS_POST:regex(" + dictElement + ")"),
         m_r(dictElement) { }
 
     void evaluate(Transaction *transaction,
diff --git a/src/variables/args_post_names.h b/src/variables/args_post_names.h
@@ -60,7 +60,7 @@ class ArgsPostNames_NoDictElement : public Variable {
 class ArgsPostNames_DictElementRegexp : public Variable {
  public:
     explicit ArgsPostNames_DictElementRegexp(std::string dictElement)
-        : Variable("ARGS_POST_NAMES"),
+        : Variable("ARGS_POST_NAMES:regex(" + dictElement + ")"),
         m_r(dictElement) { }
 
     void evaluate(Transaction *transaction,
diff --git a/src/variables/files.h b/src/variables/files.h
@@ -62,7 +62,7 @@ class Files_NoDictElement : public Variable {
 class Files_DictElementRegexp : public Variable {
  public:
     explicit Files_DictElementRegexp(std::string dictElement)
-        : Variable("FILES"),
+        : Variable("FILES:regex(" + dictElement + ")"),
         m_r(dictElement) { }
 
     void evaluate(Transaction *transaction,
diff --git a/src/variables/files_names.h b/src/variables/files_names.h
@@ -62,7 +62,7 @@ class FilesNames_NoDictElement : public Variable {
 class FilesNames_DictElementRegexp : public Variable {
  public:
     explicit FilesNames_DictElementRegexp(std::string dictElement)
-        : Variable("FILES_NAMES"),
+        : Variable("FILES_NAMES:regex(" + dictElement + ")"),
         m_r(dictElement) { }
 
 
diff --git a/src/variables/files_tmp_content.h b/src/variables/files_tmp_content.h
@@ -62,7 +62,7 @@ class FilesTmpContent_NoDictElement : public Variable {
 class FilesTmpContent_DictElementRegexp : public Variable {
  public:
     explicit FilesTmpContent_DictElementRegexp(std::string dictElement)
-        : Variable("FILES_TMP_CONTENT"),
+        : Variable("FILES_TMP_CONTENT:regex(" + dictElement + ")"),
         m_r(dictElement) { }
 
     void evaluate(Transaction *transaction,
diff --git a/src/variables/files_tmp_names.h b/src/variables/files_tmp_names.h
@@ -61,7 +61,7 @@ class FilesTmpNames_NoDictElement : public Variable {
 class FilesTmpNames_DictElementRegexp : public Variable {
  public:
     explicit FilesTmpNames_DictElementRegexp(std::string dictElement)
-        : Variable("FILES_TMPNAMES"),
+        : Variable("FILES_TMPNAMES:regex(" + dictElement + ")"),
         m_r(dictElement) { }
 
     void evaluate(Transaction *transaction,
diff --git a/src/variables/geo.h b/src/variables/geo.h
@@ -62,7 +62,7 @@ class Geo_NoDictElement : public Variable {
 class Geo_DictElementRegexp : public Variable {
  public:
     explicit Geo_DictElementRegexp(std::string dictElement)
-        : Variable("GEO"),
+        : Variable("GEO:regex(" + dictElement + ")"),
         m_r(dictElement) { }
 
     void evaluate(Transaction *transaction,
diff --git a/src/variables/global.h b/src/variables/global.h
@@ -63,7 +63,7 @@ class Global_NoDictElement : public Variable {
 class Global_DictElementRegexp : public Variable {
  public:
     explicit Global_DictElementRegexp(std::string dictElement)
-        : Variable("GLOBAL"),
+        : Variable("GLOBAL:regex(" + dictElement + ")"),
         m_r(dictElement),
         m_dictElement("GLOBAL:" + dictElement) { }
 
diff --git a/src/variables/ip.h b/src/variables/ip.h
@@ -62,7 +62,7 @@ class Ip_NoDictElement : public Variable {
 class Ip_DictElementRegexp : public Variable {
  public:
     explicit Ip_DictElementRegexp(std::string dictElement)
-        : Variable("IP"),
+        : Variable("IP:regex(" + dictElement + ")"),
         m_r(dictElement),
         m_dictElement("IP:" + dictElement) { }
 
diff --git a/src/variables/matched_vars.h b/src/variables/matched_vars.h
@@ -62,7 +62,7 @@ class MatchedVars_NoDictElement : public Variable {
 class MatchedVars_DictElementRegexp : public Variable {
  public:
     explicit MatchedVars_DictElementRegexp(std::string dictElement)
-        : Variable("MATCHED_VARS"),
+        : Variable("MATCHED_VARS:regex(" + dictElement + ")"),
         m_r(dictElement) { }
 
     void evaluate(Transaction *transaction,
diff --git a/src/variables/matched_vars_names.h b/src/variables/matched_vars_names.h
@@ -62,7 +62,7 @@ class MatchedVarsNames_NoDictElement : public Variable {
 class MatchedVarsNames_DictElementRegexp : public Variable {
  public:
     explicit MatchedVarsNames_DictElementRegexp(std::string dictElement)
-        : Variable("MATCHED_VARS_NAMES"),
+        : Variable("MATCHED_VARS_NAMES:regex(" + dictElement + ")"),
         m_r(dictElement) { }
 
     void evaluate(Transaction *transaction,
diff --git a/src/variables/multipart_file_name.h b/src/variables/multipart_file_name.h
@@ -62,7 +62,7 @@ class MultiPartFileName_NoDictElement : public Variable {
 class MultiPartFileName_DictElementRegexp : public Variable {
  public:
     explicit MultiPartFileName_DictElementRegexp(std::string dictElement)
-        : Variable("MULTIPART_FILENAME"),
+        : Variable("MULTIPART_FILENAME:regex(" + dictElement + ")"),
         m_r(dictElement) { }
 
     void evaluate(Transaction *transaction,
diff --git a/src/variables/multipart_name.h b/src/variables/multipart_name.h
@@ -62,7 +62,7 @@ class MultiPartName_NoDictElement : public Variable {
 class MultiPartName_DictElementRegexp : public Variable {
  public:
     explicit MultiPartName_DictElementRegexp(std::string dictElement)
-        : Variable("MULTIPART_NAME"),
+        : Variable("MULTIPART_NAME:regex(" + dictElement + ")"),
         m_r(dictElement) { }
 
     void evaluate(Transaction *transaction,
diff --git a/src/variables/request_cookies.h b/src/variables/request_cookies.h
@@ -62,7 +62,7 @@ class RequestCookies_NoDictElement : public Variable {
 class RequestCookies_DictElementRegexp : public Variable {
  public:
     explicit RequestCookies_DictElementRegexp(std::string dictElement)
-        : Variable("REQUEST_COOKIES"),
+        : Variable("REQUEST_COOKIES:regex(" + dictElement + ")"),
         m_r(dictElement) { }
 
     void evaluate(Transaction *transaction,
diff --git a/src/variables/request_cookies_names.h b/src/variables/request_cookies_names.h
@@ -62,7 +62,7 @@ class RequestCookiesNames_NoDictElement : public Variable {
 class RequestCookiesNames_DictElementRegexp : public Variable {
  public:
     explicit RequestCookiesNames_DictElementRegexp(std::string dictElement)
-        : Variable("REQUEST_COOKIES_NAMES"),
+        : Variable("REQUEST_COOKIES_NAMES:regex(" + dictElement + ")"),
         m_r(dictElement) { }
 
     void evaluate(Transaction *transaction,
diff --git a/src/variables/request_headers_names.h b/src/variables/request_headers_names.h
@@ -60,7 +60,7 @@ class RequestHeadersNames_NoDictElement : public Variable {
 class RequestHeadersNames_DictElementRegexp : public Variable {
  public:
     explicit RequestHeadersNames_DictElementRegexp(std::string dictElement)
-        : Variable("REQUEST_HEADERS_NAMES"),
+        : Variable("REQUEST_HEADERS_NAMES:regex(" + dictElement + ")"),
         m_r(dictElement) { }
 
     void evaluate(Transaction *transaction,
