Painless: Apply true regex limit factor with FIND and MATCH operation

stu-elastic · Feb 20, 2024 · 9628718 · 9628718
1 parent 5920c91
commit 9628718
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/CompilerSettings.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/CompilerSettings.java
@@ -160,25 +160,23 @@ public void setRegexLimitFactor(int regexLimitFactor) {
     }
 
     /**
-     * What is the limit factor for regexes?
-     */
-    public int getRegexLimitFactor() {
-        return regexLimitFactor;
+     * What is the effective limit factor for regexes?
+     */
+    public int getAppliedRegexLimitFactor() {
+        return switch (regexesEnabled) {
+            case TRUE -> Augmentation.UNLIMITED_PATTERN_FACTOR;
+            case FALSE -> Augmentation.DISABLED_PATTERN_FACTOR;
+            case LIMITED -> regexLimitFactor;
+        };
     }
 
     /**
      * Get compiler settings as a map.  This is used to inject compiler settings into augmented methods with the {@code @inject_constant}
      * annotation.
      */
     public Map<String, Object> asMap() {
-        int regexLimitFactorToApply = this.regexLimitFactor;
-        if (regexesEnabled == RegexEnabled.TRUE) {
-            regexLimitFactorToApply = Augmentation.UNLIMITED_PATTERN_FACTOR;
-        } else if (regexesEnabled == RegexEnabled.FALSE) {
-            regexLimitFactorToApply = Augmentation.DISABLED_PATTERN_FACTOR;
-        }
         Map<String, Object> map = new HashMap<>();
-        map.put("regex_limit_factor", regexLimitFactorToApply);
+        map.put("regex_limit_factor", getAppliedRegexLimitFactor());
 
         // for testing only
         map.put("testInject0", testInject0);

diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScriptEngine.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScriptEngine.java
@@ -425,7 +425,7 @@ private CompilerSettings buildCompilerSettings(Map<String, String> params) {
             // Except regexes enabled - this is a node level setting and can't be changed in the request.
             compilerSettings.setRegexesEnabled(defaultCompilerSettings.areRegexesEnabled());
 
-            compilerSettings.setRegexLimitFactor(defaultCompilerSettings.getRegexLimitFactor());
+            compilerSettings.setRegexLimitFactor(defaultCompilerSettings.getAppliedRegexLimitFactor());
 
             Map<String, String> copy = new HashMap<>(params);
 

diff --git a/...painless/src/main/java/org/elasticsearch/painless/phase/DefaultUserTreeToIRTreePhase.java b/...painless/src/main/java/org/elasticsearch/painless/phase/DefaultUserTreeToIRTreePhase.java
@@ -1076,7 +1076,7 @@ public void visitBinary(EBinary userBinaryNode, ScriptScope scriptScope) {
             irBinaryMathNode.attachDecoration(new IRDOperation(operation));
 
             if (operation == Operation.MATCH || operation == Operation.FIND) {
-                irBinaryMathNode.attachDecoration(new IRDRegexLimit(scriptScope.getCompilerSettings().getRegexLimitFactor()));
+                irBinaryMathNode.attachDecoration(new IRDRegexLimit(scriptScope.getCompilerSettings().getAppliedRegexLimitFactor()));
             }
 
             irBinaryMathNode.attachDecoration(new IRDBinaryType(binaryType));

diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/RegexLimitTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/RegexLimitTests.java
@@ -73,6 +73,16 @@ public void testMethodRegexInject_Ref_Matcher() {
         assertTrue(cbe.getMessage().contains(regexCircuitMessage));
     }
 
+    public void testInjectBinary() {
+        String script = "Pattern p = /.*a.*b.*c.*/; return 'abcxyz123abc' =~ p;";
+        Settings settings = Settings.builder()
+            .put(CompilerSettings.REGEX_LIMIT_FACTOR.getKey(), 1)
+            .put(CompilerSettings.REGEX_ENABLED.getKey(), "true")
+            .build();
+        scriptEngine = new PainlessScriptEngine(settings, scriptContexts());
+        assertEquals(Boolean.TRUE, exec(script));
+    }
+
     public void testRegexInject_DefMethodRef_Matcher() {
         String script = "boolean isMatch(Function func) { func.apply("
             + charSequence