Allow partial match option

Expensify · Jul 25, 2024 · b2c7ecd · b2c7ecd
1 parent 9a52942
commit b2c7ecd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/libstuff/libstuff.cpp b/libstuff/libstuff.cpp
@@ -2805,13 +2805,13 @@ bool SIsValidSQLiteDateModifier(const string& modifier) {
     return true;
 }
 
-bool SREMatch(const string& regExp, const string& input, bool caseSensitive) {
+bool SREMatch(const string& regExp, const string& input, bool caseSensitive, bool partialMatch) {
     int errornumber = 0;
     PCRE2_SIZE erroroffset = 0;
     uint32_t matchFlags = 0;
 
     // These require full-string matches as that's the historical way this function works.
-    uint32_t compileFlags = PCRE2_ANCHORED | PCRE2_ENDANCHORED;
+    uint32_t compileFlags = partialMatch ? 0 : PCRE2_ANCHORED | PCRE2_ENDANCHORED;
     if (!caseSensitive) {
         compileFlags |= PCRE2_CASELESS;
     }

diff --git a/libstuff/libstuff.h b/libstuff/libstuff.h
@@ -387,8 +387,8 @@ bool SEndsWith(const string& haystack, const string& needle);
 bool SConstantTimeEquals(const string& secret, const string& userInput);
 bool SConstantTimeIEquals(const string& secret, const string& userInput);
 
-// Perform a full regex match. The '^' and '$' symbols are implicit.
-bool SREMatch(const string& regExp, const string& input, bool caseSensitive = true);
+// Unless `partialMatch` is specified, perform a full regex match (the '^' and '$' symbols are implicit).
+bool SREMatch(const string& regExp, const string& input, bool caseSensitive = true, bool partialMatch = false);
 string SREReplace(const string& regExp, const string& input, const string& replacement, bool caseSensitive = true);
 
 // Redact values that should not be logged.

diff --git a/test/tests/LibStuffTest.cpp b/test/tests/LibStuffTest.cpp
@@ -658,6 +658,9 @@ struct LibStuff : tpunit::TestFixture {
 
         // Partial matches aren't counted.
         ASSERT_FALSE(SREMatch("cat", "this contains cat"));
+
+        // Now try with partial specified, should work.
+        ASSERT_TRUE(SREMatch("cat", "this contains cat", true, true));
     }
 
     void SREReplaceTest() {