Add missing feature: t:uppercase transformation

src/Makefile.am

@@ -167,6 +167,7 @@ ACTIONS = \
 	actions/transformations/trim.cc \
 	actions/transformations/trim_left.cc \
 	actions/transformations/trim_right.cc \
+	actions/transformations/upper_case.cc \
 	actions/transformations/url_decode.cc \
 	actions/transformations/url_decode_uni.cc \
 	actions/transformations/url_encode.cc \

src/actions/transformations/transformation.cc

@@ -53,6 +53,7 @@
 #include "src/actions/transformations/trim.h"
 #include "src/actions/transformations/trim_left.h"
 #include "src/actions/transformations/trim_right.h"
+#include "src/actions/transformations/upper_case.h"
 #include "src/actions/transformations/url_decode.h"
 #include "src/actions/transformations/url_decode_uni.h"
 #include "src/actions/transformations/url_encode.h"
@@ -109,6 +110,7 @@ Transformation* Transformation::instantiate(std::string a) {
     IF_MATCH(trimLeft) { return new TrimLeft(a); }
     IF_MATCH(trimRight) { return new TrimRight(a); }
     IF_MATCH(trim) { return new Trim(a); }
+    IF_MATCH(uppercase) { return new UpperCase(a); }
     IF_MATCH(urlDecodeUni) { return new UrlDecodeUni(a); }
     IF_MATCH(urlDecode) { return new UrlDecode(a); }
     IF_MATCH(urlEncode) { return new UrlEncode(a); }

src/actions/transformations/upper_case.cc

@@ -0,0 +1,47 @@
+/*
+ * ModSecurity, http://www.modsecurity.org/
+ * Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/)
+ *
+ * You may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * If any of the files related to licensing are missing or if you have any
+ * other questions related to licensing please contact Trustwave Holdings, Inc.
+ * directly using the email address security@modsecurity.org.
+ *
+ */
+
+#include "src/actions/transformations/upper_case.h"
+
+#include <algorithm>
+#include <string>
+
+#include "modsecurity/transaction.h"
+#include "src/actions/transformations/transformation.h"
+#include "modsecurity/actions/action.h"
+
+namespace modsecurity {
+namespace actions {
+namespace transformations {
+
+
+UpperCase::UpperCase(std::string a)
+    : Transformation(a) {
+}
+
+std::string UpperCase::evaluate(std::string value,
+    Transaction *transaction) {
+    std::locale loc;
+
+    for (std::string::size_type i=0; i < value.length(); ++i) {
+        value[i] = std::toupper(value[i], loc);
+    }
+
+    return value;
+}
+
+}  // namespace transformations
+}  // namespace actions
+}  // namespace modsecurity

src/actions/transformations/upper_case.h

@@ -0,0 +1,46 @@
+/*
+ * ModSecurity, http://www.modsecurity.org/
+ * Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/)
+ *
+ * You may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * If any of the files related to licensing are missing or if you have any
+ * other questions related to licensing please contact Trustwave Holdings, Inc.
+ * directly using the email address security@modsecurity.org.
+ *
+ */
+
+#include <string>
+#include <unordered_map>
+
+#include "modsecurity/actions/action.h"
+#include "src/actions/transformations/transformation.h"
+
+#ifndef SRC_ACTIONS_TRANSFORMATIONS_UPPER_CASE_H_
+#define SRC_ACTIONS_TRANSFORMATIONS_UPPER_CASE_H_
+
+#ifdef __cplusplus
+
+namespace modsecurity {
+class Transaction;
+namespace actions {
+namespace transformations {
+
+
+class UpperCase : public Transformation {
+ public:
+    explicit UpperCase(std::string action);
+    std::string evaluate(std::string exp,
+        Transaction *transaction) override;
+};
+
+}  // namespace transformations
+}  // namespace actions
+}  // namespace modsecurity
+
+#endif
+
+#endif  // SRC_ACTIONS_TRANSFORMATIONS_UPPER_CASE_H_

src/parser/seclang-parser.yy

@@ -67,6 +67,7 @@ class Driver;
 #include "src/actions/transformations/none.h"
 #include "src/actions/transformations/url_decode.h"
 #include "src/actions/transformations/lower_case.h"
+#include "src/actions/transformations/upper_case.h"
 #include "src/actions/transformations/hex_decode.h"
 #include "src/actions/transformations/url_encode.h"
 #include "src/actions/transformations/js_decode.h"
@@ -519,6 +520,7 @@ using modsecurity::operators::Operator;
   ACTION_TRANSFORMATION_SHA1                   "ACTION_TRANSFORMATION_SHA1"
   ACTION_TRANSFORMATION_SQL_HEX_DECODE         "ACTION_TRANSFORMATION_SQL_HEX_DECODE"
   ACTION_TRANSFORMATION_TRIM                   "ACTION_TRANSFORMATION_TRIM"
+  ACTION_TRANSFORMATION_UPPERCASE              "ACTION_TRANSFORMATION_UPPERCASE"
   ACTION_TRANSFORMATION_URL_DECODE             "ACTION_TRANSFORMATION_URL_DECODE"
   ACTION_TRANSFORMATION_URL_DECODE_UNI         "ACTION_TRANSFORMATION_URL_DECODE_UNI"
   ACTION_TRANSFORMATION_UTF8_TO_UNICODE        "ACTION_TRANSFORMATION_UTF8_TO_UNICODE"
@@ -2278,6 +2280,10 @@ act:
       {
         ACTION_CONTAINER($$, new actions::transformations::LowerCase($1));
       }
+    | ACTION_TRANSFORMATION_UPPERCASE
+      {
+        ACTION_CONTAINER($$, new actions::transformations::UpperCase($1));
+      }
     | ACTION_TRANSFORMATION_URL_DECODE_UNI
       {
         ACTION_CONTAINER($$, new actions::transformations::UrlDecodeUni($1));

src/parser/seclang-scanner.ll

@@ -108,6 +108,7 @@ ACTION_TRANSFORMATION_REPLACE_NULLS             (?i:t:replaceNulls)
 ACTION_TRANSFORMATION_SHA1                      (?i:t:sha1)
 ACTION_TRANSFORMATION_SQL_HEX_DECODE            (?i:t:sqlHexDecode)
 ACTION_TRANSFORMATION_TRIM                      (?i:t:trim)
+ACTION_TRANSFORMATION_UPPERCASE                 (?i:t:uppercase)
 ACTION_TRANSFORMATION_URL_DECODE                (?i:t:urlDecode)
 ACTION_TRANSFORMATION_URL_DECODE_UNI            (?i:t:urlDecodeUni)
 ACTION_TRANSFORMATION_UTF8_TO_UNICODE           (?i:t:utf8toUnicode)
@@ -456,6 +457,7 @@ EQUALS_MINUS                            (?i:=\-)
 {ACTION_TRANSFORMATION_HEX_ENCODE}                                      { return p::make_ACTION_TRANSFORMATION_HEX_ENCODE(yytext, *driver.loc.back()); }
 {ACTION_TRANSFORMATION_HEX_DECODE}                                      { return p::make_ACTION_TRANSFORMATION_HEX_DECODE(yytext, *driver.loc.back()); }
 {ACTION_TRANSFORMATION_LOWERCASE}                                       { return p::make_ACTION_TRANSFORMATION_LOWERCASE(yytext, *driver.loc.back()); }
+{ACTION_TRANSFORMATION_UPPERCASE}                                       { return p::make_ACTION_TRANSFORMATION_UPPERCASE(yytext, *driver.loc.back()); }
 {ACTION_TRANSFORMATION_URL_DECODE_UNI}                                  { return p::make_ACTION_TRANSFORMATION_URL_DECODE_UNI(yytext, *driver.loc.back()); }
 {ACTION_TRANSFORMATION_URL_DECODE}                                      { return p::make_ACTION_TRANSFORMATION_URL_DECODE(yytext, *driver.loc.back()); }
 {ACTION_TRANSFORMATION_NONE}                                            { return p::make_ACTION_TRANSFORMATION_NONE(yytext, *driver.loc.back()); }