Merge pull request #2912 from martinhsv/v2/master

Do not escape special chars in regex pattern with macro

Author: martinhsv

Diff for: CHANGES

@@ -1,6 +1,8 @@
 DD mmm YYYY - 2.9.x (to be released)
 -------------------
 
+ * Do not escape special chars in rx pattern with macro
+   [Issue #2357 - @marcstern, @martinhsv]
  * Substitute two equals-equals operators in build
    [Issue #2883 - @Polynomial-C]
 

Diff for: apache2/re_operators.c

@@ -1,6 +1,6 @@
 /*
 * ModSecurity for Apache 2.x, http://www.modsecurity.org/
-* Copyright (c) 2004-2022 Trustwave Holdings, Inc. (http://www.trustwave.com/)
+* Copyright (c) 2004-2023 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
@@ -1024,7 +1024,7 @@ static int msre_op_rx_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, c
     int matched = 0;
     int rc;
     char *qspos = NULL;
-    const char *parm = NULL, *pattern = NULL;
+    const char *parm = NULL;
     msc_parm *mparm = NULL;
     #ifdef WITH_PCRE_STUDY
        #ifdef WITH_PCRE_JIT
@@ -1052,17 +1052,17 @@ static int msre_op_rx_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, c
 
             expand_macros(msr, re_pattern, rule, msr->mp);
 
-            pattern = log_escape_re(msr->mp, re_pattern->value);
             if (msr->txcfg->debuglog_level >= 6) {
-                msr_log(msr, 6, "Escaping pattern [%s]",pattern);
+                char *pattern = log_escape_re(msr->mp, re_pattern->value);
+                msr_log(msr, 6, "Expanded-macro pattern [%s]",pattern);
             }
 
 #ifdef WITH_PCRE2
         options = PCRE2_DOTALL | PCRE2_DOLLAR_ENDONLY;
 #else
         options = PCRE_DOTALL | PCRE_DOLLAR_ENDONLY;
 #endif
-            regex = msc_pregcomp_ex(msr->mp, pattern, options, &errptr, &erroffset, msc_pcre_match_limit, msc_pcre_match_limit_recursion);
+            regex = msc_pregcomp_ex(msr->mp, re_pattern->value, options, &errptr, &erroffset, msc_pcre_match_limit, msc_pcre_match_limit_recursion);
             if (regex == NULL) {
                 *error_msg = apr_psprintf(msr->mp, "Error compiling pattern (offset %d): %s",
                         erroffset, errptr);