Adds support for multipart vars on the parser

Author: Felipe Zimmerle

headers/modsecurity/transaction.h

@@ -108,15 +108,22 @@ class TransactionAnchoredVariables {
         m_variableInboundDataError(t, "INBOUND_DATA_ERROR"),
         m_variableMatchedVar(t, "MATCHED_VAR"),
         m_variableMatchedVarName(t, "MATCHED_VAR_NAME"),
+        m_variableMultipartBoundaryQuoted(t, "MULTIPART_BOUNDARY_QUOTED"),
+        m_variableMultipartBoundaryWhiteSpace(t,
+            "MULTIPART_BOUNDARY_WHITESPACE"),
         m_variableMultipartCrlfLFLines(t, "MULTIPART_CRLF_LF_LINES"),
         m_variableMultipartDataAfter(t, "MULTIPART_DATA_AFTER"),
+        m_variableMultipartDataBefore(t, "MULTIPART_DATA_BEFORE"),
         m_variableMultipartFileLimitExceeded(t,
             "MULTIPART_FILE_LIMIT_EXCEEDED"),
-        m_variableMultipartStrictError(t, "MULTIPART_STRICT_ERROR"),
         m_variableMultipartHeaderFolding(t, "MULTIPART_HEADER_FOLDING"),
-        m_variableMultipartInvalidQuoting(t, "MULTIPART_INVALID_QUOTING"),
         m_variableMultipartInvalidHeaderFolding(t,
             "MULTIPART_INVALID_HEADER_FOLDING"),
+        m_variableMultipartInvalidPart(t, "MULTIPART_INVALID_PART"),
+        m_variableMultipartInvalidQuoting(t, "MULTIPART_INVALID_QUOTING"),
+        m_variableMultipartLFLine(t, "MULTIPART_LF_LINE"),
+        m_variableMultipartMissingSemicolon(t, "MULTIPART_MISSING_SEMICOLON"),
+        m_variableMultipartStrictError(t, "MULTIPART_STRICT_ERROR"),
         m_variableMultipartUnmatchedBoundary(t,
             "MULTIPART_UNMATCHED_BOUNDARY"),
         m_variableOutboundDataError(t, "OUTBOUND_DATA_ERROR"),
@@ -157,8 +164,8 @@ class TransactionAnchoredVariables {
         m_variableFilesSizes(t, "FILES_SIZES"),
         m_variableFilesNames(t, "FILES_NAMES"),
         m_variableFilesTmpContent(t, "FILES_TMP_CONTENT"),
-        m_variableMultiPartFileName(t, "MULTIPART_FILENAME"),
-        m_variableMultiPartName(t, "MULTIPART_NAME"),
+        m_variableMultipartFileName(t, "MULTIPART_FILENAME"),
+        m_variableMultipartName(t, "MULTIPART_NAME"),
         m_variableMatchedVarsNames(t, "MATCHED_VARS_NAMES"),
         m_variableMatchedVars(t, "MATCHED_VARS"),
         m_variableFiles(t, "FILES"),
@@ -186,13 +193,19 @@ class TransactionAnchoredVariables {
     AnchoredVariable m_variableInboundDataError;
     AnchoredVariable m_variableMatchedVar;
     AnchoredVariable m_variableMatchedVarName;
+    AnchoredVariable m_variableMultipartBoundaryQuoted;
+    AnchoredVariable m_variableMultipartBoundaryWhiteSpace;
     AnchoredVariable m_variableMultipartCrlfLFLines;
     AnchoredVariable m_variableMultipartDataAfter;
+    AnchoredVariable m_variableMultipartDataBefore;
     AnchoredVariable m_variableMultipartFileLimitExceeded;
-    AnchoredVariable m_variableMultipartStrictError;
     AnchoredVariable m_variableMultipartHeaderFolding;
-    AnchoredVariable m_variableMultipartInvalidQuoting;
     AnchoredVariable m_variableMultipartInvalidHeaderFolding;
+    AnchoredVariable m_variableMultipartInvalidPart;
+    AnchoredVariable m_variableMultipartInvalidQuoting;
+    AnchoredVariable m_variableMultipartLFLine;
+    AnchoredVariable m_variableMultipartMissingSemicolon;
+    AnchoredVariable m_variableMultipartStrictError;
     AnchoredVariable m_variableMultipartUnmatchedBoundary;
     AnchoredVariable m_variableOutboundDataError;
     AnchoredVariable m_variablePathInfo;
@@ -233,8 +246,8 @@ class TransactionAnchoredVariables {
     AnchoredSetVariable m_variableFilesSizes;
     AnchoredSetVariable m_variableFilesNames;
     AnchoredSetVariable m_variableFilesTmpContent;
-    AnchoredSetVariable m_variableMultiPartFileName;
-    AnchoredSetVariable m_variableMultiPartName;
+    AnchoredSetVariable m_variableMultipartFileName;
+    AnchoredSetVariable m_variableMultipartName;
     AnchoredSetVariable m_variableMatchedVarsNames;
     AnchoredSetVariable m_variableMatchedVars;
     AnchoredSetVariable m_variableFiles;

src/macro_expansion.cc

@@ -270,10 +270,10 @@ std::string MacroExpansion::expand(const std::string& input,
                 variableValue = transaction->m_variableFilesTmpContent.resolveFirst(var);
             }
             else if (compareStrNoCase(col, "MULTIPART_FILENAME")) {
-                variableValue = transaction->m_variableMultiPartFileName.resolveFirst(var);
+                variableValue = transaction->m_variableMultipartFileName.resolveFirst(var);
             }
             else if (compareStrNoCase(col, "MULTIPART_NAME")) {
-                variableValue = transaction->m_variableMultiPartName.resolveFirst(var);
+                variableValue = transaction->m_variableMultipartName.resolveFirst(var);
             }
             else if (compareStrNoCase(col, "MATCHED_VARS_NAMES")) {
                 variableValue = transaction->m_variableMatchedVarsNames.resolveFirst(var);